From git at git.openembedded.org Sat Feb 1 17:24:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:24:38 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: kernel-selftest: Disable bpf tests on mips In-Reply-To: <158057787747.11183.10951299514575628646@git.openembedded.org> References: <158057787747.11183.10951299514575628646@git.openembedded.org> Message-ID: <20200201172437.D95C023291C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4ae9a3d4df9d655a5b729ddd837cc51c0c59bfe1 Author: Khem Raj AuthorDate: Fri Jan 31 18:23:17 2020 -0800 kernel-selftest: Disable bpf tests on mips 5.4 kernel exposes a problem, where its using host includes to compile BPF tests and it fails for mips because ptrace.h is quite different so it can not find the needed pt_struct definitions during cross compile % clang -fno-stack-protector -I. -I./include/uapi -I../../../include/uapi -I/mnt/b/yoe/build/tmp/work/qemumips-yoe-linux/kernel-selft est/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf/../usr/include -D__TARGET_ARCH_mips -g -idirafter /mnt/b/yoe/build/tmp/wor k/qemumips-yoe-linux/kernel-selftest/1.0-r0/recipe-sysroot-native/usr/lib/clang/10.0.0/include -Wno-compare-distinct-pointer-types -O2 -target bpf -emit-llvm \ -c progs/loop1.c progs/loop1.c:21:9: error: no member named 'regs' in 'struct pt_regs' m = PT_REGS_RC(ctx); ^~~~~~~~~~~~~~~ ./bpf_helpers.h:466:29: note: expanded from macro 'PT_REGS_RC' ~~ ^ 1 error generated. Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 02c56be..eae2e08 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -21,6 +21,10 @@ SRC_URI += "file://run-ptest \ PACKAGECONFIG ??= "bpf vm" PACKAGECONFIG_remove_x86 = "bpf" PACKAGECONFIG_remove_arm = "bpf" +# host ptrace.h is used to compile BPF target but mips ptrace.h is needed +# progs/loop1.c:21:9: error: incomplete definition of type 'struct user_pt_regs' +# m = PT_REGS_RC(ctx); +PACKAGECONFIG_remove_qemumips = "bpf" PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," PACKAGECONFIG[vm] = ",,libcap,libgcc bash" @@ -40,7 +44,7 @@ EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ CC="${CC}" \ - CLANG="clang -fno-stack-protector" \ + CLANG="clang -fno-stack-protector -target ${ARCH} ${TOOLCHAIN_OPTIONS}" \ AR="${AR}" \ LD="${LD}" \ DESTDIR="${D}" \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:24:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:24:37 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3049c65 -> be297c7) Message-ID: <158057787747.11183.10951299514575628646@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 3049c65 modemmanager: upgrade 1.10.8 -> 1.12.4 new 4ae9a3d kernel-selftest: Disable bpf tests on mips new 1ce08d4 mozjs: port build to python3 new ecc6f7e xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 new 66a6d7c thunar: upgrade 1.8.10 -> 1.8.12 new be297c7 poppler: upgrade 0.84.0 -> 0.85.0 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../mozjs/mozjs/0001-Port-build-to-python3.patch | 6888 ++++++++++++++++++++ ...not-include-RequiredDefines.h-for-depend.patch} | 0 ...03-fix-cross-compilation-on-i586-targets.patch} | 0 ...=> 0004-do-not-create-python-environment.patch} | 0 ...-link.patch => 0005-fix-cannot-find-link.patch} | 0 ...orkaround-autoconf-2.13-detection-failed.patch} | 0 ...ch => 0007-fix-do_compile-failed-on-mips.patch} | 0 ...-support.patch => 0008-add-riscv-support.patch} | 0 ...0009-mozjs-fix-coredump-caused-by-getenv.patch} | 0 ...t-overflow.patch => 0010-format-overflow.patch} | 0 ...ch => 0011-To-fix-build-error-on-arm32BE.patch} | 0 ...S_PUBLIC_API.patch => 0012-JS_PUBLIC_API.patch} | 0 ... => 0013-riscv-Disable-atomic-operations.patch} | 0 ...ch => 0014-fallback-to-2011-C++-standard.patch} | 0 ...1-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../0001-support-musl.patch} | 0 .../0002-js-Fix-build-with-musl.patch} | 0 meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 56 +- .../kernel-selftest/kernel-selftest.bb | 6 +- .../{poppler_0.84.0.bb => poppler_0.85.0.bb} | 4 +- ..._2.3.4.bb => xfce4-whiskermenu-plugin_2.3.5.bb} | 4 +- .../thunar/{thunar_1.8.10.bb => thunar_1.8.12.bb} | 4 +- 22 files changed, 6928 insertions(+), 34 deletions(-) create mode 100644 meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch rename meta-oe/recipes-extended/mozjs/mozjs/{0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch => 0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0010-fix-cross-compilation-on-i586-targets.patch => 0003-fix-cross-compilation-on-i586-targets.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-do-not-create-python-environment.patch => 0004-do-not-create-python-environment.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0002-fix-cannot-find-link.patch => 0005-fix-cannot-find-link.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0003-workaround-autoconf-2.13-detection-failed.patch => 0006-workaround-autoconf-2.13-detection-failed.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0005-fix-do_compile-failed-on-mips.patch => 0007-fix-do_compile-failed-on-mips.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{add-riscv-support.patch => 0008-add-riscv-support.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-mozjs-fix-coredump-caused-by-getenv.patch => 0009-mozjs-fix-coredump-caused-by-getenv.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{format-overflow.patch => 0010-format-overflow.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-To-fix-build-error-on-arm32BE.patch => 0011-To-fix-build-error-on-arm32BE.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{JS_PUBLIC_API.patch => 0012-JS_PUBLIC_API.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-riscv-Disable-atomic-operations.patch => 0013-riscv-Disable-atomic-operations.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{fallback-to-2011-C++-standard.patch => 0014-fallback-to-2011-C++-standard.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{ => mipsarchn32}/0001-fix-compiling-failure-on-mips64-n32-bsp.patch (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0006-support-musl.patch => musl/0001-support-musl.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-js-Fix-build-with-musl.patch => musl/0002-js-Fix-build-with-musl.patch} (100%) rename meta-oe/recipes-support/poppler/{poppler_0.84.0.bb => poppler_0.85.0.bb} (93%) rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.3.4.bb => xfce4-whiskermenu-plugin_2.3.5.bb} (66%) rename meta-xfce/recipes-xfce/thunar/{thunar_1.8.10.bb => thunar_1.8.12.bb} (84%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:24:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:24:40 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 In-Reply-To: <158057787747.11183.10951299514575628646@git.openembedded.org> References: <158057787747.11183.10951299514575628646@git.openembedded.org> Message-ID: <20200201172438.15F6923291F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ecc6f7e86f60b21c6b00d8e77df8a746d51573fa Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:02 2020 +0100 xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 Release notes for 2.3.5 ======================= - Fix saving unchanged plugin title. (bug #15403) - Fix sidebar scrollbar covering buttons. (bug #14730) - Fix categories remaining scrolled when hidden. - Fix incorrect alignment of commands next to search. - Fix incorrect fallback value for menu opacity. - Fix incorrect check when setting command. - Update documentation URL. (bug #16183) Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...-whiskermenu-plugin_2.3.4.bb => xfce4-whiskermenu-plugin_2.3.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb similarity index 66% rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb index 595e3c8..75b5a31 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "ee9e378fae78b230a23b241cf727c84b" -SRC_URI[sha256sum] = "84d3de35695a023aab181f7a9b75f59029eb3b07c3e47a5e11e8bd79db62570e" +SRC_URI[md5sum] = "b5242d7922fa4253cc99c253efcff7cf" +SRC_URI[sha256sum] = "8f7134f4c1b5ff5290048c5b96b130e1238a286002cbe35255c2cd7d5a1ab6b4" RRECOMMENDS_${PN} += "menulibre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:24:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:24:41 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: thunar: upgrade 1.8.10 -> 1.8.12 In-Reply-To: <158057787747.11183.10951299514575628646@git.openembedded.org> References: <158057787747.11183.10951299514575628646@git.openembedded.org> Message-ID: <20200201172438.1E9C6232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 66a6d7ccff7289c8ec42998a81c25c0ad46e701d Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:03 2020 +0100 thunar: upgrade 1.8.10 -> 1.8.12 Release notes for 1.8.12 ======================== - NULL is the proper sentinel for g_object_new() (Bug #16310) - Drop timer on finalize (Bug #15305) - Store column width setting asynchronously and only once (Bug #15305) - When move to trash fails, ask whether to delete files (Bug #15975) - Ctrl+Mousewheel does not enlarge/shrink entries (for detailed list view) (Bug #15936) - Extra padding for Eject button when scrollbar is visible (Bug #15312) - Use standard icon instead of custom - Translation Updates: Albanian, Chinese (China), Chinese (Taiwan), Croatian, Czech, Dutch, French, Galician, Greek, Hungarian, Italian, Japanese, Norwegian Bokm?l, Portuguese, Portuguese (Brazil), Russian, Serbian, Slovak, Spanish, Swedish, Ukrainian Could not find announcemant for 1.8.11 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-xfce/recipes-xfce/thunar/{thunar_1.8.10.bb => thunar_1.8.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.8.10.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.8.12.bb similarity index 84% rename from meta-xfce/recipes-xfce/thunar/thunar_1.8.10.bb rename to meta-xfce/recipes-xfce/thunar/thunar_1.8.12.bb index eb57dae..0d2befd 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_1.8.10.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_1.8.12.bb @@ -8,8 +8,8 @@ inherit xfce gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "85c7394d82542d5a023f1f5baef109d8" -SRC_URI[sha256sum] = "3d448d81c0e49efbaa5ae6bf34ac3c88a614178a1127afaee6b3a1b5ee12e709" +SRC_URI[md5sum] = "bebd2d83ad2ed111b906c99b65fb32ed" +SRC_URI[sha256sum] = "29295bee0b1f5bfd525e37405e5d32b497ae539b15183dd14e6ca49e252225f8" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:24:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:24:42 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: poppler: upgrade 0.84.0 -> 0.85.0 In-Reply-To: <158057787747.11183.10951299514575628646@git.openembedded.org> References: <158057787747.11183.10951299514575628646@git.openembedded.org> Message-ID: <20200201172438.26F5E23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit be297c715fae75eb234db2f756b33c20e227185b Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:01 2020 +0100 poppler: upgrade 0.84.0 -> 0.85.0 Release 0.85.0: core: * Fix case unsensitive search for Deseret and Osage. Issue #853 * Fix crash in unicodeToAscii7 * CairoOutputDev: make initialisation thread-safe * Fix crash on broken files. Issues #869, #870 * Internal code improvements qt5: * Fix FormField::name encoding * Accept UTF-16 uiNames for form fields * Fix search for "complex" characters * Allow to load document from QIODevice utils: * pdftoppm/pdftocairo: Fix -e/-o printing the wrong pages. Issue #873 * pdftohtml: Fix issue with the font size sometimes being huge glib: * make the frontend initialization thread safe. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../recipes-support/poppler/{poppler_0.84.0.bb => poppler_0.85.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/poppler/poppler_0.84.0.bb b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb similarity index 93% rename from meta-oe/recipes-support/poppler/poppler_0.84.0.bb rename to meta-oe/recipes-support/poppler/poppler_0.85.0.bb index 5153868..857b67f 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.84.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb @@ -7,8 +7,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[md5sum] = "e14a8aca8809908ad4364c32c17bcb92" -SRC_URI[sha256sum] = "c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731" +SRC_URI[md5sum] = "5315084523a4d73e9514f51eef78a332" +SRC_URI[sha256sum] = "2bc875eb323002ae6b287e09980473518e2b2ed6b5b7d2e1089e36a6cd00d94b" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:24:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:24:39 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: mozjs: port build to python3 In-Reply-To: <158057787747.11183.10951299514575628646@git.openembedded.org> References: <158057787747.11183.10951299514575628646@git.openembedded.org> Message-ID: <20200201172438.0D27F23291E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1ce08d4c6b4375ffc031af0934eecede953f2920 Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:00 2020 +0100 mozjs: port build to python3 While at it: * cleanup our patches * remove useless sed in do_configure Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../mozjs/mozjs/0001-Port-build-to-python3.patch | 6888 ++++++++++++++++++++ ...not-include-RequiredDefines.h-for-depend.patch} | 0 ...03-fix-cross-compilation-on-i586-targets.patch} | 0 ...=> 0004-do-not-create-python-environment.patch} | 0 ...-link.patch => 0005-fix-cannot-find-link.patch} | 0 ...orkaround-autoconf-2.13-detection-failed.patch} | 0 ...ch => 0007-fix-do_compile-failed-on-mips.patch} | 0 ...-support.patch => 0008-add-riscv-support.patch} | 0 ...0009-mozjs-fix-coredump-caused-by-getenv.patch} | 0 ...t-overflow.patch => 0010-format-overflow.patch} | 0 ...ch => 0011-To-fix-build-error-on-arm32BE.patch} | 0 ...S_PUBLIC_API.patch => 0012-JS_PUBLIC_API.patch} | 0 ... => 0013-riscv-Disable-atomic-operations.patch} | 0 ...ch => 0014-fallback-to-2011-C++-standard.patch} | 0 ...1-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../0001-support-musl.patch} | 0 .../0002-js-Fix-build-with-musl.patch} | 0 meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 56 +- 18 files changed, 6917 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch new file mode 100644 index 0000000..695dd97 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch @@ -0,0 +1,6888 @@ +From 33a373ba41d978af60c2f0230bcba6ad27357ec8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 29 Jan 2020 16:25:11 +0100 +Subject: [PATCH] Port build to python3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* first tool of choice was 2to3 +* some parts were taken from [1] but during work it was found that this patch + introduces interesting effects - see hash functions. Working more on this + makes me guess that one has never worked... +* Few parts were taken from upstream mirror [2]. Since they use six for porting + to python3 it adds us a new dependency. +* To get a better overview what is going on or failing some additional messages + were added. The most verbose one is left disabled - see + python/mozbuild/mozbuild/configure/__init__.py / Line 310 onwards +* major changes upstream on build are not to expect so upgrading should cause + little trouble and changes can be tracked by [3] +* some solutions are workarounds/hacks so this patch will not be accepeted + upstream. This should not be a probelme for us: once mozjs >= 68 will arrive + we have to go to rust/cargo based build anyway. + +[1] https://code.foxkit.us/adelie/packages/blob/f2b5773da19ab397fbe64fd32dacc383cfe4cd77/user/mozjs/python3.patch +[2] https://github.com/mozilla/gecko-dev +[3] https://github.com/mozilla/gecko-dev/tree/esr60 + +Upstream-Status: Inaproppriate [Some Hacks] + +Signed-off-by: Andreas M?ller +--- + build/autoconf/config.status.m4 | 2 +- + build/moz.configure/android-ndk.configure | 4 +- + build/moz.configure/checks.configure | 4 +- + build/moz.configure/init.configure | 31 +- + build/moz.configure/keyfiles.configure | 4 +- + build/moz.configure/old.configure | 32 +- + build/moz.configure/toolchain.configure | 16 +- + build/moz.configure/util.configure | 9 +- + build/moz.configure/windows.configure | 10 +- + build/templates.mozbuild | 2 +- + config/MozZipFile.py | 12 +- + config/expandlibs.py | 6 +- + config/expandlibs_exec.py | 14 +- + config/expandlibs_gen.py | 4 +- + configure.py | 42 +- + js/src/build/moz.build | 8 +- + js/src/builtin/embedjs.py | 10 +- + js/src/configure | 2 +- + js/src/frontend/GenerateReservedWords.py | 6 +- + js/src/gc/GenerateStatsPhases.py | 4 +- + js/src/old-configure.in | 2 + + memory/build/moz.build | 8 +- + mozglue/build/moz.build | 22 +- + .../mozbuild/mozbuild/action/check_binary.py | 2 + + .../mozbuild/action/process_define_files.py | 4 +- + python/mozbuild/mozbuild/backend/base.py | 8 +- + python/mozbuild/mozbuild/backend/common.py | 8 +- + .../mozbuild/backend/configenvironment.py | 14 +- + .../mozbuild/mozbuild/backend/fastermake.py | 10 +- + .../mozbuild/backend/recursivemake.py | 181 +++---- + python/mozbuild/mozbuild/config_status.py | 7 +- + .../mozbuild/mozbuild/configure/__init__.py | 83 +++- + .../mozbuild/configure/check_debug_ranges.py | 6 +- + python/mozbuild/mozbuild/configure/options.py | 24 +- + python/mozbuild/mozbuild/configure/util.py | 12 +- + .../mozbuild/mozbuild/controller/building.py | 16 +- + python/mozbuild/mozbuild/frontend/context.py | 89 ++-- + python/mozbuild/mozbuild/frontend/data.py | 8 +- + python/mozbuild/mozbuild/frontend/emitter.py | 50 +- + python/mozbuild/mozbuild/frontend/reader.py | 49 +- + python/mozbuild/mozbuild/frontend/sandbox.py | 3 +- + python/mozbuild/mozbuild/jar.py | 12 +- + python/mozbuild/mozbuild/makeutil.py | 24 +- + python/mozbuild/mozbuild/mozinfo.py | 8 +- + python/mozbuild/mozbuild/preprocessor.py | 27 +- + python/mozbuild/mozbuild/shellutil.py | 6 +- + .../test/backend/test_recursivemake.py | 18 +- + .../mozbuild/test/configure/common.py | 8 +- + .../mozbuild/mozbuild/test/configure/lint.py | 8 +- + .../test/configure/test_checks_configure.py | 8 +- + .../test/configure/test_compile_checks.py | 4 +- + .../mozbuild/test/configure/test_configure.py | 244 +++++----- + .../mozbuild/test/configure/test_lint.py | 24 +- + .../test/configure/test_moz_configure.py | 32 +- + .../mozbuild/test/configure/test_options.py | 450 +++++++++--------- + .../configure/test_toolchain_configure.py | 22 +- + .../test/configure/test_toolchain_helpers.py | 62 +-- + .../configure/test_toolkit_moz_configure.py | 2 +- + .../mozbuild/test/configure/test_util.py | 8 +- + python/mozbuild/mozbuild/testing.py | 10 +- + python/mozbuild/mozbuild/util.py | 79 ++- + python/mozbuild/mozbuild/virtualenv.py | 6 +- + python/mozbuild/mozpack/chrome/manifest.py | 6 +- + python/mozbuild/mozpack/copier.py | 12 +- + python/mozbuild/mozpack/files.py | 22 +- + python/mozbuild/mozpack/manifests.py | 16 +- + python/mozbuild/mozpack/mozjar.py | 37 +- + .../manifestparser/manifestparser/ini.py | 13 +- + .../manifestparser/manifestparser.py | 24 +- + testing/mozbase/mozinfo/mozinfo/mozinfo.py | 26 +- + .../mozprocess/mozprocess/processhandler.py | 10 +- + third_party/python/which/which.py | 18 +- + 72 files changed, 1081 insertions(+), 993 deletions(-) + +diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4 +index c75575386..543c2d682 100644 +--- a/build/autoconf/config.status.m4 ++++ b/build/autoconf/config.status.m4 +@@ -122,7 +122,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + + dnl We're going to need [ ] for python syntax. + changequote(<<<, >>>)dnl +-echo creating $CONFIG_STATUS ++echo creating $CONFIG_STATUS in `pwd` + + cat > $CONFIG_STATUS <./config.log', '>>./config.log') ++ script = script.replace(b'>./config.log', b'>>./config.log') + + with open(old_configure, 'wb') as fh: + fh.write(script) +@@ -282,8 +282,8 @@ def old_configure_options(*options): + '--x-includes', + '--x-libraries', + ) +- at imports(_from='__builtin__', _import='compile') +- at imports(_from='__builtin__', _import='open') ++ at imports(_from='builtins', _import='compile') ++ at imports(_from='builtins', _import='open') + @imports('logging') + @imports('os') + @imports('subprocess') +@@ -326,7 +326,7 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options, + log.debug('Running %s', quote(*cmd)) + if extra_env: + log.debug('with extra environment: %s', +- ' '.join('%s=%s' % pair for pair in extra_env.iteritems())) ++ ' '.join('%s=%s' % pair for pair in extra_env.items())) + + # Our logging goes to config.log, the same file old.configure uses. + # We can't share the handle on the file, so close it. We assume nothing +@@ -359,7 +359,7 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options, + # Every variation of the exec() function I tried led to: + # SyntaxError: unqualified exec is not allowed in function 'main' it + # contains a nested function with free variables +- exec code in raw_config # noqa ++ exec(code, raw_config) # noqa + + # Ensure all the flags known to old-configure appear in the + # @old_configure_options above. +@@ -393,16 +393,24 @@ def set_old_configure_define(name, value): + @depends(old_configure) + @imports('types') + def post_old_configure(raw_config): ++ log.info('post_old_configure started') ++ + for k, v in raw_config['substs']: + set_old_configure_config( +- k[1:-1], v[1:-1] if isinstance(v, types.StringTypes) else v) ++ k[1:-1], v[1:-1] if isinstance(v, str) else v) ++ ++ log.info('post_old_configure 1 finished') + +- for k, v in dict(raw_config['defines']).iteritems(): ++ for k, v in dict(raw_config['defines']).items(): + set_old_configure_define(k[1:-1], v[1:-1]) + ++ log.info('post_old_configure 2 finished') ++ + set_old_configure_config('non_global_defines', + raw_config['non_global_defines']) + ++ log.info('post_old_configure 3 finished') ++ + + # Assuming no other option is declared after this function, handle the + # env options that were injected by mozconfig_options by creating dummy +@@ -414,6 +422,7 @@ def post_old_configure(raw_config): + @imports('__sandbox__') + @imports(_from='mozbuild.configure.options', _import='Option') + def remaining_mozconfig_options(_): ++ log.info('remaining_mozconfig_options started') + helper = __sandbox__._helper + for arg in helper: + if helper._origins[arg] != 'mozconfig': +@@ -422,5 +431,6 @@ def remaining_mozconfig_options(_): + if name.isupper() and name not in __sandbox__._options: + option = Option(env=name, nargs='*', help=name) + helper.handle(option) ++ log.info('remaining_mozconfig_options finished') + + # Please do not add anything after remaining_mozconfig_options() +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index fc640c75e..c5508dfb7 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -391,7 +391,7 @@ def get_compiler_info(compiler, language): + ('CPU', CPU_preprocessor_checks), + ('KERNEL', kernel_preprocessor_checks), + ): +- for n, (value, condition) in enumerate(preprocessor_checks.iteritems()): ++ for n, (value, condition) in enumerate(preprocessor_checks.items()): + check += dedent('''\ + #%(if)s %(condition)s + %%%(name)s "%(value)s" +@@ -425,9 +425,9 @@ def get_compiler_info(compiler, language): + data = {} + for line in result.splitlines(): + if line.startswith(b'%'): +- k, _, v = line.partition(' ') +- k = k.lstrip('%') +- data[k] = v.replace(' ', '').lstrip('"').rstrip('"') ++ k, _, v = line.partition(b' ') ++ k = k.lstrip(b'%').decode('utf-8') ++ data[k] = v.replace(b' ', b'').lstrip(b'"').rstrip(b'"').decode('utf-8') + log.debug('%s = %s', k, data[k]) + + try: +@@ -551,7 +551,7 @@ def check_compiler(compiler, language, target): + ) + + +- at imports(_from='__builtin__', _import='open') ++ at imports(_from='builtins', _import='open') + @imports('json') + @imports('subprocess') + @imports('sys') +@@ -606,7 +606,7 @@ def vs_major_version(value): + + + @depends(host, target, vs_major_version, check_build_environment, '--with-visual-studio-version') +- at imports(_from='__builtin__', _import='sorted') ++ at imports(_from='builtins', _import='sorted') + @imports(_from='operator', _import='itemgetter') + @imports('platform') + def vc_compiler_path(host, target, vs_major_version, env, vs_release_name): +@@ -807,7 +807,7 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None, + target.os != 'Android': + return namespace(**{ + k: [] if k == 'flags' else v +- for k, v in other_compiler.__dict__.iteritems() ++ for k, v in other_compiler.__dict__.items() + }) + + # Normally, we'd use `var` instead of `_var`, but the interaction with +@@ -1238,7 +1238,7 @@ set_config('VISIBILITY_FLAGS', visibility_flags) + + @depends(c_compiler) + @imports('multiprocessing') +- at imports(_from='__builtin__', _import='min') ++ at imports(_from='builtins', _import='min') + def pgo_flags(compiler): + if compiler.type in ('gcc', 'clang'): + return namespace( +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 3284fd8b5..218813e2d 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -25,7 +25,6 @@ def configure_error(message): + # does not. + + +- at imports(_from='__builtin__', _import='unicode') + @imports('subprocess') + @imports('sys') + @imports(_from='mozbuild.configure.util', _import='LineIO') +@@ -39,10 +38,10 @@ def check_cmd_output(*args, **kwargs): + if 'env' in kwargs: + normalized_env = {} + for k, v in kwargs['env'].items(): +- if isinstance(k, unicode): ++ if isinstance(k, str): + k = k.encode('utf-8', 'strict') + +- if isinstance(v, unicode): ++ if isinstance(v, str): + v = v.encode('utf-8', 'strict') + + normalized_env[k] = v +@@ -285,7 +284,7 @@ def unique_list(l): + # ('19.0', 'x64', r'C:\...\amd64\cl.exe') + # ('19.0', 'x86', r'C:\...\amd64_x86\cl.exe') + @imports(_import='_winreg', _as='winreg') +- at imports(_from='__builtin__', _import='WindowsError') ++ at imports(_from='builtins', _import='WindowsError') + @imports(_from='fnmatch', _import='fnmatch') + def get_registry_values(pattern, get_32_and_64_bit=False): + def enum_helper(func, key): +@@ -360,6 +359,8 @@ def get_registry_values(pattern, get_32_and_64_bit=False): + @imports(_from='mozbuild.configure.util', _import='Version', _as='_Version') + def Version(v): + 'A version number that can be compared usefully.' ++ if isinstance(v, bytes): ++ v = v.decode('utf-8') + return _Version(v) + + # Denotes a deprecated option. Combines option() and @depends: +diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure +index a5b790e3b..2b88fc447 100644 +--- a/build/moz.configure/windows.configure ++++ b/build/moz.configure/windows.configure +@@ -10,7 +10,7 @@ option('--with-windows-version', nargs=1, default='603', + + + @depends('--with-windows-version') +- at imports(_from='__builtin__', _import='ValueError') ++ at imports(_from='builtins', _import='ValueError') + def valid_windows_version(value): + if not value: + die('Cannot build with --without-windows-version') +@@ -50,8 +50,8 @@ def windows_sdk_dir(value, host): + + @imports('os') + @imports('re') +- at imports(_from='__builtin__', _import='sorted') +- at imports(_from='__builtin__', _import='WindowsError') ++ at imports(_from='builtins', _import='sorted') ++ at imports(_from='builtins', _import='WindowsError') + def get_sdk_dirs(sdk, subdir): + def get_dirs_containing(sdk, stem, subdir): + base = os.path.join(sdk, stem) +@@ -96,7 +96,7 @@ def valid_windows_sdk_dir_result(value): + + @depends(c_compiler, windows_sdk_dir, valid_windows_version, 'WINDOWSSDKDIR') + @checking('for Windows SDK', valid_windows_sdk_dir_result) +- at imports(_from='__builtin__', _import='sorted') ++ at imports(_from='builtins', _import='sorted') + @imports(_from='textwrap', _import='dedent') + def valid_windows_sdk_dir(compiler, windows_sdk_dir, target_version, + windows_sdk_dir_env): +@@ -174,7 +174,7 @@ def valid_ucrt_sdk_dir_result(value): + @depends(windows_sdk_dir, 'WINDOWSSDKDIR', c_compiler) + @checking('for Universal CRT SDK', valid_ucrt_sdk_dir_result) + @imports('os') +- at imports(_from='__builtin__', _import='sorted') ++ at imports(_from='builtins', _import='sorted') + @imports(_import='mozpack.path', _as='mozpath') + def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler): + if windows_sdk_dir_env: +diff --git a/build/templates.mozbuild b/build/templates.mozbuild +index 3da850ce5..ae5e410fe 100644 +--- a/build/templates.mozbuild ++++ b/build/templates.mozbuild +@@ -10,7 +10,7 @@ def Binary(): + templates.''' + + # Add -llog by default, since we use it all over the place. +- if CONFIG['OS_TARGET'] == 'Android': ++ if str(CONFIG['OS_TARGET']) == 'Android': + OS_LIBS += ['log'] + + +diff --git a/config/MozZipFile.py b/config/MozZipFile.py +index 337fe0521..dc7add4c3 100644 +--- a/config/MozZipFile.py ++++ b/config/MozZipFile.py +@@ -18,7 +18,7 @@ class ZipFile(zipfile.ZipFile): + def __init__(self, file, mode="r", compression=zipfile.ZIP_STORED, + lock = False): + if lock: +- assert isinstance(file, basestring) ++ assert isinstance(file, str) + self.lockfile = lock_file(file + '.lck') + else: + self.lockfile = None +@@ -46,7 +46,7 @@ class ZipFile(zipfile.ZipFile): + date_time=time.localtime(time.time())) + zinfo.compress_type = self.compression + # Add some standard UNIX file access permissions (-rw-r--r--). +- zinfo.external_attr = (0x81a4 & 0xFFFF) << 16L ++ zinfo.external_attr = (0x81a4 & 0xFFFF) << 16 + else: + zinfo = zinfo_or_arcname + +@@ -58,7 +58,7 @@ class ZipFile(zipfile.ZipFile): + # as the old, reuse the existing entry. + + doSeek = False # store if we need to seek to the eof after overwriting +- if self.NameToInfo.has_key(zinfo.filename): ++ if zinfo.filename in self.NameToInfo: + # Find the last ZipInfo with our name. + # Last, because that's catching multiple overwrites + i = len(self.filelist) +@@ -109,14 +109,14 @@ class ZipFile(zipfile.ZipFile): + # adjust file mode if we originally just wrote, now we rewrite + self.fp.close() + self.fp = open(self.filename, 'r+b') +- all = map(lambda zi: (zi, True), self.filelist) + \ +- map(lambda zi: (zi, False), self._remove) ++ all = [(zi, True) for zi in self.filelist] + \ ++ [(zi, False) for zi in self._remove] + all.sort(lambda l, r: cmp(l[0].header_offset, r[0].header_offset)) + # empty _remove for multiple closes + self._remove = [] + + lengths = [all[i+1][0].header_offset - all[i][0].header_offset +- for i in xrange(len(all)-1)] ++ for i in range(len(all)-1)] + lengths.append(self.end - all[-1][0].header_offset) + to_pos = 0 + for (zi, keep), length in zip(all, lengths): +diff --git a/config/expandlibs.py b/config/expandlibs.py +index ac06c432f..df1fed15d 100644 +--- a/config/expandlibs.py ++++ b/config/expandlibs.py +@@ -26,7 +26,7 @@ ${LIB_PREFIX}${ROOT}.${LIB_SUFFIX} following these rules: + descriptor contains. And for each of these LIBS, also apply the same + rules. + ''' +-from __future__ import with_statement ++ + import sys, os, errno + import expandlibs_config as conf + +@@ -36,7 +36,7 @@ def ensureParentDir(file): + if dir and not os.path.exists(dir): + try: + os.makedirs(dir) +- except OSError, error: ++ except OSError as error: + if error.errno != errno.EEXIST: + raise + +@@ -140,4 +140,4 @@ class ExpandArgs(list): + return [relativize(arg)] + + if __name__ == '__main__': +- print " ".join(ExpandArgs(sys.argv[1:])) ++ print(" ".join(ExpandArgs(sys.argv[1:]))) +diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py +index df656016c..fb786a6a8 100644 +--- a/config/expandlibs_exec.py ++++ b/config/expandlibs_exec.py +@@ -20,7 +20,7 @@ With the --symbol-order argument, followed by a file name, it will add the + relevant linker options to change the order in which the linker puts the + symbols appear in the resulting binary. Only works for ELF targets. + ''' +-from __future__ import with_statement ++ + import sys + import os + from expandlibs import ( +@@ -304,11 +304,11 @@ class SectionFinder(object): + return syms + + def print_command(out, args): +- print >>out, "Executing: " + " ".join(args) ++ print("Executing: " + " ".join(args), file=out) + for tmp in [f for f in args.tmp if os.path.isfile(f)]: +- print >>out, tmp + ":" ++ print(tmp + ":", file=out) + with open(tmp) as file: +- print >>out, "".join([" " + l for l in file.readlines()]) ++ print("".join([" " + l for l in file.readlines()]), file=out) + out.flush() + + def main(args, proc_callback=None): +@@ -338,13 +338,13 @@ def main(args, proc_callback=None): + proc = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT) + if proc_callback: + proc_callback(proc) +- except Exception, e: +- print >>sys.stderr, 'error: Launching', args, ':', e ++ except Exception as e: ++ print('error: Launching', args, ':', e, file=sys.stderr) + raise e + (stdout, stderr) = proc.communicate() + if proc.returncode and not options.verbose: + print_command(sys.stderr, args) +- sys.stderr.write(stdout) ++ sys.stderr.write(stdout.decode("utf-8")) + sys.stderr.flush() + if proc.returncode: + return proc.returncode +diff --git a/config/expandlibs_gen.py b/config/expandlibs_gen.py +index b1de63cd0..dc62bd184 100644 +--- a/config/expandlibs_gen.py ++++ b/config/expandlibs_gen.py +@@ -5,7 +5,7 @@ + '''Given a list of object files and library names, prints a library + descriptor to standard output''' + +-from __future__ import with_statement ++ + import sys + import os + import expandlibs_config as conf +@@ -38,4 +38,4 @@ if __name__ == '__main__': + + ensureParentDir(options.output) + with open(options.output, 'w') as outfile: +- print >>outfile, generate(args) ++ print(generate(args), file=outfile) +diff --git a/configure.py b/configure.py +index 771e34e38..bee329d7c 100644 +--- a/configure.py ++++ b/configure.py +@@ -2,10 +2,11 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import print_function, unicode_literals ++ + + import codecs + import itertools ++import logging + import os + import sys + import textwrap +@@ -34,7 +35,9 @@ from mozbuild.util import ( + def main(argv): + config = {} + sandbox = ConfigureSandbox(config, os.environ, argv) ++ print('sandbox.run started') + sandbox.run(os.path.join(os.path.dirname(__file__), 'moz.configure')) ++ print('sandbox.run finished') + + if sandbox._help: + return 0 +@@ -56,12 +59,21 @@ def config_status(config): + + sanitized_config = {} + sanitized_config['substs'] = { +- k: sanitized_bools(v) for k, v in config.iteritems() ++ k: sanitized_bools(v) for k, v in config.items() + if k not in ('DEFINES', 'non_global_defines', 'TOPSRCDIR', 'TOPOBJDIR', + 'ALL_CONFIGURE_PATHS') + } ++ ++ # Hack around OptionValue entries unknown during compile ++ for opt in ('BUILD_BACKENDS', 'MOZ_UI_LOCALE', 'RUSTFLAGS' ): ++ old = sanitized_config['substs'][opt] ++ new = [] ++ for setting in old: ++ new.append(setting) ++ sanitized_config['substs'][opt] = new ++ + sanitized_config['defines'] = { +- k: sanitized_bools(v) for k, v in config['DEFINES'].iteritems() ++ k: sanitized_bools(v) for k, v in config['DEFINES'].items() + } + sanitized_config['non_global_defines'] = config['non_global_defines'] + sanitized_config['topsrcdir'] = config['TOPSRCDIR'] +@@ -71,20 +83,17 @@ def config_status(config): + # Create config.status. Eventually, we'll want to just do the work it does + # here, when we're able to skip configure tests/use cached results/not rely + # on autoconf. +- print("Creating config.status", file=sys.stderr) +- encoding = 'mbcs' if sys.platform == 'win32' else 'utf-8' +- with codecs.open('config.status', 'w', encoding) as fh: ++ logging.getLogger('moz.configure').info('Creating config.status') ++ with codecs.open('config.status', 'w', 'utf-8') as fh: + fh.write(textwrap.dedent('''\ + #!%(python)s +- # coding=%(encoding)s +- from __future__ import unicode_literals +- from mozbuild.util import encode +- encoding = '%(encoding)s' +- ''') % {'python': config['PYTHON'], 'encoding': encoding}) ++ # coding=utf-8 ++ print("config.status started") ++ ''') % {'python': config['PYTHON']}) + # A lot of the build backend code is currently expecting byte + # strings and breaks in subtle ways with unicode strings. (bug 1296508) +- for k, v in sanitized_config.iteritems(): +- fh.write('%s = encode(%s, encoding)\n' % (k, indented_repr(v))) ++ for k, v in sanitized_config.items(): ++ fh.write('%s = %s\n' % (k, indented_repr(v))) + fh.write("__all__ = ['topobjdir', 'topsrcdir', 'defines', " + "'non_global_defines', 'substs', 'mozconfig']") + +@@ -97,6 +106,9 @@ def config_status(config): + args = dict([(name, globals()[name]) for name in __all__]) + config_status(**args) + ''')) ++ fh.write(textwrap.dedent(''' ++ print("config.status finished") ++ ''')) + + partial_config = PartialConfigEnvironment(config['TOPOBJDIR']) + partial_config.write_vars(sanitized_config) +@@ -116,7 +128,7 @@ def config_status(config): + # executable permissions. + os.chmod('config.status', 0o755) + if config.get('MOZ_BUILD_APP') != 'js' or config.get('JS_STANDALONE'): +- os.environ[b'WRITE_MOZINFO'] = b'1' ++ os.environ['WRITE_MOZINFO'] = '1' + from mozbuild.config_status import config_status + + # Some values in sanitized_config also have more complex types, such as +@@ -127,7 +139,7 @@ def config_status(config): + + # A lot of the build backend code is currently expecting byte strings + # and breaks in subtle ways with unicode strings. +- return config_status(args=[], **encode(sanitized_config, encoding)) ++ return config_status(args=[], **sanitized_config) + return 0 + + +diff --git a/js/src/build/moz.build b/js/src/build/moz.build +index a7f5fa4ce..856cae32d 100644 +--- a/js/src/build/moz.build ++++ b/js/src/build/moz.build +@@ -47,22 +47,22 @@ USE_LIBS += [ + 'zlib', + ] + +-if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'): ++if str(CONFIG['OS_ARCH']) not in ('WINNT', 'HP-UX'): + OS_LIBS += [ + 'm', + ] + +-if CONFIG['OS_ARCH'] == 'FreeBSD': ++if str(CONFIG['OS_ARCH']) == 'FreeBSD': + OS_LIBS += [ + '-pthread', + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if str(CONFIG['OS_ARCH']) == 'Linux': + OS_LIBS += [ + 'dl', + ] + +-if CONFIG['OS_ARCH'] == 'SunOS': ++if str(CONFIG['OS_ARCH']) == 'SunOS': + OS_LIBS += [ + 'posix4', + 'dl', +diff --git a/js/src/builtin/embedjs.py b/js/src/builtin/embedjs.py +index ba25e71c1..d4f2de122 100644 +--- a/js/src/builtin/embedjs.py ++++ b/js/src/builtin/embedjs.py +@@ -36,7 +36,7 @@ + # + # It uses the C preprocessor to process its inputs. + +-from __future__ import with_statement ++ + import re, sys, os, subprocess + import shlex + import which +@@ -52,8 +52,8 @@ def ToCAsciiArray(lines): + + def ToCArray(lines): + result = [] +- for chr in lines: +- result.append(str(ord(chr))) ++ for char in lines: ++ result.append("0x%0.2X" % char) + return ", ".join(result) + + HEADER_TEMPLATE = """\ +@@ -87,7 +87,7 @@ def embed(cxx, preprocessorOption, cppflags, msgs, sources, c_out, js_out, names + + js_out.write(processed) + import zlib +- compressed = zlib.compress(processed) ++ compressed = zlib.compress(processed.encode('utf-8')) + data = ToCArray(compressed) + c_out.write(HEADER_TEMPLATE % { + 'sources_type': 'unsigned char', +@@ -107,7 +107,7 @@ def preprocess(cxx, preprocessorOption, source, args = []): + tmpOut = 'self-hosting-preprocessed.pp'; + outputArg = shlex.split(preprocessorOption + tmpOut) + +- with open(tmpIn, 'wb') as input: ++ with open(tmpIn, 'w') as input: + input.write(source) + print(' '.join(cxx + outputArg + args + [tmpIn])) + result = subprocess.Popen(cxx + outputArg + args + [tmpIn]).wait() +diff --git a/js/src/configure b/js/src/configure +index 3b3a39af3..8f5ea41d0 100755 +--- a/js/src/configure ++++ b/js/src/configure +@@ -24,4 +24,4 @@ export OLD_CONFIGURE="$SRCDIR"/old-configure + + set -- "$@" --enable-project=js + +-which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" ++which python3 > /dev/null && exec python3 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" +diff --git a/js/src/frontend/GenerateReservedWords.py b/js/src/frontend/GenerateReservedWords.py +index 3aa2307b9..381c8e2b4 100644 +--- a/js/src/frontend/GenerateReservedWords.py ++++ b/js/src/frontend/GenerateReservedWords.py +@@ -80,14 +80,14 @@ def split_list_per_column(reserved_word_list, column): + per_column = column_dict.setdefault(word[column], []) + per_column.append(item) + +- return sorted(column_dict.items(), key=lambda (char, word): ord(char)) ++ return sorted(list(column_dict.items()), key=lambda char_word: ord(char_word[0])) + + def generate_letter_switch(opt, unprocessed_columns, reserved_word_list, + columns=None): + assert(len(reserved_word_list) != 0); + + if not columns: +- columns = range(0, unprocessed_columns) ++ columns = list(range(0, unprocessed_columns)) + + if len(reserved_word_list) == 1: + index, word = reserved_word_list[0] +@@ -161,7 +161,7 @@ def split_list_per_length(reserved_word_list): + per_length = length_dict.setdefault(len(word), []) + per_length.append(item) + +- return sorted(length_dict.items(), key=lambda (length, word): length) ++ return sorted(list(length_dict.items()), key=lambda length_word: length_word[0]) + + def generate_switch(opt, reserved_word_list): + assert(len(reserved_word_list) != 0); +diff --git a/js/src/gc/GenerateStatsPhases.py b/js/src/gc/GenerateStatsPhases.py +index 2daf83555..e39a26a4b 100644 +--- a/js/src/gc/GenerateStatsPhases.py ++++ b/js/src/gc/GenerateStatsPhases.py +@@ -267,7 +267,7 @@ def generateHeader(out): + # + # Generate PhaseKind enum. + # +- phaseKindNames = map(lambda phaseKind: phaseKind.name, AllPhaseKinds) ++ phaseKindNames = [phaseKind.name for phaseKind in AllPhaseKinds] + extraPhaseKinds = [ + "NONE = LIMIT", + "EXPLICIT_SUSPENSION = LIMIT", +@@ -279,7 +279,7 @@ def generateHeader(out): + # + # Generate Phase enum. + # +- phaseNames = map(lambda phase: phase.name, AllPhases) ++ phaseNames = [phase.name for phase in AllPhases] + extraPhases = [ + "NONE = LIMIT", + "EXPLICIT_SUSPENSION = LIMIT", +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 11c3d5a2e..389265404 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1884,3 +1884,5 @@ if test "$JS_STANDALONE"; then + fi + + rm -fr confdefs* $ac_clean_files ++echo confdefs* $ac_clean_files removed ++echo "old-configure done" +diff --git a/memory/build/moz.build b/memory/build/moz.build +index e2c715271..f09ce7935 100644 +--- a/memory/build/moz.build ++++ b/memory/build/moz.build +@@ -30,7 +30,7 @@ else: + 'fallback.cpp', + ] + +-if CONFIG['OS_TARGET'] == 'Darwin' and (CONFIG['MOZ_REPLACE_MALLOC'] or ++if str(CONFIG['OS_TARGET']) == 'Darwin' and (CONFIG['MOZ_REPLACE_MALLOC'] or + CONFIG['MOZ_MEMORY']): + SOURCES += [ + 'zone.c', +@@ -38,15 +38,15 @@ if CONFIG['OS_TARGET'] == 'Darwin' and (CONFIG['MOZ_REPLACE_MALLOC'] or + + Library('memory') + +-if CONFIG['OS_TARGET'] == 'Android' and CONFIG['CC_TYPE'] == 'clang': ++if str(CONFIG['OS_TARGET']) == 'Android' and str(CONFIG['CC_TYPE']) == 'clang': + CXXFLAGS += [ + '-Wno-tautological-pointer-compare', + ] + +-if CONFIG['MOZ_BUILD_APP'] != 'memory': ++if str(CONFIG['MOZ_BUILD_APP']) != 'memory': + FINAL_LIBRARY = 'mozglue' + +-if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'): ++if str(CONFIG['CC_TYPE']) in ('msvc', 'clang-cl'): + CXXFLAGS += ['-wd4273'] # inconsistent dll linkage (bug 558163) + + if CONFIG['MOZ_REPLACE_MALLOC_STATIC']: +diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build +index 53758485a..5e9308802 100644 +--- a/mozglue/build/moz.build ++++ b/mozglue/build/moz.build +@@ -9,12 +9,12 @@ + # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in + if CONFIG['JS_STANDALONE'] and not CONFIG['MOZ_MEMORY']: + Library('mozglue') +-elif CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): ++elif str(CONFIG['OS_TARGET']) in ('WINNT', 'Darwin', 'Android'): + SharedLibrary('mozglue') + else: + Library('mozglue') + +-if CONFIG['OS_TARGET'] == 'Android': ++if str(CONFIG['OS_TARGET']) == 'Android': + SOURCES += [ + 'BionicGlue.cpp', + ] +@@ -24,14 +24,14 @@ if CONFIG['MOZ_ASAN']: + 'AsanOptions.cpp', + ] + +-if CONFIG['OS_TARGET'] == 'WINNT': ++if str(CONFIG['OS_TARGET']) == 'WINNT': + DEFFILE = 'mozglue.def' + # We'll break the DLL blocklist if we immediately load user32.dll + DELAYLOAD_DLLS += [ + 'user32.dll', + ] + +- if CONFIG['CC_TYPE'] == "msvc": ++ if str(CONFIG['CC_TYPE']) == "msvc": + CFLAGS += ['-guard:cf'] + CXXFLAGS += ['-guard:cf'] + LDFLAGS += ['-guard:cf'] +@@ -48,12 +48,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT']: + 'dummy.cpp', + ] + +- if CONFIG['OS_TARGET'] == 'WINNT': ++ if str(CONFIG['OS_TARGET']) == 'WINNT': + LOCAL_INCLUDES += [ + '/memory/build', + ] + +- if CONFIG['CC_TYPE'] == "msvc": ++ if str(CONFIG['CC_TYPE']) == "msvc": + SOURCES += ['WindowsCFGStatus.cpp'] + SOURCES += [ + 'Authenticode.cpp', +@@ -85,17 +85,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT']: + 'WindowsDllBlocklist.h', + ] + +- if CONFIG['CPU_ARCH'].startswith('x86'): ++ if str(CONFIG['CPU_ARCH']).startswith('x86'): + SOURCES += [ + 'SSE.cpp', + ] + +- if CONFIG['CPU_ARCH'] == 'arm': ++ if str(CONFIG['CPU_ARCH']) == 'arm': + SOURCES += [ + 'arm.cpp', + ] + +- if CONFIG['CPU_ARCH'].startswith('mips'): ++ if str(CONFIG['CPU_ARCH']).startswith('mips'): + SOURCES += [ + 'mips.cpp', + ] +@@ -114,7 +114,7 @@ LIBRARY_DEFINES['MOZ_HAS_MOZGLUE'] = True + + LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS'] + +-if CONFIG['OS_TARGET'] == 'Darwin': ++if str(CONFIG['OS_TARGET']) == 'Darwin': + # On OSX 10.10.3, a dead lock happens in some cases involving dynamic + # symbol resolution for symbols that jemalloc itself uses. While it + # might be possible to find a way to avoid all such symbol resolutions, +@@ -124,7 +124,7 @@ if CONFIG['OS_TARGET'] == 'Darwin': + # for TLS. + LDFLAGS += ['-Wl,-bind_at_load'] + +-if CONFIG['MOZ_LINKER'] and CONFIG['TARGET_CPU'] == 'arm': ++if CONFIG['MOZ_LINKER'] and str(CONFIG['TARGET_CPU']) == 'arm': + LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR] + + DIST_INSTALL = True +diff --git a/python/mozbuild/mozbuild/action/check_binary.py b/python/mozbuild/mozbuild/action/check_binary.py +index 5665ef053..b696f73d6 100644 +--- a/python/mozbuild/mozbuild/action/check_binary.py ++++ b/python/mozbuild/mozbuild/action/check_binary.py +@@ -104,6 +104,8 @@ def iter_readelf_symbols(target, binary): + + def iter_readelf_dynamic(target, binary): + for line in get_output(target['readelf'], '-d', binary): ++ if isinstance(line, bytes): ++ line=line.decode('utf-8') + data = line.split(None, 2) + if data and len(data) == 3 and data[0].startswith('0x'): + yield data[1].rstrip(')').lstrip('('), data[2] +diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py +index 563fbb8fa..c3df2869b 100644 +--- a/python/mozbuild/mozbuild/action/process_define_files.py ++++ b/python/mozbuild/mozbuild/action/process_define_files.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import argparse + import os +@@ -53,7 +53,7 @@ def process_define_file(output, input): + 'CONFIGURE_DEFINE_FILE') + defines = '\n'.join(sorted( + '#define %s %s' % (name, val) +- for name, val in config.defines['ALLDEFINES'].iteritems())) ++ for name, val in config.defines['ALLDEFINES'].items())) + l = l[:m.start('cmd') - 1] \ + + defines + l[m.end('name'):] + elif cmd == 'define': +diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py +index a8d5c94e0..7cda63475 100644 +--- a/python/mozbuild/mozbuild/backend/base.py ++++ b/python/mozbuild/mozbuild/backend/base.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + from abc import ( + ABCMeta, +@@ -31,7 +31,7 @@ from .configenvironment import ConfigEnvironment + from mozbuild.base import ExecutionSummary + + +-class BuildBackend(LoggingMixin): ++class BuildBackend(LoggingMixin, metaclass=ABCMeta): + """Abstract base class for build backends. + + A build backend is merely a consumer of the build configuration (the output +@@ -39,8 +39,6 @@ class BuildBackend(LoggingMixin): + is the discretion of the specific implementation. + """ + +- __metaclass__ = ABCMeta +- + def __init__(self, environment): + assert isinstance(environment, (ConfigEnvironment, EmptyConfig)) + self.populate_logger() +@@ -311,7 +309,7 @@ class BuildBackend(LoggingMixin): + srcdir = mozpath.dirname(obj.input_path) + pp.context.update({ + k: ' '.join(v) if isinstance(v, list) else v +- for k, v in obj.config.substs.iteritems() ++ for k, v in obj.config.substs.items() + }) + pp.context.update( + top_srcdir=obj.topsrcdir, +diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py +index d00cbbcaf..f747df446 100644 +--- a/python/mozbuild/mozbuild/backend/common.py ++++ b/python/mozbuild/mozbuild/backend/common.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import json + import os +@@ -174,7 +174,7 @@ class CommonBackend(BuildBackend): + if len(self._idl_manager.idls): + self._write_rust_xpidl_summary(self._idl_manager) + self._handle_idl_manager(self._idl_manager) +- self._handle_generated_sources(mozpath.join(self.environment.topobjdir, 'dist/include/%s.h' % idl['root']) for idl in self._idl_manager.idls.values()) ++ self._handle_generated_sources(mozpath.join(self.environment.topobjdir, 'dist/include/%s.h' % idl['root']) for idl in list(self._idl_manager.idls.values())) + + + for config in self._configs: +@@ -372,14 +372,14 @@ class CommonBackend(BuildBackend): + + with self._write_file(mozpath.join(topobjdir, 'dist', 'xpcrs', 'rt', 'all.rs')) as fh: + fh.write("// THIS FILE IS GENERATED - DO NOT EDIT\n\n") +- for idl in manager.idls.values(): ++ for idl in list(manager.idls.values()): + fh.write(include_tmpl % ("rt", idl['root'])) + fh.write(";\n") + + with self._write_file(mozpath.join(topobjdir, 'dist', 'xpcrs', 'bt', 'all.rs')) as fh: + fh.write("// THIS FILE IS GENERATED - DO NOT EDIT\n\n") + fh.write("&[\n") +- for idl in manager.idls.values(): ++ for idl in list(manager.idls.values()): + fh.write(include_tmpl % ("bt", idl['root'])) + fh.write(",\n") + fh.write("]\n") +diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py +index 3676a7d18..f0896cea4 100644 +--- a/python/mozbuild/mozbuild/backend/configenvironment.py ++++ b/python/mozbuild/mozbuild/backend/configenvironment.py +@@ -2,14 +2,14 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import os + import sys + import json + + from collections import Iterable, OrderedDict +-from types import StringTypes, ModuleType ++from types import ModuleType + + import mozpack.path as mozpath + +@@ -22,7 +22,7 @@ from mozbuild.shellutil import quote as shell_quote + + + if sys.version_info.major == 2: +- text_type = unicode ++ text_type = str + else: + text_type = str + +@@ -151,7 +151,7 @@ class ConfigEnvironment(object): + shell_quote(self.defines[name]).replace('$', '$$')) + for name in sorted(global_defines)]) + def serialize(name, obj): +- if isinstance(obj, StringTypes): ++ if isinstance(obj, str): + return obj + if isinstance(obj, Iterable): + return ' '.join(obj) +@@ -185,8 +185,8 @@ class ConfigEnvironment(object): + except UnicodeDecodeError: + return v.decode('utf-8', 'replace') + +- for k, v in self.substs.items(): +- if not isinstance(v, StringTypes): ++ for k, v in list(self.substs.items()): ++ if not isinstance(v, str): + if isinstance(v, Iterable): + type(v)(decode(i) for i in v) + elif not isinstance(v, text_type): +@@ -255,7 +255,7 @@ class PartialConfigDict(object): + existing_files = self._load_config_track() + + new_files = set() +- for k, v in values.iteritems(): ++ for k, v in values.items(): + new_files.add(self._write_file(k, v)) + + for filename in existing_files - new_files: +diff --git a/python/mozbuild/mozbuild/backend/fastermake.py b/python/mozbuild/mozbuild/backend/fastermake.py +index b029aa10f..b66ade64f 100644 +--- a/python/mozbuild/mozbuild/backend/fastermake.py ++++ b/python/mozbuild/mozbuild/backend/fastermake.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals, print_function ++ + + from mozbuild.backend.base import PartialBackend + from mozbuild.backend.common import CommonBackend +@@ -140,7 +140,7 @@ class FasterMakeBackend(CommonBackend, PartialBackend): + # Add information for chrome manifest generation + manifest_targets = [] + +- for target, entries in self._manifest_entries.iteritems(): ++ for target, entries in self._manifest_entries.items(): + manifest_targets.append(target) + install_target = mozpath.basedir(target, install_manifests_bases) + self._install_manifests[install_target].add_content( +@@ -152,13 +152,13 @@ class FasterMakeBackend(CommonBackend, PartialBackend): + % ' '.join(self._install_manifests.keys())) + + # Add dependencies we infered: +- for target, deps in self._dependencies.iteritems(): ++ for target, deps in self._dependencies.items(): + mk.create_rule([target]).add_dependencies( + '$(TOPOBJDIR)/%s' % d for d in deps) + + mk.add_statement('include $(TOPSRCDIR)/config/faster/rules.mk') + +- for base, install_manifest in self._install_manifests.iteritems(): ++ for base, install_manifest in self._install_manifests.items(): + with self._write_file( + mozpath.join(self.environment.topobjdir, 'faster', + 'install_%s' % base.replace('/', '_'))) as fh: +@@ -167,7 +167,7 @@ class FasterMakeBackend(CommonBackend, PartialBackend): + # For artifact builds only, write a single unified manifest for consumption by |mach watch|. + if self.environment.is_artifact_build: + unified_manifest = InstallManifest() +- for base, install_manifest in self._install_manifests.iteritems(): ++ for base, install_manifest in self._install_manifests.items(): + # Expect 'dist/bin/**', which includes 'dist/bin' with no trailing slash. + assert base.startswith('dist/bin') + base = base[len('dist/bin'):] +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index dd9020d62..aa89cc297 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import logging + import os +@@ -12,7 +12,7 @@ from collections import ( + defaultdict, + namedtuple, + ) +-from StringIO import StringIO ++from io import StringIO + from itertools import chain + + from mozpack.manifests import ( +@@ -80,75 +80,76 @@ from ..util import ( + ) + from ..makeutil import Makefile + from mozbuild.shellutil import quote as shell_quote ++from functools import reduce + + MOZBUILD_VARIABLES = [ +- b'ASFLAGS', +- b'CMSRCS', +- b'CMMSRCS', +- b'CPP_UNIT_TESTS', +- b'DIRS', +- b'DIST_INSTALL', +- b'EXTRA_DSO_LDOPTS', +- b'EXTRA_JS_MODULES', +- b'EXTRA_PP_COMPONENTS', +- b'EXTRA_PP_JS_MODULES', +- b'FORCE_SHARED_LIB', +- b'FORCE_STATIC_LIB', +- b'FINAL_LIBRARY', +- b'HOST_CFLAGS', +- b'HOST_CSRCS', +- b'HOST_CMMSRCS', +- b'HOST_CXXFLAGS', +- b'HOST_EXTRA_LIBS', +- b'HOST_LIBRARY_NAME', +- b'HOST_PROGRAM', +- b'HOST_SIMPLE_PROGRAMS', +- b'JAR_MANIFEST', +- b'JAVA_JAR_TARGETS', +- b'LIBRARY_NAME', +- b'LIBS', +- b'MAKE_FRAMEWORK', +- b'MODULE', +- b'NO_DIST_INSTALL', +- b'NO_EXPAND_LIBS', +- b'NO_INTERFACES_MANIFEST', +- b'NO_JS_MANIFEST', +- b'OS_LIBS', +- b'PARALLEL_DIRS', +- b'PREF_JS_EXPORTS', +- b'PROGRAM', +- b'RESOURCE_FILES', +- b'SHARED_LIBRARY_LIBS', +- b'SHARED_LIBRARY_NAME', +- b'SIMPLE_PROGRAMS', +- b'SONAME', +- b'STATIC_LIBRARY_NAME', +- b'TEST_DIRS', +- b'TOOL_DIRS', ++ 'ASFLAGS', ++ 'CMSRCS', ++ 'CMMSRCS', ++ 'CPP_UNIT_TESTS', ++ 'DIRS', ++ 'DIST_INSTALL', ++ 'EXTRA_DSO_LDOPTS', ++ 'EXTRA_JS_MODULES', ++ 'EXTRA_PP_COMPONENTS', ++ 'EXTRA_PP_JS_MODULES', ++ 'FORCE_SHARED_LIB', ++ 'FORCE_STATIC_LIB', ++ 'FINAL_LIBRARY', ++ 'HOST_CFLAGS', ++ 'HOST_CSRCS', ++ 'HOST_CMMSRCS', ++ 'HOST_CXXFLAGS', ++ 'HOST_EXTRA_LIBS', ++ 'HOST_LIBRARY_NAME', ++ 'HOST_PROGRAM', ++ 'HOST_SIMPLE_PROGRAMS', ++ 'JAR_MANIFEST', ++ 'JAVA_JAR_TARGETS', ++ 'LIBRARY_NAME', ++ 'LIBS', ++ 'MAKE_FRAMEWORK', ++ 'MODULE', ++ 'NO_DIST_INSTALL', ++ 'NO_EXPAND_LIBS', ++ 'NO_INTERFACES_MANIFEST', ++ 'NO_JS_MANIFEST', ++ 'OS_LIBS', ++ 'PARALLEL_DIRS', ++ 'PREF_JS_EXPORTS', ++ 'PROGRAM', ++ 'RESOURCE_FILES', ++ 'SHARED_LIBRARY_LIBS', ++ 'SHARED_LIBRARY_NAME', ++ 'SIMPLE_PROGRAMS', ++ 'SONAME', ++ 'STATIC_LIBRARY_NAME', ++ 'TEST_DIRS', ++ 'TOOL_DIRS', + # XXX config/Makefile.in specifies this in a make invocation + #'USE_EXTENSION_MANIFEST', +- b'XPCSHELL_TESTS', +- b'XPIDL_MODULE', ++ 'XPCSHELL_TESTS', ++ 'XPIDL_MODULE', + ] + + DEPRECATED_VARIABLES = [ +- b'EXPORT_LIBRARY', +- b'EXTRA_LIBS', +- b'HOST_LIBS', +- b'LIBXUL_LIBRARY', +- b'MOCHITEST_A11Y_FILES', +- b'MOCHITEST_BROWSER_FILES', +- b'MOCHITEST_BROWSER_FILES_PARTS', +- b'MOCHITEST_CHROME_FILES', +- b'MOCHITEST_FILES', +- b'MOCHITEST_FILES_PARTS', +- b'MOCHITEST_METRO_FILES', +- b'MOCHITEST_ROBOCOP_FILES', +- b'MODULE_OPTIMIZE_FLAGS', +- b'MOZ_CHROME_FILE_FORMAT', +- b'SHORT_LIBNAME', +- b'TESTING_JS_MODULES', +- b'TESTING_JS_MODULE_DIR', ++ 'EXPORT_LIBRARY', ++ 'EXTRA_LIBS', ++ 'HOST_LIBS', ++ 'LIBXUL_LIBRARY', ++ 'MOCHITEST_A11Y_FILES', ++ 'MOCHITEST_BROWSER_FILES', ++ 'MOCHITEST_BROWSER_FILES_PARTS', ++ 'MOCHITEST_CHROME_FILES', ++ 'MOCHITEST_FILES', ++ 'MOCHITEST_FILES_PARTS', ++ 'MOCHITEST_METRO_FILES', ++ 'MOCHITEST_ROBOCOP_FILES', ++ 'MODULE_OPTIMIZE_FLAGS', ++ 'MOZ_CHROME_FILE_FORMAT', ++ 'SHORT_LIBNAME', ++ 'TESTING_JS_MODULES', ++ 'TESTING_JS_MODULE_DIR', + ] + + MOZBUILD_VARIABLES_MESSAGE = 'It should only be defined in moz.build files.' +@@ -207,7 +208,7 @@ class BackendMakeFile(object): + self.fh.write(buf) + + def write_once(self, buf): +- if isinstance(buf, unicode): ++ if isinstance(buf, str): + buf = buf.encode('utf-8') + if b'\n' + buf not in self.fh.getvalue(): + self.write(buf) +@@ -280,7 +281,7 @@ class RecursiveMakeTraversal(object): + Helper function to call a filter from compute_dependencies and + traverse. + """ +- return filter(current, self.get_subdirs(current)) ++ return list(filter(current, self.get_subdirs(current))) + + def compute_dependencies(self, filter=None): + """ +@@ -710,7 +711,7 @@ class RecursiveMakeBackend(CommonBackend): + convenience variables, and the other dependency definitions for a + hopefully proper directory traversal. + """ +- for tier, no_skip in self._no_skip.items(): ++ for tier, no_skip in list(self._no_skip.items()): + self.log(logging.DEBUG, 'fill_root_mk', { + 'number': len(no_skip), 'tier': tier + }, 'Using {number} directories during {tier}') +@@ -757,7 +758,7 @@ class RecursiveMakeBackend(CommonBackend): + for tier, filter in filters: + main, all_deps = \ + self._traversal.compute_dependencies(filter) +- for dir, deps in all_deps.items(): ++ for dir, deps in list(all_deps.items()): + if deps is not None or (dir in self._idl_dirs \ + and tier == 'export'): + rule = root_deps_mk.create_rule(['%s/%s' % (dir, tier)]) +@@ -770,7 +771,7 @@ class RecursiveMakeBackend(CommonBackend): + rule.add_dependencies('%s/%s' % (d, tier) for d in main) + + all_compile_deps = reduce(lambda x,y: x|y, +- self._compile_graph.values()) if self._compile_graph else set() ++ list(self._compile_graph.values())) if self._compile_graph else set() + # Include the following as dependencies of the top recursion target for + # compilation: + # - nodes that are not dependended upon by anything. Typically, this +@@ -783,7 +784,7 @@ class RecursiveMakeBackend(CommonBackend): + # as direct dependencies of the top recursion target, to somehow + # prioritize them. + # 1. See bug 1262241 comment 5. +- compile_roots = [t for t, deps in self._compile_graph.iteritems() ++ compile_roots = [t for t, deps in list(self._compile_graph.items()) + if not deps or t not in all_compile_deps] + + rule = root_deps_mk.create_rule(['recurse_compile']) +@@ -845,14 +846,14 @@ class RecursiveMakeBackend(CommonBackend): + rule.add_dependencies(['$(CURDIR)/%: %']) + + def _check_blacklisted_variables(self, makefile_in, makefile_content): +- if b'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content: ++ if 'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content: + # Bypass the variable restrictions for externally managed makefiles. + return + + for l in makefile_content.splitlines(): + l = l.strip() + # Don't check comments +- if l.startswith(b'#'): ++ if l.startswith('#'): + continue + for x in chain(MOZBUILD_VARIABLES, DEPRECATED_VARIABLES): + if x not in l: +@@ -909,11 +910,11 @@ class RecursiveMakeBackend(CommonBackend): + # Directories with a Makefile containing a tools target, or + # XPI_PKGNAME or INSTALL_EXTENSION_ID can't be skipped and + # must run during the 'tools' tier. +- for t in (b'XPI_PKGNAME', b'INSTALL_EXTENSION_ID', +- b'tools'): ++ for t in ('XPI_PKGNAME', 'INSTALL_EXTENSION_ID', ++ 'tools'): + if t not in content: + continue +- if t == b'tools' and not re.search('(?:^|\s)tools.*::', content, re.M): ++ if t == 'tools' and not re.search('(?:^|\s)tools.*::', content, re.M): + continue + if objdir == self.environment.topobjdir: + continue +@@ -933,7 +934,7 @@ class RecursiveMakeBackend(CommonBackend): + self._fill_root_mk() + + # Make the master test manifest files. +- for flavor, t in self._test_manifests.items(): ++ for flavor, t in list(self._test_manifests.items()): + install_prefix, manifests = t + manifest_stem = mozpath.join(install_prefix, '%s.ini' % flavor) + self._write_master_test_manifest(mozpath.join( +@@ -1039,7 +1040,7 @@ class RecursiveMakeBackend(CommonBackend): + for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done'): + build_files.add_optional_exists(p) + +- for idl in manager.idls.values(): ++ for idl in list(manager.idls.values()): + self._install_manifests['dist_idl'].add_link(idl['source'], + idl['basename']) + self._install_manifests['dist_include'].add_optional_exists('%s.h' +@@ -1086,7 +1087,7 @@ class RecursiveMakeBackend(CommonBackend): + + interfaces_manifests = [] + dist_dir = mozpath.join(self.environment.topobjdir, 'dist') +- for manifest, entries in manager.interface_manifests.items(): ++ for manifest, entries in list(manager.interface_manifests.items()): + interfaces_manifests.append(mozpath.join('$(DEPTH)', manifest)) + for xpt in sorted(entries): + registered_xpt_files.add(mozpath.join( +@@ -1194,7 +1195,7 @@ class RecursiveMakeBackend(CommonBackend): + # Don't allow files to be defined multiple times unless it is allowed. + # We currently allow duplicates for non-test files or test files if + # the manifest is listed as a duplicate. +- for source, (dest, is_test) in obj.installs.items(): ++ for source, (dest, is_test) in list(obj.installs.items()): + try: + self._install_manifests['_test_files'].add_link(source, dest) + except ValueError: +@@ -1558,7 +1559,7 @@ class RecursiveMakeBackend(CommonBackend): + man_dir = mozpath.join(self.environment.topobjdir, '_build_manifests', + dest) + +- for k, manifest in manifests.items(): ++ for k, manifest in list(manifests.items()): + with self._write_file(mozpath.join(man_dir, k)) as fh: + manifest.write(fileobj=fh) + +@@ -1593,20 +1594,20 @@ class RecursiveMakeBackend(CommonBackend): + pp.context.update(extra) + if not pp.context.get('autoconfmk', ''): + pp.context['autoconfmk'] = 'autoconf.mk' +- pp.handleLine(b'# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n'); +- pp.handleLine(b'DEPTH := @DEPTH@\n') +- pp.handleLine(b'topobjdir := @topobjdir@\n') +- pp.handleLine(b'topsrcdir := @top_srcdir@\n') +- pp.handleLine(b'srcdir := @srcdir@\n') +- pp.handleLine(b'VPATH := @srcdir@\n') +- pp.handleLine(b'relativesrcdir := @relativesrcdir@\n') +- pp.handleLine(b'include $(DEPTH)/config/@autoconfmk@\n') ++ pp.handleLine('# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n'); ++ pp.handleLine('DEPTH := @DEPTH@\n') ++ pp.handleLine('topobjdir := @topobjdir@\n') ++ pp.handleLine('topsrcdir := @top_srcdir@\n') ++ pp.handleLine('srcdir := @srcdir@\n') ++ pp.handleLine('VPATH := @srcdir@\n') ++ pp.handleLine('relativesrcdir := @relativesrcdir@\n') ++ pp.handleLine('include $(DEPTH)/config/@autoconfmk@\n') + if not stub: + pp.do_include(obj.input_path) + # Empty line to avoid failures when last line in Makefile.in ends + # with a backslash. +- pp.handleLine(b'\n') +- pp.handleLine(b'include $(topsrcdir)/config/recurse.mk\n') ++ pp.handleLine('\n') ++ pp.handleLine('include $(topsrcdir)/config/recurse.mk\n') + if not stub: + # Adding the Makefile.in here has the desired side-effect + # that if the Makefile.in disappears, this will force +diff --git a/python/mozbuild/mozbuild/config_status.py b/python/mozbuild/mozbuild/config_status.py +index d46f1332d..a9a27a699 100644 +--- a/python/mozbuild/mozbuild/config_status.py ++++ b/python/mozbuild/mozbuild/config_status.py +@@ -77,6 +77,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + See build/autoconf/config.status.m4. + ''' + ++ print("config_status started") + if 'CONFIG_FILES' in os.environ: + raise Exception('Using the CONFIG_FILES environment variable is not ' + 'supported.') +@@ -119,7 +120,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + if 'WRITE_MOZINFO' in os.environ: + write_mozinfo(os.path.join(topobjdir, 'mozinfo.json'), env, os.environ) + +- cpu_start = time.clock() ++ cpu_start = time.perf_counter() + time_start = time.time() + + # Make appropriate backend instances, defaulting to RecursiveMakeBackend, +@@ -155,7 +156,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + summary = obj.gyp_summary() + print(summary, file=sys.stderr) + +- cpu_time = time.clock() - cpu_start ++ cpu_time = time.perf_counter() - cpu_start + wall_time = time.time() - time_start + efficiency = cpu_time / wall_time if wall_time else 100 + untracked = wall_time - execution_time +@@ -179,3 +180,5 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + # Advertise Android Studio if it is appropriate. + if MachCommandConditions.is_android(env): + print(ANDROID_IDE_ADVERTISEMENT) ++ ++ print("config_status finished") +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index d03615707..13d623d4f 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -2,9 +2,9 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals + +-import __builtin__ ++ ++import builtins + import inspect + import logging + import os +@@ -38,6 +38,8 @@ from mozbuild.util import ( + + import mozpack.path as mozpath + ++import traceback ++ + + class ConfigureError(Exception): + pass +@@ -69,7 +71,7 @@ class SandboxDependsFunction(object): + def __getattr__(self, key): + return self._getattr(key).sandboxed + +- def __nonzero__(self): ++ def __bool__(self): + raise ConfigureError( + 'Cannot do boolean operations on @depends functions.') + +@@ -96,6 +98,7 @@ class DependsFunction(object): + sandbox._value_for(self) + elif not sandbox._help: + sandbox._execution_queue.append((sandbox._value_for, (self,))) ++ sandbox.tasks_debug_out("DependsFunction.__init %s" % func.__name__) + + @property + def name(self): +@@ -206,6 +209,15 @@ class CombinedDependsFunction(DependsFunction): + def __ne__(self, other): + return not self == other + ++ def __hash__(self): ++ # This was one was taken from [1] initially. Should not have done that: ++ # it causes explosion of ConfigureSandbox._execution_queue with 100% ++ # CPU load and eating all avaliable memory... ++ # ++ # [1] https://code.foxkit.us/adelie/packages/blob/f2b5773da19ab397fbe64fd32dacc383cfe4cd77/user/mozjs/python3.patch#L8068 ++ return hash((self._name, tuple(self.dependencies))) ++ ++ + class SandboxedGlobal(dict): + '''Identifiable dict type for use as function global''' + +@@ -253,11 +265,12 @@ class ConfigureSandbox(dict): + # The default set of builtins. We expose unicode as str to make sandboxed + # files more python3-ready. + BUILTINS = ReadOnlyDict({ +- b: getattr(__builtin__, b) ++ b: getattr(builtins, b) + for b in ('None', 'False', 'True', 'int', 'bool', 'any', 'all', 'len', + 'list', 'tuple', 'set', 'dict', 'isinstance', 'getattr', +- 'hasattr', 'enumerate', 'range', 'zip') +- }, __import__=forbidden_import, str=unicode) ++ 'hasattr', 'enumerate', 'range', 'zip', '__build_class__', ++ 'bytes', 'exec') ++ }, __import__=forbidden_import, str=str) + + # Expose a limited set of functions from os.path + OS = ReadOnlyNamespace(path=ReadOnlyNamespace(**{ +@@ -294,6 +307,11 @@ class ConfigureSandbox(dict): + # Queue of functions to execute, with their arguments + self._execution_queue = [] + ++ # For debugging: Show number of tasks started in run() / added elsewhere ++ # and some additional info ++ self.task_debug = False # set True to enable ++ self.tasks_started = 0 ++ + # Store the `when`s associated to some options. + self._conditions = {} + +@@ -331,7 +349,7 @@ class ConfigureSandbox(dict): + return method + def wrapped(*args, **kwargs): + out_args = [ +- arg.decode(encoding) if isinstance(arg, str) else arg ++ arg.decode(encoding) if isinstance(arg, bytes) else arg + for arg in args + ] + return method(*out_args, **kwargs) +@@ -360,6 +378,14 @@ class ConfigureSandbox(dict): + handler.setFormatter(formatter) + logger.addHandler(handler) + ++ def tasks_debug_out(self, text): ++ if self.task_debug: ++ print("%s / queued %i / done %i" %(text, len(self._execution_queue), self.tasks_started)) ++ #if len(self._execution_queue) > 5000: ++ # traceback.print_stack(file=sys.stdout) ++ #if len(self._execution_queue) > 5010: ++ # raise Exception("Too many tasks") ++ + def include_file(self, path): + '''Include one file in the sandbox. Users of this class probably want + to use `run` instead. +@@ -380,6 +406,9 @@ class ConfigureSandbox(dict): + if path in self._all_paths: + raise ConfigureError( + 'Cannot include `%s` because it was included already.' % path) ++ ++ if self.task_debug: ++ print("include_file", path) + self._paths.append(path) + self._all_paths.add(path) + +@@ -398,7 +427,7 @@ class ConfigureSandbox(dict): + if path: + self.include_file(path) + +- for option in self._options.itervalues(): ++ for option in self._options.values(): + # All options must be referenced by some @depends function + if option not in self._seen: + raise ConfigureError( +@@ -425,6 +454,8 @@ class ConfigureSandbox(dict): + + # Run the execution queue + for func, args in self._execution_queue: ++ self.tasks_started += 1 ++ self.tasks_debug_out("ConfigureSandbox.run(%s)" % func.__name__) + func(*args) + + if self._help: +@@ -504,7 +535,7 @@ class ConfigureSandbox(dict): + value = PositiveOptionValue() + elif value is False or value == (): + value = NegativeOptionValue() +- elif isinstance(value, types.StringTypes): ++ elif isinstance(value, (str,)): + value = PositiveOptionValue((value,)) + elif isinstance(value, tuple): + value = PositiveOptionValue(value) +@@ -544,7 +575,7 @@ class ConfigureSandbox(dict): + return value + + def _dependency(self, arg, callee_name, arg_name=None): +- if isinstance(arg, types.StringTypes): ++ if isinstance(arg, (str,)): + prefix, name, values = Option.split_option(arg) + if values != (): + raise ConfigureError("Option must not contain an '='") +@@ -608,7 +639,7 @@ class ConfigureSandbox(dict): + ''' + when = self._normalize_when(kwargs.get('when'), 'option') + args = [self._resolve(arg) for arg in args] +- kwargs = {k: self._resolve(v) for k, v in kwargs.iteritems() ++ kwargs = {k: self._resolve(v) for k, v in kwargs.items() + if k != 'when'} + option = Option(*args, **kwargs) + if when: +@@ -689,7 +720,7 @@ class ConfigureSandbox(dict): + with self.only_when_impl(when): + what = self._resolve(what) + if what: +- if not isinstance(what, types.StringTypes): ++ if not isinstance(what, (str,)): + raise TypeError("Unexpected type: '%s'" % type(what).__name__) + self.include_file(what) + +@@ -707,7 +738,7 @@ class ConfigureSandbox(dict): + (k[:-len('_impl')], getattr(self, k)) + for k in dir(self) if k.endswith('_impl') and k != 'template_impl' + ) +- glob.update((k, v) for k, v in self.iteritems() if k not in glob) ++ glob.update((k, v) for k, v in self.items() if k not in glob) + + # Any function argument to the template must be prepared to be sandboxed. + # If the template itself returns a function (in which case, it's very +@@ -731,7 +762,7 @@ class ConfigureSandbox(dict): + def wrapper(*args, **kwargs): + args = [maybe_prepare_function(arg) for arg in args] + kwargs = {k: maybe_prepare_function(v) +- for k, v in kwargs.iteritems()} ++ for k, v in kwargs.items()} + ret = template(*args, **kwargs) + if isfunction(ret): + # We can't expect the sandboxed code to think about all the +@@ -766,7 +797,7 @@ class ConfigureSandbox(dict): + for value, required in ( + (_import, True), (_from, False), (_as, False)): + +- if not isinstance(value, types.StringTypes) and ( ++ if not isinstance(value, (str,)) and ( + required or value is not None): + raise TypeError("Unexpected type: '%s'" % type(value).__name__) + if value is not None and not self.RE_MODULE.match(value): +@@ -807,7 +838,7 @@ class ConfigureSandbox(dict): + # Special case for the open() builtin, because otherwise, using it + # fails with "IOError: file() constructor not accessible in + # restricted mode" +- if what == '__builtin__.open': ++ if what == 'builtins.open': + return lambda *args, **kwargs: open(*args, **kwargs) + # Until this proves to be a performance problem, just construct an + # import statement and execute it. +@@ -829,7 +860,7 @@ class ConfigureSandbox(dict): + name = self._resolve(name, need_help_dependency=False) + if name is None: + return +- if not isinstance(name, types.StringTypes): ++ if not isinstance(name, (str,)): + raise TypeError("Unexpected type: '%s'" % type(name).__name__) + if name in data: + raise ConfigureError( +@@ -850,6 +881,7 @@ class ConfigureSandbox(dict): + + self._execution_queue.append(( + self._resolve_and_set, (self._config, name, value, when))) ++ self.tasks_debug_out("ConfigureSandbox.set_config_impl / %s(%s" % (name, value)) + + def set_define_impl(self, name, value, when=None): + '''Implementation of set_define(). +@@ -864,6 +896,7 @@ class ConfigureSandbox(dict): + defines = self._config.setdefault('DEFINES', {}) + self._execution_queue.append(( + self._resolve_and_set, (defines, name, value, when))) ++ self.tasks_debug_out("ConfigureSandbox.set_define_impl / %s(%s)" % (name, value)) + + def imply_option_impl(self, option, value, reason=None, when=None): + '''Implementation of imply_option(). +@@ -922,7 +955,7 @@ class ConfigureSandbox(dict): + if isinstance(possible_reasons[0], Option): + reason = possible_reasons[0] + if not reason and (isinstance(value, (bool, tuple)) or +- isinstance(value, types.StringTypes)): ++ isinstance(value, (str,))): + # A reason can be provided automatically when imply_option + # is called with an immediate value. + _, filename, line, _, _, _ = inspect.stack()[1] +@@ -955,10 +988,10 @@ class ConfigureSandbox(dict): + if not inspect.isfunction(func): + raise TypeError("Unexpected type: '%s'" % type(func).__name__) + if func in self._prepared_functions: +- return func, func.func_globals ++ return func, func.__globals__ + + glob = SandboxedGlobal( +- (k, v) for k, v in func.func_globals.iteritems() ++ (k, v) for k, v in func.__globals__.items() + if (inspect.isfunction(v) and v not in self._templates) or ( + inspect.isclass(v) and issubclass(v, Exception)) + ) +@@ -979,20 +1012,20 @@ class ConfigureSandbox(dict): + # Note this is not entirely bullet proof (if the value is e.g. a list, + # the list contents could have changed), but covers the bases. + closure = None +- if func.func_closure: ++ if func.__closure__: + def makecell(content): + def f(): + content +- return f.func_closure[0] ++ return f.__closure__[0] + + closure = tuple(makecell(cell.cell_contents) +- for cell in func.func_closure) ++ for cell in func.__closure__) + + new_func = self.wraps(func)(types.FunctionType( +- func.func_code, ++ func.__code__, + glob, + func.__name__, +- func.func_defaults, ++ func.__defaults__, + closure + )) + @self.wraps(new_func) +diff --git a/python/mozbuild/mozbuild/configure/check_debug_ranges.py b/python/mozbuild/mozbuild/configure/check_debug_ranges.py +index c0caa9cc5..a3e1f37e1 100644 +--- a/python/mozbuild/mozbuild/configure/check_debug_ranges.py ++++ b/python/mozbuild/mozbuild/configure/check_debug_ranges.py +@@ -6,7 +6,7 @@ + # to a given compilation unit. This is used as a helper to find a bug in some + # versions of GNU ld. + +-from __future__ import absolute_import ++ + + import subprocess + import sys +@@ -45,6 +45,8 @@ def get_range_length(range, debug_ranges): + def main(bin, compilation_unit): + p = subprocess.Popen(['objdump', '-W', bin], stdout = subprocess.PIPE, stderr = subprocess.PIPE) + (out, err) = p.communicate() ++ if isinstance(out, bytes): ++ out = out.decode('utf-8') + sections = re.split('\n(Contents of the|The section) ', out) + debug_info = [s for s in sections if s.startswith('.debug_info')] + debug_ranges = [s for s in sections if s.startswith('.debug_ranges')] +@@ -59,4 +61,4 @@ def main(bin, compilation_unit): + + + if __name__ == '__main__': +- print(main(*sys.argv[1:])) ++ print((main(*sys.argv[1:]))) +diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py +index 53ae2ae6d..4d80cad86 100644 +--- a/python/mozbuild/mozbuild/configure/options.py ++++ b/python/mozbuild/mozbuild/configure/options.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import os + import sys +@@ -12,7 +12,7 @@ from collections import OrderedDict + + def istupleofstrings(obj): + return isinstance(obj, tuple) and len(obj) and all( +- isinstance(o, types.StringTypes) for o in obj) ++ isinstance(o, (str,)) for o in obj) + + + class OptionValue(tuple): +@@ -88,7 +88,7 @@ class PositiveOptionValue(OptionValue): + in the form of a tuple for when values are given to the option (in the form + --option=value[,value2...]. + ''' +- def __nonzero__(self): ++ def __bool__(self): + return True + + +@@ -113,7 +113,7 @@ class ConflictingOptionError(InvalidOptionError): + if format_data: + message = message.format(**format_data) + super(ConflictingOptionError, self).__init__(message) +- for k, v in format_data.iteritems(): ++ for k, v in format_data.items(): + setattr(self, k, v) + + +@@ -149,7 +149,7 @@ class Option(object): + 'At least an option name or an environment variable name must ' + 'be given') + if name: +- if not isinstance(name, types.StringTypes): ++ if not isinstance(name, (str,)): + raise InvalidOptionError('Option must be a string') + if not name.startswith('--'): + raise InvalidOptionError('Option must start with `--`') +@@ -158,7 +158,7 @@ class Option(object): + if not name.islower(): + raise InvalidOptionError('Option must be all lowercase') + if env: +- if not isinstance(env, types.StringTypes): ++ if not isinstance(env, (str,)): + raise InvalidOptionError( + 'Environment variable name must be a string') + if not env.isupper(): +@@ -168,8 +168,8 @@ class Option(object): + isinstance(nargs, int) and nargs >= 0): + raise InvalidOptionError( + "nargs must be a positive integer, '?', '*' or '+'") +- if (not isinstance(default, types.StringTypes) and +- not isinstance(default, (bool, types.NoneType)) and ++ if (not isinstance(default, (str,)) and ++ not isinstance(default, (bool, type(None))) and + not istupleofstrings(default)): + raise InvalidOptionError( + 'default must be a bool, a string or a tuple of strings') +@@ -241,7 +241,7 @@ class Option(object): + ', '.join("'%s'" % c for c in choices)) + elif has_choices: + maxargs = self.maxargs +- if len(choices) < maxargs and maxargs != sys.maxint: ++ if len(choices) < maxargs and maxargs != sys.maxsize: + raise InvalidOptionError('Not enough `choices` for `nargs`') + self.choices = choices + self.help = help +@@ -255,7 +255,7 @@ class Option(object): + where prefix is one of 'with', 'without', 'enable' or 'disable'. + The '=values' part is optional. Values are separated with commas. + ''' +- if not isinstance(option, types.StringTypes): ++ if not isinstance(option, (str,)): + raise InvalidOptionError('Option must be a string') + + elements = option.split('=', 1) +@@ -308,7 +308,7 @@ class Option(object): + def maxargs(self): + if isinstance(self.nargs, int): + return self.nargs +- return 1 if self.nargs == '?' else sys.maxint ++ return 1 if self.nargs == '?' else sys.maxsize + + def _validate_nargs(self, num): + minargs, maxargs = self.minargs, self.maxargs +@@ -499,5 +499,5 @@ class CommandLineHelper(object): + + def __iter__(self): + for d in (self._args, self._extra_args): +- for arg, pos in d.itervalues(): ++ for arg, pos in d.values(): + yield arg +diff --git a/python/mozbuild/mozbuild/configure/util.py b/python/mozbuild/mozbuild/configure/util.py +index 9d8b2eb0e..a12986e48 100644 +--- a/python/mozbuild/mozbuild/configure/util.py ++++ b/python/mozbuild/mozbuild/configure/util.py +@@ -77,15 +77,7 @@ class ConfigureOutputHandler(logging.Handler): + # Python has this feature where it sets the encoding of pipes to + # ascii, which blatantly fails when trying to print out non-ascii. + def fix_encoding(fh): +- try: +- isatty = fh.isatty() +- except AttributeError: +- isatty = True +- +- if not isatty: +- encoding = getpreferredencoding() +- if encoding: +- return codecs.getwriter(encoding)(fh) ++ # no magic on oe / python3 + return fh + + self._stdout = fix_encoding(stdout) +@@ -200,7 +192,7 @@ class LineIO(object): + self._errors = errors + + def write(self, buf): +- if self._encoding and isinstance(buf, str): ++ if self._encoding and isinstance(buf, bytes): + buf = buf.decode(self._encoding, self._errors) + lines = buf.splitlines() + if not lines: +diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py +index d5af532f7..e9810fe58 100644 +--- a/python/mozbuild/mozbuild/controller/building.py ++++ b/python/mozbuild/mozbuild/controller/building.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import errno + import getpass +@@ -146,7 +146,7 @@ class TierStatus(object): + """ + o = [] + +- for tier, state in self.tiers.items(): ++ for tier, state in list(self.tiers.items()): + t_entry = dict( + name=tier, + start=state['begin_time'], +@@ -574,7 +574,7 @@ class BuildProgressFooter(Footer): + + def __init__(self, terminal, monitor): + Footer.__init__(self, terminal) +- self.tiers = monitor.tiers.tier_status.viewitems() ++ self.tiers = monitor.tiers.tier_status.items() + + def draw(self): + """Draws this footer in the terminal.""" +@@ -911,8 +911,8 @@ class CCacheStats(object): + + return '\n'.join(lines) + +- def __nonzero__(self): +- relative_values = [v for k, v in self._values.items() ++ def __bool__(self): ++ relative_values = [v for k, v in list(self._values.items()) + if k not in self.ABSOLUTE_KEYS] + return (all(v >= 0 for v in relative_values) and + any(v > 0 for v in relative_values)) +@@ -1156,7 +1156,7 @@ class BuildDriver(MozbuildObject): + + high_finder, finder_percent = monitor.have_high_finder_usage() + if high_finder: +- print(FINDER_SLOW_MESSAGE % finder_percent) ++ print((FINDER_SLOW_MESSAGE % finder_percent)) + + ccache_end = monitor.ccache_stats() + +@@ -1276,8 +1276,8 @@ class BuildDriver(MozbuildObject): + """Install test files.""" + + if self.is_clobber_needed(): +- print(INSTALL_TESTS_CLOBBER.format( +- clobber_file=os.path.join(self.topobjdir, 'CLOBBER'))) ++ print((INSTALL_TESTS_CLOBBER.format( ++ clobber_file=os.path.join(self.topobjdir, 'CLOBBER')))) + sys.exit(1) + + if not test_objs: +diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py +index fbdbefc1d..1aef6a65a 100644 +--- a/python/mozbuild/mozbuild/frontend/context.py ++++ b/python/mozbuild/mozbuild/frontend/context.py +@@ -14,7 +14,7 @@ If you are looking for the absolute authority on what moz.build files can + contain, you've come to the right place. + """ + +-from __future__ import absolute_import, unicode_literals ++ + + import os + +@@ -237,15 +237,15 @@ class Context(KeyedDefaultDict): + This function is transactional: if setitem fails for one of the values, + the context is not updated at all.""" + if isinstance(iterable, dict): +- iterable = iterable.items() ++ iterable = list(iterable.items()) + + update = {} +- for key, value in itertools.chain(iterable, kwargs.items()): ++ for key, value in itertools.chain(iterable, list(kwargs.items())): + stored_type = self._validate(key, value) + # Don't create an instance of stored_type if coercion is needed, + # until all values are validated. + update[key] = (value, stored_type) +- for key, (value, stored_type) in update.items(): ++ for key, (value, stored_type) in list(update.items()): + if not isinstance(value, stored_type): + update[key] = stored_type(value) + else: +@@ -311,7 +311,7 @@ class BaseCompileFlags(ContextDerivedValue, dict): + # a template were set and which were provided as defaults. + template_name = getattr(context, 'template', None) + if template_name in (None, 'Gyp'): +- dict.__init__(self, ((k, v if v is None else TypedList(unicode)(v)) ++ dict.__init__(self, ((k, v if v is None else TypedList(str)(v)) + for k, v, _ in self.flag_variables)) + else: + dict.__init__(self) +@@ -520,13 +520,13 @@ class CompileFlags(BaseCompileFlags): + if key in self and self[key] is None: + raise ValueError('`%s` may not be set in COMPILE_FLAGS from moz.build, this ' + 'value is resolved from the emitter.' % key) +- if not (isinstance(value, list) and all(isinstance(v, basestring) for v in value)): ++ if not (isinstance(value, list) and all(isinstance(v, str) for v in value)): + raise ValueError('A list of strings must be provided as a value for a ' + 'compile flags category.') + dict.__setitem__(self, key, value) + + +-class FinalTargetValue(ContextDerivedValue, unicode): ++class FinalTargetValue(ContextDerivedValue, str): + def __new__(cls, context, value=""): + if not value: + value = 'dist/' +@@ -536,7 +536,7 @@ class FinalTargetValue(ContextDerivedValue, unicode): + value += 'bin' + if context['DIST_SUBDIR']: + value += '/' + context['DIST_SUBDIR'] +- return unicode.__new__(cls, value) ++ return str.__new__(cls, value) + + + def Enum(*values): +@@ -584,7 +584,7 @@ class PathMeta(type): + cls = SourcePath + return super(PathMeta, cls).__call__(context, value) + +-class Path(ContextDerivedValue, unicode): ++class Path(ContextDerivedValue, str, metaclass=PathMeta): + """Stores and resolves a source path relative to a given context + + This class is used as a backing type for some of the sandbox variables. +@@ -595,7 +595,6 @@ class Path(ContextDerivedValue, unicode): + - '!objdir/relative/paths' + - '%/filesystem/absolute/paths' + """ +- __metaclass__ = PathMeta + + def __new__(cls, context, value=None): + return super(Path, cls).__new__(cls, value) +@@ -612,10 +611,14 @@ class Path(ContextDerivedValue, unicode): + """ + return Path(self.context, mozpath.join(self, *p)) + ++ @staticmethod ++ def cmp(a, b): ++ return (a > b) - (a < b) ++ + def __cmp__(self, other): + if isinstance(other, Path) and self.srcdir != other.srcdir: +- return cmp(self.full_path, other.full_path) +- return cmp(unicode(self), other) ++ return self.cmp(self.full_path, other.full_path) ++ return self.cmp(str(self), other) + + # __cmp__ is not enough because unicode has __eq__, __ne__, etc. defined + # and __cmp__ is only used for those when they don't exist. +@@ -773,7 +776,7 @@ def ContextDerivedTypedRecord(*fields): + __slots__ = tuple([name for name, _ in fields]) + + def __init__(self, context): +- for fname, ftype in self._fields.items(): ++ for fname, ftype in list(self._fields.items()): + if issubclass(ftype, ContextDerivedValue): + setattr(self, fname, self._fields[fname](context)) + else: +@@ -909,8 +912,8 @@ def TypedListWithAction(typ, action): + return _TypedListWithAction + + WebPlatformTestManifest = TypedNamedTuple("WebPlatformTestManifest", +- [("manifest_path", unicode), +- ("test_root", unicode)]) ++ [("manifest_path", str), ++ ("test_root", str)]) + ManifestparserManifestList = OrderedPathListWithAction(read_manifestparser_manifest) + ReftestManifestList = OrderedPathListWithAction(read_reftest_manifest) + WptManifestList = TypedListWithAction(WebPlatformTestManifest, read_wpt_manifest) +@@ -918,18 +921,18 @@ WptManifestList = TypedListWithAction(WebPlatformTestManifest, read_wpt_manifest + OrderedSourceList = ContextDerivedTypedList(SourcePath, StrictOrderingOnAppendList) + OrderedTestFlavorList = TypedList(Enum(*all_test_flavors()), + StrictOrderingOnAppendList) +-OrderedStringList = TypedList(unicode, StrictOrderingOnAppendList) ++OrderedStringList = TypedList(str, StrictOrderingOnAppendList) + DependentTestsEntry = ContextDerivedTypedRecord(('files', OrderedSourceList), + ('tags', OrderedStringList), + ('flavors', OrderedTestFlavorList)) + BugzillaComponent = TypedNamedTuple('BugzillaComponent', +- [('product', unicode), ('component', unicode)]) ++ [('product', str), ('component', str)]) + SchedulingComponents = ContextDerivedTypedRecord( +- ('inclusive', TypedList(unicode, StrictOrderingOnAppendList)), +- ('exclusive', TypedList(unicode, StrictOrderingOnAppendList))) ++ ('inclusive', TypedList(str, StrictOrderingOnAppendList)), ++ ('exclusive', TypedList(str, StrictOrderingOnAppendList))) + + GeneratedFilesList = StrictOrderingOnAppendListWithFlagsFactory({ +- 'script': unicode, ++ 'script': str, + 'inputs': list, + 'flags': list, }) + +@@ -1096,7 +1099,7 @@ class Files(SubContext): + self.test_tags |= other.test_tags + self.test_flavors |= other.test_flavors + +- for k, v in other.items(): ++ for k, v in list(other.items()): + if k == 'IMPACTED_TESTS': + self.test_files |= set(mozpath.relpath(e.full_path, e.context.config.topsrcdir) + for e in v.files) +@@ -1154,7 +1157,7 @@ class Files(SubContext): + + bug_components = Counter() + +- for f in files.values(): ++ for f in list(files.values()): + bug_component = f.get('BUG_COMPONENT') + if bug_component: + bug_components[bug_component] += 1 +@@ -1232,7 +1235,7 @@ VARIABLES = { + RustLibrary template instead. + """), + +- 'RUST_LIBRARY_TARGET_DIR': (unicode, unicode, ++ 'RUST_LIBRARY_TARGET_DIR': (str, str, + """Where CARGO_TARGET_DIR should point when compiling this library. If + not set, it defaults to the current objdir. It should be a relative path + to the current objdir; absolute paths should not be used. +@@ -1248,7 +1251,7 @@ VARIABLES = { + HostRustLibrary template instead. + """), + +- 'RUST_TEST': (unicode, unicode, ++ 'RUST_TEST': (str, str, + """Name of a Rust test to build and run via `cargo test`. + + This variable should not be used directly; you should be using the +@@ -1487,7 +1490,7 @@ VARIABLES = { + """Like ``OBJDIR_FILES``, with preprocessing. Use sparingly. + """), + +- 'FINAL_LIBRARY': (unicode, unicode, ++ 'FINAL_LIBRARY': (str, str, + """Library in which the objects of the current directory will be linked. + + This variable contains the name of a library, defined elsewhere with +@@ -1528,7 +1531,7 @@ VARIABLES = { + with the host compiler. + """), + +- 'HOST_LIBRARY_NAME': (unicode, unicode, ++ 'HOST_LIBRARY_NAME': (str, str, + """Name of target library generated when cross compiling. + """), + +@@ -1546,7 +1549,7 @@ VARIABLES = { + libraries that link into this library via FINAL_LIBRARY. + """), + +- 'LIBRARY_NAME': (unicode, unicode, ++ 'LIBRARY_NAME': (str, str, + """The code name of the library generated for a directory. + + By default STATIC_LIBRARY_NAME and SHARED_LIBRARY_NAME take this name. +@@ -1558,7 +1561,7 @@ VARIABLES = { + ``example/components/xpcomsample.lib`` on Windows. + """), + +- 'SHARED_LIBRARY_NAME': (unicode, unicode, ++ 'SHARED_LIBRARY_NAME': (str, str, + """The name of the static library generated for a directory, if it needs to + differ from the library code name. + +@@ -1572,7 +1575,7 @@ VARIABLES = { + Implies FORCE_SHARED_LIB. + """), + +- 'STATIC_LIBRARY_NAME': (unicode, unicode, ++ 'STATIC_LIBRARY_NAME': (str, str, + """The name of the static library generated for a directory, if it needs to + differ from the library code name. + +@@ -1604,31 +1607,31 @@ VARIABLES = { + + This variable contains a list of system libaries to link against. + """), +- 'RCFILE': (unicode, unicode, ++ 'RCFILE': (str, str, + """The program .rc file. + + This variable can only be used on Windows. + """), + +- 'RESFILE': (unicode, unicode, ++ 'RESFILE': (str, str, + """The program .res file. + + This variable can only be used on Windows. + """), + +- 'RCINCLUDE': (unicode, unicode, ++ 'RCINCLUDE': (str, str, + """The resource script file to be included in the default .res file. + + This variable can only be used on Windows. + """), + +- 'DEFFILE': (unicode, unicode, ++ 'DEFFILE': (str, str, + """The program .def (module definition) file. + + This variable can only be used on Windows. + """), + +- 'SYMBOLS_FILE': (Path, unicode, ++ 'SYMBOLS_FILE': (Path, str, + """A file containing a list of symbols to export from a shared library. + + The given file contains a list of symbols to be exported, and is +@@ -1649,7 +1652,7 @@ VARIABLES = { + ``BIN_SUFFIX``, the name will remain unchanged. + """), + +- 'SONAME': (unicode, unicode, ++ 'SONAME': (str, str, + """The soname of the shared object currently being linked + + soname is the "logical name" of a shared object, often used to provide +@@ -1719,7 +1722,7 @@ VARIABLES = { + ``GENERATED_FILES``. + """), + +- 'PROGRAM' : (unicode, unicode, ++ 'PROGRAM' : (str, str, + """Compiled executable name. + + If the configuration token ``BIN_SUFFIX`` is set, its value will be +@@ -1727,7 +1730,7 @@ VARIABLES = { + ``BIN_SUFFIX``, ``PROGRAM`` will remain unchanged. + """), + +- 'HOST_PROGRAM' : (unicode, unicode, ++ 'HOST_PROGRAM' : (str, str, + """Compiled host executable name. + + If the configuration token ``HOST_BIN_SUFFIX`` is set, its value will be +@@ -1765,7 +1768,7 @@ VARIABLES = { + files. + """), + +- 'XPIDL_MODULE': (unicode, unicode, ++ 'XPIDL_MODULE': (str, str, + """XPCOM Interface Definition Module Name. + + This is the name of the ``.xpt`` file that is created by linking +@@ -1924,14 +1927,14 @@ VARIABLES = { + + + # The following variables are used to control the target of installed files. +- 'XPI_NAME': (unicode, unicode, ++ 'XPI_NAME': (str, str, + """The name of an extension XPI to generate. + + When this variable is present, the results of this directory will end up + being packaged into an extension instead of the main dist/bin results. + """), + +- 'DIST_SUBDIR': (unicode, unicode, ++ 'DIST_SUBDIR': (str, str, + """The name of an alternate directory to install files to. + + When this variable is present, the results of this directory will end up +@@ -1939,7 +1942,7 @@ VARIABLES = { + otherwise be placed. + """), + +- 'FINAL_TARGET': (FinalTargetValue, unicode, ++ 'FINAL_TARGET': (FinalTargetValue, str, + """The name of the directory to install targets to. + + The directory is relative to the top of the object directory. The +@@ -1970,7 +1973,7 @@ VARIABLES = { + + 'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({ + 'variables': dict, +- 'input': unicode, ++ 'input': str, + 'sandbox_vars': dict, + 'no_chromium': bool, + 'no_unified': bool, +@@ -2194,7 +2197,7 @@ VARIABLES = { + } + + # Sanity check: we don't want any variable above to have a list as storage type. +-for name, (storage_type, input_types, docs) in VARIABLES.items(): ++for name, (storage_type, input_types, docs) in list(VARIABLES.items()): + if storage_type == list: + raise RuntimeError('%s has a "list" storage type. Use "List" instead.' + % name) +diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py +index 442fc9e0a..837453a9f 100644 +--- a/python/mozbuild/mozbuild/frontend/data.py ++++ b/python/mozbuild/mozbuild/frontend/data.py +@@ -15,7 +15,7 @@ contains the code for converting executed mozbuild files into these data + structures. + """ + +-from __future__ import absolute_import, unicode_literals ++ + + from mozbuild.util import StrictOrderingOnAppendList + from mozpack.chrome.manifest import ManifestEntry +@@ -182,7 +182,7 @@ class ComputedFlags(ContextDerived): + if value: + for dest_var in dest_vars: + flags[dest_var].extend(value) +- return flags.items() ++ return list(flags.items()) + + class XPIDLFile(ContextDerived): + """Describes an XPIDL file to be compiled.""" +@@ -213,7 +213,7 @@ class BaseDefines(ContextDerived): + self.defines = defines + + def get_defines(self): +- for define, value in self.defines.iteritems(): ++ for define, value in self.defines.items(): + if value is True: + yield('-D%s' % define) + elif value is False: +@@ -494,7 +494,7 @@ class SimpleProgram(BaseProgram): + KIND = 'target' + + def source_files(self): +- for srcs in self.sources.values(): ++ for srcs in list(self.sources.values()): + for f in srcs: + if mozpath.basename(mozpath.splitext(f)[0]) == mozpath.splitext(self.program)[0]: + return [f] +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 642b381c0..c28344a75 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import itertools + import logging +@@ -116,8 +116,8 @@ class TreeMetadataEmitter(LoggingMixin): + # arguments. This gross hack works around the problem until we + # rid ourselves of 2.6. + self.info = {} +- for k, v in mozinfo.info.items(): +- if isinstance(k, unicode): ++ for k, v in list(mozinfo.info.items()): ++ if isinstance(k, str): + k = k.encode('ascii') + self.info[k] = v + +@@ -234,7 +234,7 @@ class TreeMetadataEmitter(LoggingMixin): + + + # Next do FINAL_LIBRARY linkage. +- for lib in (l for libs in self._libs.values() for l in libs): ++ for lib in (l for libs in list(self._libs.values()) for l in libs): + if not isinstance(lib, (StaticLibrary, RustLibrary)) or not lib.link_into: + continue + if lib.link_into not in self._libs: +@@ -294,13 +294,13 @@ class TreeMetadataEmitter(LoggingMixin): + lib.link_into == outerlib.basename): + propagate_defines(lib, defines) + +- for lib in (l for libs in self._libs.values() for l in libs): ++ for lib in (l for libs in list(self._libs.values()) for l in libs): + if isinstance(lib, Library): + propagate_defines(lib, lib.lib_defines) + yield lib + + +- for lib in (l for libs in self._libs.values() for l in libs): ++ for lib in (l for libs in list(self._libs.values()) for l in libs): + lib_defines = list(lib.lib_defines.get_defines()) + if lib_defines: + objdir_flags = self._compile_flags[lib.objdir] +@@ -310,13 +310,13 @@ class TreeMetadataEmitter(LoggingMixin): + if objdir_flags: + objdir_flags.resolve_flags('LIBRARY_DEFINES', lib_defines) + +- for flags_obj in self._compile_flags.values(): ++ for flags_obj in list(self._compile_flags.values()): + yield flags_obj + +- for flags_obj in self._compile_as_flags.values(): ++ for flags_obj in list(self._compile_as_flags.values()): + yield flags_obj + +- for obj in self._binaries.values(): ++ for obj in list(self._binaries.values()): + yield obj + + +@@ -409,7 +409,7 @@ class TreeMetadataEmitter(LoggingMixin): + libs[key] = l + if key not in libs: + libs[key] = l +- candidates = libs.values() ++ candidates = list(libs.values()) + if force_static and not candidates: + if dir: + raise SandboxValidationError( +@@ -473,9 +473,9 @@ class TreeMetadataEmitter(LoggingMixin): + + def _verify_deps(self, context, crate_dir, crate_name, dependencies, description='Dependency'): + """Verify that a crate's dependencies all specify local paths.""" +- for dep_crate_name, values in dependencies.iteritems(): ++ for dep_crate_name, values in dependencies.items(): + # A simple version number. +- if isinstance(values, (str, unicode)): ++ if isinstance(values, str): + raise SandboxValidationError( + '%s %s of crate %s does not list a path' % (description, dep_crate_name, crate_name), + context) +@@ -529,7 +529,7 @@ class TreeMetadataEmitter(LoggingMixin): + + cargo_target_dir = context.get('RUST_LIBRARY_TARGET_DIR', '.') + +- dependencies = set(config.get('dependencies', {}).iterkeys()) ++ dependencies = set(config.get('dependencies', {}).keys()) + + features = context.get(cls.FEATURES_VAR, []) + unique_features = set(features) +@@ -863,7 +863,7 @@ class TreeMetadataEmitter(LoggingMixin): + assert not gen_sources['UNIFIED_SOURCES'] + + no_pgo = context.get('NO_PGO') +- no_pgo_sources = [f for f, flags in all_flags.iteritems() ++ no_pgo_sources = [f for f, flags in all_flags.items() + if flags.no_pgo] + if no_pgo: + if no_pgo_sources: +@@ -890,7 +890,7 @@ class TreeMetadataEmitter(LoggingMixin): + + # The inverse of the above, mapping suffixes to their canonical suffix. + canonicalized_suffix_map = {} +- for suffix, alternatives in suffix_map.iteritems(): ++ for suffix, alternatives in suffix_map.items(): + alternatives.add(suffix) + for a in alternatives: + canonicalized_suffix_map[a] = suffix +@@ -914,7 +914,7 @@ class TreeMetadataEmitter(LoggingMixin): + # Source files to track for linkables associated with this context. + ctxt_sources = defaultdict(lambda: defaultdict(list)) + +- for variable, (klass, gen_klass, suffixes) in varmap.items(): ++ for variable, (klass, gen_klass, suffixes) in list(varmap.items()): + allowed_suffixes = set().union(*[suffix_map[s] for s in suffixes]) + + # First ensure that we haven't been given filetypes that we don't +@@ -941,20 +941,20 @@ class TreeMetadataEmitter(LoggingMixin): + obj = cls(*arglist) + srcs = obj.files + if isinstance(obj, UnifiedSources) and obj.have_unified_mapping: +- srcs = dict(obj.unified_source_mapping).keys() ++ srcs = list(dict(obj.unified_source_mapping).keys()) + ctxt_sources[variable][canonical_suffix] += sorted(srcs) + yield obj + + if ctxt_sources: + for linkable in linkables: + for target_var in ('SOURCES', 'UNIFIED_SOURCES'): +- for suffix, srcs in ctxt_sources[target_var].items(): ++ for suffix, srcs in list(ctxt_sources[target_var].items()): + linkable.sources[suffix] += srcs + for host_linkable in host_linkables: +- for suffix, srcs in ctxt_sources['HOST_SOURCES'].items(): ++ for suffix, srcs in list(ctxt_sources['HOST_SOURCES'].items()): + host_linkable.sources[suffix] += srcs + +- for f, flags in all_flags.iteritems(): ++ for f, flags in all_flags.items(): + if flags.flags: + ext = mozpath.splitext(f)[1] + yield PerSourceFlag(context, f, flags.flags) +@@ -1143,7 +1143,7 @@ class TreeMetadataEmitter(LoggingMixin): + for obj in self._handle_linkables(context, passthru, generated_files): + yield obj + +- generated_files.update(['%s%s' % (k, self.config.substs.get('BIN_SUFFIX', '')) for k in self._binaries.keys()]) ++ generated_files.update(['%s%s' % (k, self.config.substs.get('BIN_SUFFIX', '')) for k in list(self._binaries.keys())]) + + components = [] + for var, cls in ( +@@ -1277,7 +1277,7 @@ class TreeMetadataEmitter(LoggingMixin): + for obj in self._process_jar_manifests(context): + yield obj + +- for name, jar in context.get('JAVA_JAR_TARGETS', {}).items(): ++ for name, jar in list(context.get('JAVA_JAR_TARGETS', {}).items()): + yield ContextWrapped(context, jar) + + computed_as_flags.resolve_flags('MOZBUILD', +@@ -1346,7 +1346,7 @@ class TreeMetadataEmitter(LoggingMixin): + script = mozpath.join(mozpath.dirname(mozpath.dirname(__file__)), + 'action', 'process_define_files.py') + yield GeneratedFile(context, script, 'process_define_file', +- unicode(path), ++ str(path), + [Path(context, path + '.in')]) + + generated_files = context.get('GENERATED_FILES') or [] +@@ -1393,7 +1393,7 @@ class TreeMetadataEmitter(LoggingMixin): + flags.flags, localized=localized) + + def _process_test_manifests(self, context): +- for prefix, info in TEST_MANIFESTS.items(): ++ for prefix, info in list(TEST_MANIFESTS.items()): + for path, manifest in context.get('%s_MANIFESTS' % prefix, []): + for obj in self._process_test_manifest(context, info, path, manifest): + yield obj +@@ -1479,7 +1479,7 @@ class TreeMetadataEmitter(LoggingMixin): + + process_support_files(test) + +- for path, m_defaults in mpmanifest.manifest_defaults.items(): ++ for path, m_defaults in list(mpmanifest.manifest_defaults.items()): + process_support_files(m_defaults) + + # We also copy manifests into the output directory, +diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py +index c1efc1c3d..0cdf8b8db 100644 +--- a/python/mozbuild/mozbuild/frontend/reader.py ++++ b/python/mozbuild/mozbuild/frontend/reader.py +@@ -16,7 +16,7 @@ The BuildReader contains basic logic for traversing a tree of mozbuild files. + It does this by examining specific variables populated during execution. + """ + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import ast + import inspect +@@ -81,12 +81,13 @@ from .context import ( + + from mozbuild.base import ExecutionSummary + from concurrent.futures.process import ProcessPoolExecutor ++from functools import reduce + + + + if sys.version_info.major == 2: +- text_type = unicode +- type_type = types.TypeType ++ text_type = str ++ type_type = type + else: + text_type = str + type_type = type +@@ -127,7 +128,7 @@ class EmptyConfig(object): + + self.substs = self.PopulateOnGetDict(EmptyValue, substs or self.default_substs) + udict = {} +- for k, v in self.substs.items(): ++ for k, v in list(self.substs.items()): + if isinstance(v, str): + udict[k.decode('utf-8')] = v.decode('utf-8') + else: +@@ -311,7 +312,7 @@ class MozbuildSandbox(Sandbox): + raise Exception('`template` is a function decorator. You must ' + 'use it as `@template` preceding a function declaration.') + +- name = func.func_name ++ name = func.__name__ + + if name in self.templates: + raise KeyError( +@@ -390,7 +391,7 @@ class MozbuildSandbox(Sandbox): + klass = self._context.__class__ + self._context.__class__ = TemplateContext + # The sandbox will do all the necessary checks for these merges. +- for key, value in context.items(): ++ for key, value in list(context.items()): + if isinstance(value, dict): + self[key].update(value) + elif isinstance(value, (list, HierarchicalStringList)): +@@ -407,12 +408,14 @@ class MozbuildSandbox(Sandbox): + + class TemplateFunction(object): + def __init__(self, func, sandbox): +- self.path = func.func_code.co_filename +- self.name = func.func_name ++ self.path = func.__code__.co_filename ++ self.name = func.__name__ + +- code = func.func_code ++ code = func.__code__ + firstlineno = code.co_firstlineno + lines = sandbox._current_source.splitlines(True) ++ if len(lines) and isinstance(lines[0], bytes): ++ lines = [l.decode('utf-8') for l in lines] + lines = inspect.getblock(lines[firstlineno - 1:]) + + # The code lines we get out of inspect.getsourcelines look like +@@ -430,7 +433,7 @@ class TemplateFunction(object): + # actually never calls __getitem__ and __setitem__, so we need to + # modify the AST so that accesses to globals are properly directed + # to a dict. +- self._global_name = b'_data' # AST wants str for this, not unicode ++ self._global_name = '_data' + # In case '_data' is a name used for a variable in the function code, + # prepend more underscores until we find an unused name. + while (self._global_name in code.co_names or +@@ -449,8 +452,8 @@ class TemplateFunction(object): + compile(func_ast, self.path, 'exec'), + glob, + self.name, +- func.func_defaults, +- func.func_closure, ++ func.__defaults__, ++ func.__closure__, + ) + func() + +@@ -464,11 +467,11 @@ class TemplateFunction(object): + '__builtins__': sandbox._builtins + } + func = types.FunctionType( +- self._func.func_code, ++ self._func.__code__, + glob, + self.name, +- self._func.func_defaults, +- self._func.func_closure ++ self._func.__defaults__, ++ self._func.__closure__ + ) + sandbox.exec_function(func, args, kwargs, self.path, + becomes_current_path=False) +@@ -484,7 +487,7 @@ class TemplateFunction(object): + def visit_Str(self, node): + # String nodes we got from the AST parser are str, but we want + # unicode literals everywhere, so transform them. +- node.s = unicode(node.s) ++ node.s = str(node.s) + return node + + def visit_Name(self, node): +@@ -617,7 +620,7 @@ class BuildReaderError(Exception): + + for l in traceback.format_exception(type(self.other), self.other, + self.trace): +- s.write(unicode(l)) ++ s.write(str(l)) + + return s.getvalue() + +@@ -767,7 +770,7 @@ class BuildReaderError(Exception): + s.write(' %s\n' % inner.args[2]) + s.write('\n') + close_matches = difflib.get_close_matches(inner.args[2], +- VARIABLES.keys(), 2) ++ list(VARIABLES.keys()), 2) + if close_matches: + s.write('Maybe you meant %s?\n' % ' or '.join(close_matches)) + s.write('\n') +@@ -1152,7 +1155,7 @@ class BuildReader(object): + context) + non_unified_sources.add(source) + action_overrides = {} +- for action, script in gyp_dir.action_overrides.iteritems(): ++ for action, script in gyp_dir.action_overrides.items(): + action_overrides[action] = SourcePath(context, script) + + gyp_processor = GypProcessor(context.config, +@@ -1188,7 +1191,7 @@ class BuildReader(object): + + recurse_info[d][key] = dict(sandbox.metadata[key]) + +- for path, child_metadata in recurse_info.items(): ++ for path, child_metadata in list(recurse_info.items()): + child_path = path.join('moz.build').full_path + + # Ensure we don't break out of the topsrcdir. We don't do realpath +@@ -1279,7 +1282,7 @@ class BuildReader(object): + # There is room to improve this code (and the code in + # _find_relevant_mozbuilds) to better handle multiple files in the same + # directory. Bug 1136966 tracks. +- for path, mbpaths in relevants.items(): ++ for path, mbpaths in list(relevants.items()): + path_mozbuilds[path] = [mozpath.join(topsrcdir, p) for p in mbpaths] + + for i, mbpath in enumerate(mbpaths[0:-1]): +@@ -1316,7 +1319,7 @@ class BuildReader(object): + all_contexts.append(context) + + result = {} +- for path, paths in path_mozbuilds.items(): ++ for path, paths in list(path_mozbuilds.items()): + result[path] = reduce(lambda x, y: x + y, (contexts[p] for p in paths), []) + + return result, all_contexts +@@ -1356,7 +1359,7 @@ class BuildReader(object): + + r = {} + +- for path, ctxs in paths.items(): ++ for path, ctxs in list(paths.items()): + # Should be normalized by read_relevant_mozbuilds. + assert '\\' not in path + +diff --git a/python/mozbuild/mozbuild/frontend/sandbox.py b/python/mozbuild/mozbuild/frontend/sandbox.py +index b2090802e..6d94291ea 100644 +--- a/python/mozbuild/mozbuild/frontend/sandbox.py ++++ b/python/mozbuild/mozbuild/frontend/sandbox.py +@@ -17,7 +17,7 @@ KeyError are machine parseable. This machine-friendly data is used to present + user-friendly error messages in the case of errors. + """ + +-from __future__ import absolute_import, unicode_literals ++ + + import os + import sys +@@ -112,6 +112,7 @@ class Sandbox(dict): + 'int': int, + 'set': set, + 'tuple': tuple, ++ 'str': str, + }) + + def __init__(self, context, finder=default_finder): +diff --git a/python/mozbuild/mozbuild/jar.py b/python/mozbuild/mozbuild/jar.py +index 47a2eff63..96aea63ce 100644 +--- a/python/mozbuild/mozbuild/jar.py ++++ b/python/mozbuild/mozbuild/jar.py +@@ -8,7 +8,7 @@ processing jar.mn files. + See the documentation for jar.mn on MDC for further details on the format. + ''' + +-from __future__ import absolute_import ++ + + import sys + import os +@@ -17,7 +17,7 @@ import re + import logging + from time import localtime + from MozZipFile import ZipFile +-from cStringIO import StringIO ++from io import StringIO + from collections import defaultdict + + from mozbuild.preprocessor import Preprocessor +@@ -302,9 +302,9 @@ class JarMaker(object): + '''updateManifest replaces the % in the chrome registration entries + with the given chrome base path, and updates the given manifest file. + ''' +- myregister = dict.fromkeys(map(lambda s: s.replace('%', +- chromebasepath), register)) +- addEntriesToListFile(manifestPath, myregister.iterkeys()) ++ myregister = dict.fromkeys([s.replace('%', ++ chromebasepath) for s in register]) ++ addEntriesToListFile(manifestPath, iter(myregister.keys())) + + def makeJar(self, infile, jardir): + '''makeJar is the main entry point to JarMaker. +@@ -322,7 +322,7 @@ class JarMaker(object): + elif self.relativesrcdir: + self.localedirs = \ + self.generateLocaleDirs(self.relativesrcdir) +- if isinstance(infile, basestring): ++ if isinstance(infile, str): + logging.info('processing ' + infile) + self.sourcedirs.append(_normpath(os.path.dirname(infile))) + pp = self.pp.clone() +diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py +index fcd45bed2..f77c5d2c3 100644 +--- a/python/mozbuild/mozbuild/makeutil.py ++++ b/python/mozbuild/mozbuild/makeutil.py +@@ -2,11 +2,10 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import os + import re +-from types import StringTypes + from collections import Iterable + + +@@ -66,7 +65,7 @@ class _SimpleOrderedSet(object): + self._list = [] + self._set = set() + +- def __nonzero__(self): ++ def __bool__(self): + return bool(self._set) + + def __iter__(self): +@@ -103,19 +102,19 @@ class Rule(object): + + def add_targets(self, targets): + '''Add additional targets to the rule.''' +- assert isinstance(targets, Iterable) and not isinstance(targets, StringTypes) ++ assert isinstance(targets, Iterable) and not isinstance(targets, str) + self._targets.update(targets) + return self + + def add_dependencies(self, deps): + '''Add dependencies to the rule.''' +- assert isinstance(deps, Iterable) and not isinstance(deps, StringTypes) ++ assert isinstance(deps, Iterable) and not isinstance(deps, str) + self._dependencies.update(deps) + return self + + def add_commands(self, commands): + '''Add commands to the rule.''' +- assert isinstance(commands, Iterable) and not isinstance(commands, StringTypes) ++ assert isinstance(commands, Iterable) and not isinstance(commands, str) + self._commands.extend(commands) + return self + +@@ -139,13 +138,16 @@ class Rule(object): + ''' + if not self._targets: + return +- fh.write('%s:' % ' '.join(self._targets)) ++ wstring = '%s:' % ' '.join(self._targets) + if self._dependencies: +- fh.write(' %s' % ' '.join(self.dependencies())) +- fh.write('\n') ++ wstring += ' %s' % ' '.join(self.dependencies()) ++ wstring += '\n' + for cmd in self._commands: +- fh.write('\t%s\n' % cmd) +- ++ wstring += '\t%s\n' % cmd ++ try: ++ fh.write(wstring.encode('utf-8')) ++ except TypeError: ++ fh.write(wstring) + + # colon followed by anything except a slash (Windows path detection) + _depfilesplitter = re.compile(r':(?![\\/])') +diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py +index 7e7ad1b2a..f03f20ba3 100755 +--- a/python/mozbuild/mozbuild/mozinfo.py ++++ b/python/mozbuild/mozbuild/mozinfo.py +@@ -5,7 +5,7 @@ + # This module produces a JSON file that provides basic build info and + # configuration metadata. + +-from __future__ import absolute_import ++ + + import os + import re +@@ -33,7 +33,7 @@ def build_dict(config, env=os.environ): + d['mozconfig'] = config.mozconfig + + # os +- o = substs["OS_TARGET"] ++ o = str(substs["OS_TARGET"]) + known_os = {"Linux": "linux", + "WINNT": "win", + "Darwin": "mac", +@@ -148,7 +148,7 @@ def write_mozinfo(file, config, env=os.environ): + and what keys are produced. + """ + build_conf = build_dict(config, env) +- if isinstance(file, basestring): +- file = open(file, 'wb') ++ if isinstance(file, str): ++ file = open(file, 'w') + + json.dump(build_conf, file, sort_keys=True, indent=4) +diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py +index 6780b8b72..19e59884e 100644 +--- a/python/mozbuild/mozbuild/preprocessor.py ++++ b/python/mozbuild/mozbuild/preprocessor.py +@@ -27,7 +27,8 @@ import os + import re + from optparse import OptionParser + import errno +-from makeutil import Makefile ++from .makeutil import Makefile ++from functools import reduce + + # hack around win32 mangling our line endings + # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65443 +@@ -230,7 +231,7 @@ class Expression: + def __repr__(self): + return self.value.__repr__() + +- class ParseError(StandardError): ++ class ParseError(Exception): + """ + Error raised when parsing fails. + It has two members, offset and content, which give the offset of the +@@ -278,7 +279,7 @@ class Preprocessor: + self.context = Context() + for k,v in {'FILE': '', + 'LINE': 0, +- 'DIRECTORY': os.path.abspath('.')}.iteritems(): ++ 'DIRECTORY': os.path.abspath('.')}.items(): + self.context[k] = v + self.actionLevel = 0 + self.disableLevel = 0 +@@ -292,21 +293,21 @@ class Preprocessor: + self.cmds = {} + for cmd, level in {'define': 0, + 'undef': 0, +- 'if': sys.maxint, +- 'ifdef': sys.maxint, +- 'ifndef': sys.maxint, ++ 'if': sys.maxsize, ++ 'ifdef': sys.maxsize, ++ 'ifndef': sys.maxsize, + 'else': 1, + 'elif': 1, + 'elifdef': 1, + 'elifndef': 1, +- 'endif': sys.maxint, ++ 'endif': sys.maxsize, + 'expand': 0, + 'literal': 0, + 'filter': 0, + 'unfilter': 0, + 'include': 0, + 'includesubst': 0, +- 'error': 0}.iteritems(): ++ 'error': 0}.items(): + self.cmds[cmd] = (level, getattr(self, 'do_' + cmd)) + self.out = sys.stdout + self.setMarker(marker) +@@ -434,7 +435,7 @@ class Preprocessor: + filteredLine = self.applyFilters(aLine) + if filteredLine != aLine: + self.actionLevel = 2 +- self.out.write(filteredLine) ++ self.out.write(filteredLine.encode('utf-8')) + + def handleCommandLine(self, args, defaultToStdin = False): + """ +@@ -468,7 +469,7 @@ class Preprocessor: + raise Preprocessor.Error(self, "--depend doesn't work with stdout", + None) + try: +- from makeutil import Makefile ++ from .makeutil import Makefile + except: + raise Preprocessor.Error(self, "--depend requires the " + "mozbuild.makeutil module", None) +@@ -683,7 +684,7 @@ class Preprocessor: + current = dict(self.filters) + for f in filters: + current[f] = getattr(self, 'filter_' + f) +- filterNames = current.keys() ++ filterNames = list(current.keys()) + filterNames.sort() + self.filters = [(fn, current[fn]) for fn in filterNames] + return +@@ -693,7 +694,7 @@ class Preprocessor: + for f in filters: + if f in current: + del current[f] +- filterNames = current.keys() ++ filterNames = list(current.keys()) + filterNames.sort() + self.filters = [(fn, current[fn]) for fn in filterNames] + return +@@ -738,7 +739,7 @@ class Preprocessor: + args can either be a file name, or a file-like object. + Files should be opened, and will be closed after processing. + """ +- isName = type(args) == str or type(args) == unicode ++ isName = type(args) == str or type(args) == str + oldCheckLineNumbers = self.checkLineNumbers + self.checkLineNumbers = False + if isName: +diff --git a/python/mozbuild/mozbuild/shellutil.py b/python/mozbuild/mozbuild/shellutil.py +index 185a970ee..c0c15f8f2 100644 +--- a/python/mozbuild/mozbuild/shellutil.py ++++ b/python/mozbuild/mozbuild/shellutil.py +@@ -15,7 +15,7 @@ def _tokens2re(**tokens): + # which matches the pattern and captures it in a named match group. + # The group names and patterns are given as arguments. + all_tokens = '|'.join('(?P<%s>%s)' % (name, value) +- for name, value in tokens.iteritems()) ++ for name, value in tokens.items()) + nonescaped = r'(?` is unused." + % mozpath.join(test_data_path, 'moz.configure')) + +@@ -257,7 +257,7 @@ class TestLint(unittest.TestCase): + '''): + self.lint_test() + +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "%s:9: The dependency on `qux` is unused." + % mozpath.join(test_data_path, 'moz.configure')) + +diff --git a/python/mozbuild/mozbuild/test/configure/test_moz_configure.py b/python/mozbuild/mozbuild/test/configure/test_moz_configure.py +index b3342e268..7a26e9e09 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_moz_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_moz_configure.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + from mozunit import main + from mozpack import path as mozpath +@@ -27,10 +27,10 @@ class TestMozConfigure(BaseConfigureTest): + shell = mozpath.abspath('/bin/sh') + return result.replace('CONFIG_SHELL=%s ' % shell, '') + +- self.assertEquals('--enable-application=browser', ++ self.assertEqual('--enable-application=browser', + get_value_for(['--enable-application=browser'])) + +- self.assertEquals('--enable-application=browser ' ++ self.assertEqual('--enable-application=browser ' + 'MOZ_VTUNE=1', + get_value_for(['--enable-application=browser', + 'MOZ_VTUNE=1'])) +@@ -39,25 +39,25 @@ class TestMozConfigure(BaseConfigureTest): + environ={'MOZ_VTUNE': '1'}, + mozconfig='ac_add_options --enable-project=js') + +- self.assertEquals('--enable-project=js MOZ_VTUNE=1', ++ self.assertEqual('--enable-project=js MOZ_VTUNE=1', + value) + + # --disable-js-shell is the default, so it's filtered out. +- self.assertEquals('--enable-application=browser', ++ self.assertEqual('--enable-application=browser', + get_value_for(['--enable-application=browser', + '--disable-js-shell'])) + + # Normally, --without-foo would be filtered out because that's the + # default, but since it is a (fake) old-configure option, it always + # appears. +- self.assertEquals('--enable-application=browser --without-foo', ++ self.assertEqual('--enable-application=browser --without-foo', + get_value_for(['--enable-application=browser', + '--without-foo'])) +- self.assertEquals('--enable-application=browser --with-foo', ++ self.assertEqual('--enable-application=browser --with-foo', + get_value_for(['--enable-application=browser', + '--with-foo'])) + +- self.assertEquals("--enable-application=browser '--with-foo=foo bar'", ++ self.assertEqual("--enable-application=browser '--with-foo=foo bar'", + get_value_for(['--enable-application=browser', + '--with-foo=foo bar'])) + +@@ -69,7 +69,7 @@ class TestMozConfigure(BaseConfigureTest): + self.version = version + + def __call__(self, stdin, args): +- this.assertEquals(args, ('-version',)) ++ this.assertEqual(args, ('-version',)) + return 0, self.version, '' + + def check_nsis_version(version): +@@ -84,13 +84,13 @@ class TestMozConfigure(BaseConfigureTest): + with self.assertRaises(SystemExit) as e: + check_nsis_version('v3.0a2') + +- self.assertEquals(check_nsis_version('v3.0b1'), '3.0b1') +- self.assertEquals(check_nsis_version('v3.0b2'), '3.0b2') +- self.assertEquals(check_nsis_version('v3.0rc1'), '3.0rc1') +- self.assertEquals(check_nsis_version('v3.0'), '3.0') +- self.assertEquals(check_nsis_version('v3.0-2'), '3.0') +- self.assertEquals(check_nsis_version('v3.0.1'), '3.0') +- self.assertEquals(check_nsis_version('v3.1'), '3.1') ++ self.assertEqual(check_nsis_version('v3.0b1'), '3.0b1') ++ self.assertEqual(check_nsis_version('v3.0b2'), '3.0b2') ++ self.assertEqual(check_nsis_version('v3.0rc1'), '3.0rc1') ++ self.assertEqual(check_nsis_version('v3.0'), '3.0') ++ self.assertEqual(check_nsis_version('v3.0-2'), '3.0') ++ self.assertEqual(check_nsis_version('v3.0.1'), '3.0') ++ self.assertEqual(check_nsis_version('v3.1'), '3.1') + + + if __name__ == '__main__': +diff --git a/python/mozbuild/mozbuild/test/configure/test_options.py b/python/mozbuild/mozbuild/test/configure/test_options.py +index 9defccb2c..330ce3b1f 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_options.py ++++ b/python/mozbuild/mozbuild/test/configure/test_options.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import unittest + +@@ -28,139 +28,139 @@ class Option(Option): + class TestOption(unittest.TestCase): + def test_option(self): + option = Option('--option') +- self.assertEquals(option.prefix, '') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, '') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertFalse(option.default) + + option = Option('--enable-option') +- self.assertEquals(option.prefix, 'enable') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'enable') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertFalse(option.default) + + option = Option('--disable-option') +- self.assertEquals(option.prefix, 'disable') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'disable') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertTrue(option.default) + + option = Option('--with-option') +- self.assertEquals(option.prefix, 'with') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'with') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertFalse(option.default) + + option = Option('--without-option') +- self.assertEquals(option.prefix, 'without') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'without') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertTrue(option.default) + + option = Option('--without-option-foo', env='MOZ_OPTION') +- self.assertEquals(option.env, 'MOZ_OPTION') ++ self.assertEqual(option.env, 'MOZ_OPTION') + + option = Option(env='MOZ_OPTION') +- self.assertEquals(option.prefix, '') +- self.assertEquals(option.name, None) +- self.assertEquals(option.env, 'MOZ_OPTION') ++ self.assertEqual(option.prefix, '') ++ self.assertEqual(option.name, None) ++ self.assertEqual(option.env, 'MOZ_OPTION') + self.assertFalse(option.default) + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=0, default=('a',)) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=1, default=()) +- self.assertEquals( ++ self.assertEqual( + e.exception.message, + 'default must be a bool, a string or a tuple of strings') + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=1, default=True) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=1, default=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=2, default=()) +- self.assertEquals( ++ self.assertEqual( + e.exception.message, + 'default must be a bool, a string or a tuple of strings') + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=2, default=True) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=2, default=('a',)) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='?', default=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='+', default=()) +- self.assertEquals( ++ self.assertEqual( + e.exception.message, + 'default must be a bool, a string or a tuple of strings') + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='+', default=True) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + # --disable options with a nargs value that requires at least one + # argument need to be given a default. + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs=1) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs='+') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + # Test nargs inference from default value + option = Option('--with-foo', default=True) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option('--with-foo', default=False) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option('--with-foo', default='a') +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option('--with-foo', default=('a',)) +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option('--with-foo', default=('a', 'b')) +- self.assertEquals(option.nargs, '*') ++ self.assertEqual(option.nargs, '*') + + option = Option(env='FOO', default=True) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option(env='FOO', default=False) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option(env='FOO', default='a') +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option(env='FOO', default=('a',)) +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option(env='FOO', default=('a', 'b')) +- self.assertEquals(option.nargs, '*') ++ self.assertEqual(option.nargs, '*') + + def test_option_option(self): + for option in ( +@@ -170,70 +170,70 @@ class TestOption(unittest.TestCase): + '--with-option', + '--without-option', + ): +- self.assertEquals(Option(option).option, option) +- self.assertEquals(Option(option, env='FOO').option, option) ++ self.assertEqual(Option(option).option, option) ++ self.assertEqual(Option(option, env='FOO').option, option) + + opt = Option(option, default=False) +- self.assertEquals(opt.option, ++ self.assertEqual(opt.option, + option.replace('-disable-', '-enable-') + .replace('-without-', '-with-')) + + opt = Option(option, default=True) +- self.assertEquals(opt.option, ++ self.assertEqual(opt.option, + option.replace('-enable-', '-disable-') + .replace('-with-', '-without-')) + +- self.assertEquals(Option(env='FOO').option, 'FOO') ++ self.assertEqual(Option(env='FOO').option, 'FOO') + + def test_option_choices(self): + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=3, choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Not enough `choices` for `nargs`') + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', nargs=1, choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'A `default` must be given along with `choices`') + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', nargs='+', choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'A `default` must be given along with `choices`') + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', default='c', choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The `default` value must be one of 'a', 'b'") + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', default=('a', 'c',), choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The `default` value must be one of 'a', 'b'") + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', default=('c',), choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The `default` value must be one of 'a', 'b'") + + option = Option('--with-option', nargs='+', choices=('a', 'b')) + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=c') +- self.assertEquals(e.exception.message, "'c' is not one of 'a', 'b'") ++ self.assertEqual(e.exception.message, "'c' is not one of 'a', 'b'") + + value = option.get_value('--with-option=b,a') + self.assertTrue(value) +- self.assertEquals(PositiveOptionValue(('b', 'a')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'a')), value) + + option = Option('--without-option', nargs='*', default='a', + choices=('a', 'b')) + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=c') +- self.assertEquals(e.exception.message, "'c' is not one of 'a', 'b'") ++ self.assertEqual(e.exception.message, "'c' is not one of 'a', 'b'") + + value = option.get_value('--with-option=b,a') + self.assertTrue(value) +- self.assertEquals(PositiveOptionValue(('b', 'a')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'a')), value) + + # Test nargs inference from choices + option = Option('--with-option', choices=('a', 'b')) +@@ -244,37 +244,37 @@ class TestOption(unittest.TestCase): + choices=('a', 'b', 'c', 'd')) + + value = option.get_value('--with-option=+d') +- self.assertEquals(PositiveOptionValue(('b', 'c', 'd')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'c', 'd')), value) + + value = option.get_value('--with-option=-b') +- self.assertEquals(PositiveOptionValue(('c',)), value) ++ self.assertEqual(PositiveOptionValue(('c',)), value) + + value = option.get_value('--with-option=-b,+d') +- self.assertEquals(PositiveOptionValue(('c','d')), value) ++ self.assertEqual(PositiveOptionValue(('c','d')), value) + + # Adding something that is in the default is fine + value = option.get_value('--with-option=+b') +- self.assertEquals(PositiveOptionValue(('b', 'c')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'c')), value) + + # Removing something that is not in the default is fine, as long as it + # is one of the choices + value = option.get_value('--with-option=-a') +- self.assertEquals(PositiveOptionValue(('b', 'c')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'c')), value) + + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=-e') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "'e' is not one of 'a', 'b', 'c', 'd'") + + # Other "not a choice" errors. + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=+e') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "'e' is not one of 'a', 'b', 'c', 'd'") + + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=e') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "'e' is not one of 'a', 'b', 'c', 'd'") + + def test_option_value_compare(self): +@@ -294,7 +294,7 @@ class TestOption(unittest.TestCase): + + # For usability reasons, we raise TypeError when attempting to compare + # against a non-tuple. +- with self.assertRaisesRegexp(TypeError, 'cannot compare a'): ++ with self.assertRaisesRegex(TypeError, 'cannot compare a'): + val == 'foo' + + # But we allow empty option values to compare otherwise we can't +@@ -313,36 +313,36 @@ class TestOption(unittest.TestCase): + + def test_option_value_format(self): + val = PositiveOptionValue() +- self.assertEquals('--with-value', val.format('--with-value')) +- self.assertEquals('--with-value', val.format('--without-value')) +- self.assertEquals('--enable-value', val.format('--enable-value')) +- self.assertEquals('--enable-value', val.format('--disable-value')) +- self.assertEquals('--value', val.format('--value')) +- self.assertEquals('VALUE=1', val.format('VALUE')) ++ self.assertEqual('--with-value', val.format('--with-value')) ++ self.assertEqual('--with-value', val.format('--without-value')) ++ self.assertEqual('--enable-value', val.format('--enable-value')) ++ self.assertEqual('--enable-value', val.format('--disable-value')) ++ self.assertEqual('--value', val.format('--value')) ++ self.assertEqual('VALUE=1', val.format('VALUE')) + + val = PositiveOptionValue(('a',)) +- self.assertEquals('--with-value=a', val.format('--with-value')) +- self.assertEquals('--with-value=a', val.format('--without-value')) +- self.assertEquals('--enable-value=a', val.format('--enable-value')) +- self.assertEquals('--enable-value=a', val.format('--disable-value')) +- self.assertEquals('--value=a', val.format('--value')) +- self.assertEquals('VALUE=a', val.format('VALUE')) ++ self.assertEqual('--with-value=a', val.format('--with-value')) ++ self.assertEqual('--with-value=a', val.format('--without-value')) ++ self.assertEqual('--enable-value=a', val.format('--enable-value')) ++ self.assertEqual('--enable-value=a', val.format('--disable-value')) ++ self.assertEqual('--value=a', val.format('--value')) ++ self.assertEqual('VALUE=a', val.format('VALUE')) + + val = PositiveOptionValue(('a', 'b')) +- self.assertEquals('--with-value=a,b', val.format('--with-value')) +- self.assertEquals('--with-value=a,b', val.format('--without-value')) +- self.assertEquals('--enable-value=a,b', val.format('--enable-value')) +- self.assertEquals('--enable-value=a,b', val.format('--disable-value')) +- self.assertEquals('--value=a,b', val.format('--value')) +- self.assertEquals('VALUE=a,b', val.format('VALUE')) ++ self.assertEqual('--with-value=a,b', val.format('--with-value')) ++ self.assertEqual('--with-value=a,b', val.format('--without-value')) ++ self.assertEqual('--enable-value=a,b', val.format('--enable-value')) ++ self.assertEqual('--enable-value=a,b', val.format('--disable-value')) ++ self.assertEqual('--value=a,b', val.format('--value')) ++ self.assertEqual('VALUE=a,b', val.format('VALUE')) + + val = NegativeOptionValue() +- self.assertEquals('--without-value', val.format('--with-value')) +- self.assertEquals('--without-value', val.format('--without-value')) +- self.assertEquals('--disable-value', val.format('--enable-value')) +- self.assertEquals('--disable-value', val.format('--disable-value')) +- self.assertEquals('', val.format('--value')) +- self.assertEquals('VALUE=', val.format('VALUE')) ++ self.assertEqual('--without-value', val.format('--with-value')) ++ self.assertEqual('--without-value', val.format('--without-value')) ++ self.assertEqual('--disable-value', val.format('--enable-value')) ++ self.assertEqual('--disable-value', val.format('--disable-value')) ++ self.assertEqual('', val.format('--value')) ++ self.assertEqual('VALUE=', val.format('VALUE')) + + def test_option_value(self, name='option', nargs=0, default=None): + disabled = name.startswith(('disable-', 'without-')) +@@ -359,28 +359,28 @@ class TestOption(unittest.TestCase): + + if nargs in (0, '?', '*') or disabled: + value = option.get_value('--%s' % name, 'option') +- self.assertEquals(value, posOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, posOptionValue()) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s' % name) + if nargs == 1: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 1 value' % name) + elif nargs == '+': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 1 or more values' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 2 values' % name) + + value = option.get_value('') +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = option.get_value(None) +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + with self.assertRaises(AssertionError): + value = option.get_value('MOZ_OPTION=', 'environment') +@@ -393,47 +393,47 @@ class TestOption(unittest.TestCase): + + if nargs in (1, '?', '*', '+') and not disabled: + value = option.get_value('--%s=' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('',))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('',))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=' % name) + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d values' % (name, nargs)) + + if nargs in (1, '?', '*', '+') and not disabled: + value = option.get_value('--%s=foo' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('foo',))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('foo',))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=foo' % name) + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d values' % (name, nargs)) + + if nargs in (2, '*', '+') and not disabled: + value = option.get_value('--%s=foo,bar' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('foo', 'bar'))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('foo', 'bar'))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=foo,bar' % name, 'option') + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + elif nargs == '?': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 0 or 1 values' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d value%s' + % (name, nargs, 's' if nargs != 1 else '')) + +@@ -441,59 +441,59 @@ class TestOption(unittest.TestCase): + default=default) + if nargs in (0, '?', '*') or disabled: + value = option.get_value('--%s' % name, 'option') +- self.assertEquals(value, posOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, posOptionValue()) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s' % name) + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + elif nargs == '+': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 1 or more values' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d value%s' + % (name, nargs, 's' if nargs != 1 else '')) + + value = option.get_value('') +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = option.get_value(None) +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = option.get_value('MOZ_OPTION=', 'environment') +- self.assertEquals(value, NegativeOptionValue()) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, NegativeOptionValue()) ++ self.assertEqual(value.origin, 'environment') + + if nargs in (0, '?', '*'): + value = option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, PositiveOptionValue()) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue()) ++ self.assertEqual(value.origin, 'environment') + elif nargs in (1, '+'): + value = option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, PositiveOptionValue(('1',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('1',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(e.exception.message, 'MOZ_OPTION takes 2 values') ++ self.assertEqual(e.exception.message, 'MOZ_OPTION takes 2 values') + + if nargs in (1, '?', '*', '+') and not disabled: + value = option.get_value('--%s=' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('',))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('',))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=' % name, 'option') + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d values' % (name, nargs)) + + with self.assertRaises(AssertionError): +@@ -501,26 +501,26 @@ class TestOption(unittest.TestCase): + + if nargs in (1, '?', '*', '+'): + value = option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d values' % nargs) + + if nargs in (2, '*', '+'): + value = option.get_value('MOZ_OPTION=foo,bar', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo', 'bar'))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo', 'bar'))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('MOZ_OPTION=foo,bar', 'environment') + if nargs == '?': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes 0 or 1 values') + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d value%s' + % (nargs, 's' if nargs != 1 else '')) + +@@ -532,26 +532,26 @@ class TestOption(unittest.TestCase): + env_option.get_value('--%s' % name) + + value = env_option.get_value('') +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = env_option.get_value('MOZ_OPTION=', 'environment') +- self.assertEquals(value, negOptionValue()) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, negOptionValue()) ++ self.assertEqual(value.origin, 'environment') + + if nargs in (0, '?', '*'): + value = env_option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, posOptionValue()) ++ self.assertEqual(value, posOptionValue()) + self.assertTrue(value) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value.origin, 'environment') + elif nargs in (1, '+'): + value = env_option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, PositiveOptionValue(('1',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('1',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + env_option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(e.exception.message, 'MOZ_OPTION takes 2 values') ++ self.assertEqual(e.exception.message, 'MOZ_OPTION takes 2 values') + + with self.assertRaises(AssertionError) as e: + env_option.get_value('--%s' % name) +@@ -561,26 +561,26 @@ class TestOption(unittest.TestCase): + + if nargs in (1, '?', '*', '+'): + value = env_option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + env_option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d values' % nargs) + + if nargs in (2, '*', '+'): + value = env_option.get_value('MOZ_OPTION=foo,bar', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo', 'bar'))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo', 'bar'))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + env_option.get_value('MOZ_OPTION=foo,bar', 'environment') + if nargs == '?': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes 0 or 1 values') + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d value%s' + % (nargs, 's' if nargs != 1 else '')) + +@@ -592,28 +592,28 @@ class TestOption(unittest.TestCase): + default=default) + + value = option.get_value('--%s-option' % disable, 'option') +- self.assertEquals(value, NegativeOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, NegativeOptionValue()) ++ self.assertEqual(value.origin, 'option') + + option = self.test_option_value('%s-option' % disable, nargs=nargs, + default=default) + + if nargs in (0, '?', '*'): + value = option.get_value('--%s-option' % enable, 'option') +- self.assertEquals(value, PositiveOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue()) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s-option' % enable, 'option') + if nargs == 1: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s-option takes 1 value' % enable) + elif nargs == '+': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s-option takes 1 or more values' + % enable) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s-option takes 2 values' % enable) + + def test_option_value_with(self): +@@ -622,12 +622,12 @@ class TestOption(unittest.TestCase): + def test_option_value_invalid_nargs(self): + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='foo') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "nargs must be a positive integer, '?', '*' or '+'") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=-2) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "nargs must be a positive integer, '?', '*' or '+'") + + def test_option_value_nargs_1(self): +@@ -638,7 +638,7 @@ class TestOption(unittest.TestCase): + # A default is required + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs=1) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + def test_option_value_nargs_2(self): +@@ -649,7 +649,7 @@ class TestOption(unittest.TestCase): + # A default is required + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs=2) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + def test_option_value_nargs_0_or_1(self): +@@ -676,7 +676,7 @@ class TestOption(unittest.TestCase): + # A default is required + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs='+') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + +@@ -684,21 +684,21 @@ class TestCommandLineHelper(unittest.TestCase): + def test_basic(self): + helper = CommandLineHelper({}, ['cmd', '--foo', '--bar']) + +- self.assertEquals(['--foo', '--bar'], list(helper)) ++ self.assertEqual(['--foo', '--bar'], list(helper)) + + helper.add('--enable-qux') + +- self.assertEquals(['--foo', '--bar', '--enable-qux'], list(helper)) ++ self.assertEqual(['--foo', '--bar', '--enable-qux'], list(helper)) + + value, option = helper.handle(Option('--bar')) +- self.assertEquals(['--foo', '--enable-qux'], list(helper)) +- self.assertEquals(PositiveOptionValue(), value) +- self.assertEquals('--bar', option) ++ self.assertEqual(['--foo', '--enable-qux'], list(helper)) ++ self.assertEqual(PositiveOptionValue(), value) ++ self.assertEqual('--bar', option) + + value, option = helper.handle(Option('--baz')) +- self.assertEquals(['--foo', '--enable-qux'], list(helper)) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals(None, option) ++ self.assertEqual(['--foo', '--enable-qux'], list(helper)) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual(None, option) + + with self.assertRaises(AssertionError): + CommandLineHelper({}, ['--foo', '--bar']) +@@ -707,89 +707,89 @@ class TestCommandLineHelper(unittest.TestCase): + foo = Option('--with-foo', nargs='*') + helper = CommandLineHelper({}, ['cmd', '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + helper = CommandLineHelper({}, ['cmd', '--with-foo=a,b', + '--without-foo']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--without-foo', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--without-foo', option) + + helper = CommandLineHelper({}, ['cmd', '--without-foo', + '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + foo = Option('--with-foo', env='FOO', nargs='*') + helper = CommandLineHelper({'FOO': ''}, ['cmd', '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + helper = CommandLineHelper({'FOO': 'a,b'}, ['cmd', '--without-foo']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--without-foo', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--without-foo', option) + + helper = CommandLineHelper({'FOO': ''}, ['cmd', '--with-bar=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('environment', value.origin) +- self.assertEquals('FOO=', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('environment', value.origin) ++ self.assertEqual('FOO=', option) + + helper = CommandLineHelper({'FOO': 'a,b'}, ['cmd', '--without-bar']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('environment', value.origin) +- self.assertEquals('FOO=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('environment', value.origin) ++ self.assertEqual('FOO=a,b', option) + + helper = CommandLineHelper({}, ['cmd', '--with-foo=a,b', 'FOO=']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('FOO=', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('FOO=', option) + + helper = CommandLineHelper({}, ['cmd', '--without-foo', 'FOO=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('FOO=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('FOO=a,b', option) + + helper = CommandLineHelper({}, ['cmd', 'FOO=', '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + helper = CommandLineHelper({}, ['cmd', 'FOO=a,b', '--without-foo']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--without-foo', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--without-foo', option) + + def test_extra_args(self): + foo = Option('--with-foo', env='FOO', nargs='*') + helper = CommandLineHelper({}, ['cmd']) + helper.add('FOO=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('FOO=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('FOO=a,b,c', option) + + helper = CommandLineHelper({}, ['cmd']) + helper.add('FOO=a,b,c', 'other-origin') + helper.add('--with-foo=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('--with-foo=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('--with-foo=a,b,c', option) + + # Adding conflicting options is not allowed. + helper = CommandLineHelper({}, ['cmd']) +@@ -809,9 +809,9 @@ class TestCommandLineHelper(unittest.TestCase): + # But adding the same is allowed. + helper.add('FOO=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('FOO=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('FOO=a,b,c', option) + + # The same rule as above applies when using the option form vs. the + # variable form. But we can't detect it when .add is called. +@@ -837,9 +837,9 @@ class TestCommandLineHelper(unittest.TestCase): + helper.add('FOO=a,b,c', 'other-origin') + helper.add('--with-foo=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('--with-foo=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('--with-foo=a,b,c', option) + + # Conflicts are also not allowed against what is in the + # environment/on the command line. +@@ -869,19 +869,19 @@ class TestCommandLineHelper(unittest.TestCase): + foo = Option('--foo', + possible_origins=('command-line',)) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--foo', option) ++ self.assertEqual(PositiveOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--foo', option) + + bar = Option('--bar', + possible_origins=('mozconfig',)) +- with self.assertRaisesRegexp(InvalidOptionError, ++ with self.assertRaisesRegex(InvalidOptionError, + "--bar can not be set by command-line. Values are accepted from: mozconfig"): + helper.handle(bar) + + baz = Option(env='BAZ', + possible_origins=('implied',)) +- with self.assertRaisesRegexp(InvalidOptionError, ++ with self.assertRaisesRegex(InvalidOptionError, + "BAZ=1 can not be set by environment. Values are accepted from: implied"): + helper.handle(baz) + +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +index cb7ff709e..c339a32bf 100755 +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +@@ -2,12 +2,12 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import logging + import os + +-from StringIO import StringIO ++from io import StringIO + + from mozunit import main + +@@ -366,9 +366,9 @@ class BaseToolchainTest(BaseConfigureTest): + compiler = sandbox._value_for(sandbox[var]) + # Add var on both ends to make it clear which of the + # variables is failing the test when that happens. +- self.assertEquals((var, compiler), (var, result)) ++ self.assertEqual((var, compiler), (var, result)) + except SystemExit: +- self.assertEquals((var, result), ++ self.assertEqual((var, result), + (var, self.out.getvalue().strip())) + return + +@@ -407,7 +407,7 @@ class BaseToolchainTest(BaseConfigureTest): + 'RUST_LIB_SUFFIX', + 'OBJ_SUFFIX', + ): +- self.assertEquals('%s=%s' % (k, sandbox.get_config(k)), ++ self.assertEqual('%s=%s' % (k, sandbox.get_config(k)), + '%s=%s' % (k, library_name_info[k])) + + +@@ -584,7 +584,7 @@ class LinuxToolchainTest(BaseToolchainTest): + # We'll try gcc and clang, but since there is no gcc (gcc-x.y doesn't + # count), find clang. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('gcc', 'g++') + } + self.do_toolchain_test(paths, { +@@ -619,7 +619,7 @@ class LinuxToolchainTest(BaseToolchainTest): + # Even if there are gcc-x.y or clang-x.y compilers available, we + # don't try them. This could be considered something to improve. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('gcc', 'g++', 'clang', 'clang++') + } + self.do_toolchain_test(paths, { +@@ -800,7 +800,7 @@ class OSXToolchainTest(BaseToolchainTest): + def test_not_gcc(self): + # We won't pick GCC if it's the only thing available. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('clang', 'clang++') + } + self.do_toolchain_test(paths, { +@@ -976,7 +976,7 @@ class WindowsToolchainTest(BaseToolchainTest): + def test_clang_cl(self): + # We'll pick clang-cl if msvc can't be found. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) != 'cl' + } + self.do_toolchain_test(paths, { +@@ -987,7 +987,7 @@ class WindowsToolchainTest(BaseToolchainTest): + def test_gcc(self): + # We'll pick GCC if msvc and clang-cl can't be found. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('cl', 'clang-cl') + } + self.do_toolchain_test(paths, { +@@ -1006,7 +1006,7 @@ class WindowsToolchainTest(BaseToolchainTest): + def test_clang(self): + # We'll pick clang if nothing else is found. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('cl', 'clang-cl', 'gcc') + } + self.do_toolchain_test(paths, { +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py +index 8ec33a8b7..ba046ed12 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import copy + import re +@@ -10,7 +10,7 @@ import types + import unittest + + from fnmatch import fnmatch +-from StringIO import StringIO ++from io import StringIO + from textwrap import dedent + + from mozunit import ( +@@ -43,7 +43,7 @@ class CompilerPreprocessor(Preprocessor): + # Hack around it enough that the configure tests work properly. + context = self.context + def normalize_numbers(value): +- if isinstance(value, types.StringTypes): ++ if isinstance(value, (str,)): + if value[-1:] == 'L' and value[:-1].isdigit(): + value = int(value[:-1]) + return value +@@ -53,7 +53,7 @@ class CompilerPreprocessor(Preprocessor): + return self.HAS_FEATURE.sub(r'\1\2', expr) + self.context = self.Context( + (normalize_has_feature(k), normalize_numbers(v)) +- for k, v in context.iteritems() ++ for k, v in context.items() + ) + try: + return Preprocessor.do_if(self, normalize_has_feature(expression), +@@ -95,7 +95,7 @@ class TestCompilerPreprocessor(unittest.TestCase): + input.name = 'foo' + pp.do_include(input) + +- self.assertEquals(pp.out.getvalue(), '1 . 2 . c "D"') ++ self.assertEqual(pp.out.getvalue(), '1 . 2 . c "D"') + + def test_condition(self): + pp = CompilerPreprocessor({ +@@ -125,7 +125,7 @@ class TestCompilerPreprocessor(unittest.TestCase): + input.name = 'foo' + pp.do_include(input) + +- self.assertEquals('IFDEF_A\nIF_A\nIF_B\nIF_NOT_C\n', pp.out.getvalue()) ++ self.assertEqual('IFDEF_A\nIF_A\nIF_B\nIF_NOT_C\n', pp.out.getvalue()) + + + class FakeCompiler(dict): +@@ -164,9 +164,9 @@ class FakeCompiler(dict): + ''' + def __init__(self, *definitions): + for definition in definitions: +- if all(not isinstance(d, dict) for d in definition.itervalues()): ++ if all(not isinstance(d, dict) for d in definition.values()): + definition = {None: definition} +- for key, value in definition.iteritems(): ++ for key, value in definition.items(): + self.setdefault(key, {}).update(value) + + def __call__(self, stdin, args): +@@ -178,14 +178,14 @@ class FakeCompiler(dict): + pp = CompilerPreprocessor(self[None]) + + def apply_defn(defn): +- for k, v in defn.iteritems(): ++ for k, v in defn.items(): + if v is False: + if k in pp.context: + del pp.context[k] + else: + pp.context[k] = v + +- for glob, defn in self.iteritems(): ++ for glob, defn in self.items(): + if glob and not glob.startswith('-') and fnmatch(file, glob): + apply_defn(defn) + +@@ -216,7 +216,7 @@ class TestFakeCompiler(unittest.TestCase): + 'A': '1', + 'B': '2', + }) +- self.assertEquals(compiler(None, ['-E', 'file']), ++ self.assertEqual(compiler(None, ['-E', 'file']), + (0, '1 2 C', '')) + + compiler = FakeCompiler({ +@@ -238,25 +238,25 @@ class TestFakeCompiler(unittest.TestCase): + 'B': '42', + }, + }) +- self.assertEquals(compiler(None, ['-E', 'file']), ++ self.assertEqual(compiler(None, ['-E', 'file']), + (0, '1 2 C', '')) +- self.assertEquals(compiler(None, ['-E', '-foo', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-foo', 'file']), + (0, '1 2 foo', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-bar', 'file']), + (0, '1 bar bar', '')) +- self.assertEquals(compiler(None, ['-E', '-qux', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-qux', 'file']), + (0, '1 B C', '')) +- self.assertEquals(compiler(None, ['-E', '-foo', '-bar', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-foo', '-bar', 'file']), + (0, '1 bar bar', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', '-foo', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-bar', '-foo', 'file']), + (0, '1 bar foo', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', '-qux', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-bar', '-qux', 'file']), + (0, '1 B bar', '')) +- self.assertEquals(compiler(None, ['-E', '-qux', '-bar', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-qux', '-bar', 'file']), + (0, '1 bar bar', '')) +- self.assertEquals(compiler(None, ['-E', 'file.c']), ++ self.assertEqual(compiler(None, ['-E', 'file.c']), + (0, '1 42 C', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', 'file.c']), ++ self.assertEqual(compiler(None, ['-E', '-bar', 'file.c']), + (0, '1 bar bar', '')) + + def test_multiple_definitions(self): +@@ -267,7 +267,7 @@ class TestFakeCompiler(unittest.TestCase): + 'C': 3, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 2, +@@ -282,7 +282,7 @@ class TestFakeCompiler(unittest.TestCase): + 'C': 3, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 4, +@@ -302,7 +302,7 @@ class TestFakeCompiler(unittest.TestCase): + }, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 4, +@@ -330,7 +330,7 @@ class TestFakeCompiler(unittest.TestCase): + }, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 2, +@@ -370,7 +370,7 @@ class CompilerResult(ReadOnlyNamespace): + def __add__(self, other): + assert isinstance(other, dict) + result = copy.deepcopy(self.__dict__) +- for k, v in other.iteritems(): ++ for k, v in other.items(): + if k == 'flags': + result.setdefault(k, []).extend(v) + else: +@@ -381,7 +381,7 @@ class CompilerResult(ReadOnlyNamespace): + class TestCompilerResult(unittest.TestCase): + def test_compiler_result(self): + result = CompilerResult() +- self.assertEquals(result.__dict__, { ++ self.assertEqual(result.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath(''), + 'version': '', +@@ -397,7 +397,7 @@ class TestCompilerResult(unittest.TestCase): + language='C', + flags=['-std=gnu99'], + ) +- self.assertEquals(result.__dict__, { ++ self.assertEqual(result.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath('/usr/bin/gcc'), + 'version': '4.2.1', +@@ -407,7 +407,7 @@ class TestCompilerResult(unittest.TestCase): + }) + + result2 = result + {'flags': ['-m32']} +- self.assertEquals(result2.__dict__, { ++ self.assertEqual(result2.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath('/usr/bin/gcc'), + 'version': '4.2.1', +@@ -416,14 +416,14 @@ class TestCompilerResult(unittest.TestCase): + 'flags': ['-std=gnu99', '-m32'], + }) + # Original flags are untouched. +- self.assertEquals(result.flags, ['-std=gnu99']) ++ self.assertEqual(result.flags, ['-std=gnu99']) + + result3 = result + { + 'compiler': '/usr/bin/gcc-4.7', + 'version': '4.7.3', + 'flags': ['-m32'], + } +- self.assertEquals(result3.__dict__, { ++ self.assertEqual(result3.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath('/usr/bin/gcc-4.7'), + 'version': '4.7.3', +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py +index ac35d745f..cdd8ece1b 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import os + +diff --git a/python/mozbuild/mozbuild/test/configure/test_util.py b/python/mozbuild/mozbuild/test/configure/test_util.py +index 9f9575fd0..c2db1a628 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_util.py ++++ b/python/mozbuild/mozbuild/test/configure/test_util.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import logging + import os +@@ -11,7 +11,7 @@ import textwrap + import unittest + import sys + +-from StringIO import StringIO ++from io import StringIO + + from mozunit import main + from mozpack import path as mozpath +@@ -434,11 +434,11 @@ class TestLogSubprocessOutput(unittest.TestCase): + except SystemExit as e: + status = e.code + +- self.assertEquals(status, 0) ++ self.assertEqual(status, 0) + quote_char = "'" + if getpreferredencoding().lower() == 'utf-8': + quote_char = '\u00B4'.encode('utf-8') +- self.assertEquals(out.getvalue().strip(), quote_char) ++ self.assertEqual(out.getvalue().strip(), quote_char) + + + class TestVersion(unittest.TestCase): +diff --git a/python/mozbuild/mozbuild/testing.py b/python/mozbuild/mozbuild/testing.py +index 3229c3f77..82d250fab 100644 +--- a/python/mozbuild/mozbuild/testing.py ++++ b/python/mozbuild/mozbuild/testing.py +@@ -2,9 +2,9 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals + +-import cPickle as pickle ++ ++import pickle as pickle + import os + import sys + +@@ -70,7 +70,7 @@ REFTEST_FLAVORS = ('crashtest', 'reftest') + WEB_PLATFORM_TESTS_FLAVORS = ('web-platform-tests',) + + def all_test_flavors(): +- return ([v[0] for v in TEST_MANIFESTS.values()] + ++ return ([v[0] for v in list(TEST_MANIFESTS.values())] + + list(REFTEST_FLAVORS) + + list(WEB_PLATFORM_TESTS_FLAVORS)) + +@@ -210,7 +210,7 @@ def install_test_files(topsrcdir, topobjdir, tests_root, test_objs): + only a few tests need to be run. + """ + flavor_info = {flavor: (root, prefix, install) +- for (flavor, root, prefix, install) in TEST_MANIFESTS.values()} ++ for (flavor, root, prefix, install) in list(TEST_MANIFESTS.values())} + objdir_dest = mozpath.join(topobjdir, tests_root) + + converter = SupportFilesConverter() +@@ -292,7 +292,7 @@ def read_wpt_manifest(context, paths): + paths_file = os.path.join(context.config.topsrcdir, "testing", + "web-platform", "tests", "tools", "localpaths.py") + _globals = {"__file__": paths_file} +- execfile(paths_file, _globals) ++ exec(compile(open(paths_file, "rb").read(), paths_file, 'exec'), _globals) + import manifest as wptmanifest + finally: + sys.path = old_path +diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py +index 4ea227dc0..79cb15713 100644 +--- a/python/mozbuild/mozbuild/util.py ++++ b/python/mozbuild/mozbuild/util.py +@@ -5,7 +5,7 @@ + # This file contains miscellaneous utility functions that don't belong anywhere + # in particular. + +-from __future__ import absolute_import, unicode_literals, print_function ++ + + import argparse + import collections +@@ -21,6 +21,9 @@ import stat + import sys + import time + import types ++import pprint ++import six ++import subprocess + + from collections import ( + defaultdict, +@@ -36,7 +39,7 @@ from io import ( + if sys.version_info[0] == 3: + str_type = str + else: +- str_type = basestring ++ str_type = str + + if sys.platform == 'win32': + _kernel32 = ctypes.windll.kernel32 +@@ -78,7 +81,7 @@ def hash_file(path, hasher=None): + return h.hexdigest() + + +-class EmptyValue(unicode): ++class EmptyValue(str): + """A dummy type that behaves like an empty string and sequence. + + This type exists in order to support +@@ -92,7 +95,7 @@ class EmptyValue(unicode): + class ReadOnlyNamespace(object): + """A class for objects with immutable attributes set at initialization.""" + def __init__(self, **kwargs): +- for k, v in kwargs.iteritems(): ++ for k, v in kwargs.items(): + super(ReadOnlyNamespace, self).__setattr__(k, v) + + def __delattr__(self, key): +@@ -224,7 +227,7 @@ class FileAvoidWrite(BytesIO): + self.mode = mode + + def write(self, buf): +- if isinstance(buf, unicode): ++ if isinstance(buf, str): + buf = buf.encode('utf-8') + BytesIO.write(self, buf) + +@@ -267,6 +270,10 @@ class FileAvoidWrite(BytesIO): + if 'b' in self.mode: + writemode += 'b' + with open(self.name, writemode) as file: ++ if 'b' in self.mode and isinstance(buf, str): ++ buf = buf.encode('utf-8') ++ elif 'b' not in self.mode and isinstance(buf, bytes): ++ buf = buf.decode('utf-8') + file.write(buf) + + if self._capture_diff: +@@ -381,7 +388,7 @@ class ListMixin(object): + def __add__(self, other): + # Allow None and EmptyValue is a special case because it makes undefined + # variable references in moz.build behave better. +- other = [] if isinstance(other, (types.NoneType, EmptyValue)) else other ++ other = [] if isinstance(other, (type(None), EmptyValue)) else other + if not isinstance(other, list): + raise ValueError('Only lists can be appended to lists.') + +@@ -390,7 +397,7 @@ class ListMixin(object): + return new_list + + def __iadd__(self, other): +- other = [] if isinstance(other, (types.NoneType, EmptyValue)) else other ++ other = [] if isinstance(other, (type(None), EmptyValue)) else other + if not isinstance(other, list): + raise ValueError('Only lists can be appended to lists.') + +@@ -561,14 +568,14 @@ def FlagsFactory(flags): + functions below. + """ + assert isinstance(flags, dict) +- assert all(isinstance(v, type) for v in flags.values()) ++ assert all(isinstance(v, type) for v in list(flags.values())) + + class Flags(object): +- __slots__ = flags.keys() ++ __slots__ = list(flags.keys()) + _flags = flags + + def update(self, **kwargs): +- for k, v in kwargs.iteritems(): ++ for k, v in kwargs.items(): + setattr(self, k, v) + + def __getattr__(self, name): +@@ -1006,8 +1013,6 @@ def TypedNamedTuple(name, fields): + 'got %s, expected %s' % (fname, + type(value), ftype)) + +- super(TypedTuple, self).__init__(*args, **kwargs) +- + TypedTuple._fields = fields + + return TypedTuple +@@ -1099,14 +1104,14 @@ def group_unified_files(files, unified_prefix, unified_suffix, + # issue. So we do a little dance to filter it out ourselves. + dummy_fill_value = ("dummy",) + def filter_out_dummy(iterable): +- return itertools.ifilter(lambda x: x != dummy_fill_value, ++ return filter(lambda x: x != dummy_fill_value, + iterable) + + # From the itertools documentation, slightly modified: + def grouper(n, iterable): + "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx" + args = [iter(iterable)] * n +- return itertools.izip_longest(fillvalue=dummy_fill_value, *args) ++ return itertools.zip_longest(fillvalue=dummy_fill_value, *args) + + for i, unified_group in enumerate(grouper(files_per_unified_file, + files)): +@@ -1123,7 +1128,7 @@ def pair(iterable): + [(1,2), (3,4), (5,6)] + ''' + i = iter(iterable) +- return itertools.izip_longest(i, i) ++ return itertools.zip_longest(i, i) + + + VARIABLES_RE = re.compile('\$\((\w+)\)') +@@ -1141,7 +1146,7 @@ def expand_variables(s, variables): + value = variables.get(name) + if not value: + continue +- if not isinstance(value, types.StringTypes): ++ if not isinstance(value, (str,)): + value = ' '.join(value) + result += value + return result +@@ -1168,7 +1173,7 @@ class EnumStringComparisonError(Exception): + pass + + +-class EnumString(unicode): ++class EnumString(str): + '''A string type that only can have a limited set of values, similarly to + an Enum, and can only be compared against that set of values. + +@@ -1185,8 +1190,8 @@ class EnumString(unicode): + def __eq__(self, other): + if other not in self.POSSIBLE_VALUES: + raise EnumStringComparisonError( +- 'Can only compare with %s' +- % ', '.join("'%s'" % v for v in self.POSSIBLE_VALUES)) ++ '%s is not in %s' ++ % (other, ', '.join("'%s'" % v for v in self.POSSIBLE_VALUES))) + return super(EnumString, self).__eq__(other) + + def __ne__(self, other): +@@ -1204,14 +1209,14 @@ def _escape_char(c): + # quoting could be done with either ' or ". + if c == "'": + return "\\'" +- return unicode(c.encode('unicode_escape')) ++ return str(c.encode('unicode_escape')) + + # Mapping table between raw characters below \x80 and their escaped + # counterpart, when they differ + _INDENTED_REPR_TABLE = { + c: e + for c, e in map(lambda x: (x, _escape_char(x)), +- map(unichr, range(128))) ++ map(chr, range(128))) + if c != e + } + # Regexp matching all characters to escape. +@@ -1219,7 +1224,33 @@ _INDENTED_REPR_RE = re.compile( + '([' + ''.join(_INDENTED_REPR_TABLE.values()) + ']+)') + + ++# Stolen from gecko master [1] ++# [1] https://github.com/mozilla/gecko-dev/blob/4165a2e843c494bfb3e35d8a1fbf9c61209e3675/python/mozbuild/mozbuild/util.py#L1286 ++ ++# The default PrettyPrinter has some issues with UTF-8, so we need to override ++# some stuff here. ++class _PrettyPrinter(pprint.PrettyPrinter): ++ def format(self, object, context, maxlevels, level): ++ if not (isinstance(object, six.text_type) or ++ isinstance(object, six.binary_type)): ++ return super(_PrettyPrinter, self).format( ++ object, context, maxlevels, level) ++ # This is super hacky and weird, but the output of 'repr' actually ++ # varies based on the default I/O encoding of the process, which isn't ++ # necessarily utf-8. Instead we open a new shell and ask what the repr ++ # WOULD be assuming the default encoding is utf-8. If you can come up ++ # with a better way of doing this without simply re-implementing the ++ # logic of "repr", please replace this. ++ env = dict(os.environ) ++ env['PYTHONIOENCODING'] = 'utf-8' ++ ret = six.ensure_text(subprocess.check_output( ++ [sys.executable], input='print(repr(%s))' % repr(object), ++ universal_newlines=True, env=env, encoding='utf-8')).strip() ++ return (ret, True, False) ++ + def indented_repr(o, indent=4): ++ return _PrettyPrinter(indent=indent).pformat(o) ++ + '''Similar to repr(), but returns an indented representation of the object + + One notable difference with repr is that the returned representation +@@ -1242,7 +1273,7 @@ def indented_repr(o, indent=4): + elif isinstance(o, bytes): + yield 'b' + yield repr(o) +- elif isinstance(o, unicode): ++ elif isinstance(o, str): + yield "'" + # We want a readable string (non escaped unicode), but some + # special characters need escaping (e.g. \n, \t, etc.) +@@ -1272,11 +1303,11 @@ def encode(obj, encoding='utf-8'): + if isinstance(obj, dict): + return { + encode(k, encoding): encode(v, encoding) +- for k, v in obj.iteritems() ++ for k, v in obj.items() + } + if isinstance(obj, bytes): + return obj +- if isinstance(obj, unicode): ++ if isinstance(obj, str): + return obj.encode(encoding) + if isinstance(obj, Iterable): + return [encode(i, encoding) for i in obj] +diff --git a/python/mozbuild/mozbuild/virtualenv.py b/python/mozbuild/mozbuild/virtualenv.py +index 38d06d71d..c67c046f3 100644 +--- a/python/mozbuild/mozbuild/virtualenv.py ++++ b/python/mozbuild/mozbuild/virtualenv.py +@@ -531,9 +531,9 @@ def verify_python_version(log_handle): + + our = LooseVersion('%d.%d.%d' % (major, minor, micro)) + +- if major != MINIMUM_PYTHON_MAJOR or our < MINIMUM_PYTHON_VERSION: +- log_handle.write('Python %s or greater (but not Python 3) is ' +- 'required to build. ' % MINIMUM_PYTHON_VERSION) ++ if our < MINIMUM_PYTHON_VERSION: ++ log_handle.write('Python %s or greater is required to build. ' ++ % MINIMUM_PYTHON_VERSION) + log_handle.write('You are running Python %s.\n' % our) + + if os.name in ('nt', 'ce'): +diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py +index c91b99cf1..02eac0dbb 100644 +--- a/python/mozbuild/mozpack/chrome/manifest.py ++++ b/python/mozbuild/mozpack/chrome/manifest.py +@@ -2,11 +2,11 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import re + import os +-from urlparse import urlparse ++from urllib.parse import urlparse + import mozpack.path as mozpath + from mozpack.chrome.flags import Flags + from mozpack.errors import errors +@@ -316,7 +316,7 @@ class ManifestContract(ManifestEntry): + return self.serialize(self.contractID, self.cid) + + # All manifest classes by their type name. +-MANIFESTS_TYPES = dict([(c.type, c) for c in globals().values() ++MANIFESTS_TYPES = dict([(c.type, c) for c in list(globals().values()) + if type(c) == type and issubclass(c, ManifestEntry) + and hasattr(c, 'type') and c.type]) + +diff --git a/python/mozbuild/mozpack/copier.py b/python/mozbuild/mozpack/copier.py +index 1e521e52b..43ed9be4a 100644 +--- a/python/mozbuild/mozpack/copier.py ++++ b/python/mozbuild/mozpack/copier.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import os + import stat +@@ -113,7 +113,7 @@ class FileRegistry(object): + ''' + Return all paths stored in the container, in the order they were added. + ''' +- return self._files.keys() ++ return list(self._files.keys()) + + def __len__(self): + ''' +@@ -146,7 +146,7 @@ class FileRegistry(object): + for path, file in registry: + (...) + ''' +- return self._files.iteritems() ++ return iter(self._files.items()) + + def required_directories(self): + ''' +@@ -155,7 +155,7 @@ class FileRegistry(object): + unspecified (virtual) root directory (and do not include said root + directory). + ''' +- return set(k for k, v in self._required_directories.items() if v > 0) ++ return set(k for k, v in list(self._required_directories.items()) if v > 0) + + def output_to_inputs_tree(self): + ''' +@@ -295,7 +295,7 @@ class FileCopier(FileRegistry): + + Returns a FileCopyResult that details what changed. + ''' +- assert isinstance(destination, basestring) ++ assert isinstance(destination, str) + assert not os.path.exists(destination) or os.path.isdir(destination) + + result = FileCopyResult() +@@ -563,7 +563,7 @@ class Jarrer(FileRegistry, BaseFile): + def exists(self): + return self.deflater is not None + +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + assert isinstance(dest, Dest) + +diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py +index 8ce353375..bf35e39b8 100644 +--- a/python/mozbuild/mozpack/files.py ++++ b/python/mozbuild/mozpack/files.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import errno + import os +@@ -57,7 +57,7 @@ else: + + def _copyfile(src, dest): + # False indicates `dest` should be overwritten if it exists already. +- if isinstance(src, unicode) and isinstance(dest, unicode): ++ if isinstance(src, str) and isinstance(dest, str): + _CopyFileW(src, dest, False) + elif isinstance(src, str) and isinstance(dest, str): + _CopyFileA(src, dest, False) +@@ -164,7 +164,7 @@ class BaseFile(object): + disabled when skip_if_older is False. + Returns whether a copy was actually performed (True) or not (False). + ''' +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + else: + assert isinstance(dest, Dest) +@@ -278,11 +278,11 @@ class ExecutableFile(File): + ''' + def copy(self, dest, skip_if_older=True): + real_dest = dest +- if not isinstance(dest, basestring): ++ if not isinstance(dest, str): + fd, dest = mkstemp() + os.close(fd) + os.remove(dest) +- assert isinstance(dest, basestring) ++ assert isinstance(dest, str) + # If File.copy didn't actually copy because dest is newer, check the + # file sizes. If dest is smaller, it means it is already stripped and + # elfhacked, so we can skip. +@@ -319,7 +319,7 @@ class AbsoluteSymlinkFile(File): + File.__init__(self, path) + + def copy(self, dest, skip_if_older=True): +- assert isinstance(dest, basestring) ++ assert isinstance(dest, str) + + # The logic in this function is complicated by the fact that symlinks + # aren't universally supported. So, where symlinks aren't supported, we +@@ -410,7 +410,7 @@ class HardlinkFile(File): + ''' + + def copy(self, dest, skip_if_older=True): +- assert isinstance(dest, basestring) ++ assert isinstance(dest, str) + + if not hasattr(os, 'link'): + return super(HardlinkFile, self).copy( +@@ -471,7 +471,7 @@ class ExistingFile(BaseFile): + self.required = required + + def copy(self, dest, skip_if_older=True): +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + else: + assert isinstance(dest, Dest) +@@ -517,7 +517,7 @@ class PreprocessedFile(BaseFile): + ''' + Invokes the preprocessor to create the destination file. + ''' +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + else: + assert isinstance(dest, Dest) +@@ -657,7 +657,7 @@ class XPTFile(GeneratedFile): + the individual XPTs to link. + skip_if_older is ignored. + ''' +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + assert isinstance(dest, Dest) + +@@ -1108,7 +1108,7 @@ class ComposedFinder(BaseFinder): + from mozpack.copier import FileRegistry + self.files = FileRegistry() + +- for base, finder in sorted(finders.iteritems()): ++ for base, finder in sorted(finders.items()): + if self.files.contains(base): + self.files.remove(base) + for p, f in finder.find(''): +diff --git a/python/mozbuild/mozpack/manifests.py b/python/mozbuild/mozpack/manifests.py +index 27c66634b..f79b40086 100644 +--- a/python/mozbuild/mozpack/manifests.py ++++ b/python/mozbuild/mozpack/manifests.py +@@ -2,8 +2,6 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals +- + from contextlib import contextmanager + import json + +@@ -116,7 +114,7 @@ class InstallManifest(object): + self._source_files = set() + + if path or fileobj: +- with _auto_fileobj(path, fileobj, 'rb') as fh: ++ with _auto_fileobj(path, fileobj, 'r') as fh: + self._source_files.add(fh.name) + self._load_from_fileobj(fh) + +@@ -175,7 +173,7 @@ class InstallManifest(object): + dest, content = fields[1:] + + self.add_content( +- self._decode_field_entry(content).encode('utf-8'), dest) ++ self._decode_field_entry(content), dest) + continue + + # Don't fail for non-actionable items, allowing +@@ -228,7 +226,7 @@ class InstallManifest(object): + + It is an error if both are specified. + """ +- with _auto_fileobj(path, fileobj, 'wb') as fh: ++ with _auto_fileobj(path, fileobj, 'w') as fh: + fh.write('%d\n' % self.CURRENT_VERSION) + + for dest in sorted(self._dests): +@@ -242,13 +240,11 @@ class InstallManifest(object): + for path in paths: + source = mozpath.join(base, path) + parts = ['%d' % type, mozpath.join(dest, path), source] +- fh.write('%s\n' % self.FIELD_SEPARATOR.join( +- p.encode('utf-8') for p in parts)) ++ fh.write('%s\n' % self.FIELD_SEPARATOR.join(parts)) + else: + parts = ['%d' % entry[0], dest] + parts.extend(entry[1:]) +- fh.write('%s\n' % self.FIELD_SEPARATOR.join( +- p.encode('utf-8') for p in parts)) ++ fh.write('%s\n' % self.FIELD_SEPARATOR.join(parts)) + + def add_link(self, source, dest): + """Add a link to this manifest. +@@ -439,7 +435,7 @@ class InstallManifest(object): + if install_type == self.CONTENT: + # GeneratedFile expect the buffer interface, which the unicode + # type doesn't have, so encode to a str. +- content = self._decode_field_entry(entry[1]).encode('utf-8') ++ content = self._decode_field_entry(entry[1]) + registry.add(dest, GeneratedFile(content)) + continue + +diff --git a/python/mozbuild/mozpack/mozjar.py b/python/mozbuild/mozpack/mozjar.py +index a723fd2c0..0b04d233c 100644 +--- a/python/mozbuild/mozpack/mozjar.py ++++ b/python/mozbuild/mozpack/mozjar.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + from io import BytesIO + import struct +@@ -14,9 +14,10 @@ from zipfile import ( + ZIP_DEFLATED, + ) + from collections import OrderedDict +-from urlparse import urlparse, ParseResult ++from urllib.parse import urlparse, ParseResult + import mozpack.path as mozpath + from mozbuild.util import memoize ++from functools import reduce + + + JAR_STORED = ZIP_STORED +@@ -72,7 +73,7 @@ class JarStruct(object): + an instance with empty fields. + ''' + assert self.MAGIC and isinstance(self.STRUCT, OrderedDict) +- self.size_fields = set(t for t in self.STRUCT.itervalues() ++ self.size_fields = set(t for t in self.STRUCT.values() + if not t in JarStruct.TYPE_MAPPING) + self._values = {} + if data: +@@ -94,7 +95,7 @@ class JarStruct(object): + # For all fields used as other fields sizes, keep track of their value + # separately. + sizes = dict((t, 0) for t in self.size_fields) +- for name, t in self.STRUCT.iteritems(): ++ for name, t in self.STRUCT.items(): + if t in JarStruct.TYPE_MAPPING: + value, size = JarStruct.get_data(t, data[offset:]) + else: +@@ -113,7 +114,7 @@ class JarStruct(object): + Initialize an instance with empty fields. + ''' + self.signature = self.MAGIC +- for name, t in self.STRUCT.iteritems(): ++ for name, t in self.STRUCT.items(): + if name in self.size_fields: + continue + self._values[name] = 0 if t in JarStruct.TYPE_MAPPING else '' +@@ -138,9 +139,9 @@ class JarStruct(object): + from self.STRUCT. + ''' + serialized = struct.pack('" % (self.__class__.__name__, +@@ -374,7 +375,7 @@ class JarReader(object): + entries = self.entries + if not entries: + return JAR_STORED +- return max(f['compression'] for f in entries.itervalues()) ++ return max(f['compression'] for f in entries.values()) + + @property + def entries(self): +@@ -390,7 +391,7 @@ class JarReader(object): + preload = JarStruct.get_data('uint32', self._data)[0] + entries = OrderedDict() + offset = self._cdir_end['cdir_offset'] +- for e in xrange(self._cdir_end['cdir_entries']): ++ for e in range(self._cdir_end['cdir_entries']): + entry = JarCdirEntry(self._data[offset:]) + offset += entry.size + # Creator host system. 0 is MSDOS, 3 is Unix +@@ -452,7 +453,7 @@ class JarReader(object): + for file in jarReader: + ... + ''' +- for entry in self.entries.itervalues(): ++ for entry in self.entries.values(): + yield self._getreader(entry) + + def __getitem__(self, name): +@@ -547,7 +548,7 @@ class JarWriter(object): + headers = {} + preload_size = 0 + # Prepare central directory entries +- for entry, content in self._contents.itervalues(): ++ for entry, content in self._contents.values(): + header = JarLocalFileHeader() + for name in entry.STRUCT: + if name in header: +@@ -562,7 +563,7 @@ class JarWriter(object): + end['disk_entries'] = len(self._contents) + end['cdir_entries'] = end['disk_entries'] + end['cdir_size'] = reduce(lambda x, y: x + y[0].size, +- self._contents.values(), 0) ++ list(self._contents.values()), 0) + # On optimized archives, store the preloaded size and the central + # directory entries, followed by the first end of central directory. + if self._optimize: +@@ -571,18 +572,18 @@ class JarWriter(object): + if preload_size: + preload_size += offset + self._data.write(struct.pack('= 6 # https://bugzilla.redhat.com/show_bug.cgi?id=1328045 @@ -82,7 +85,7 @@ do_configure() { export SHELL="/bin/sh" cd ${S} # Add mozjs python-modules necessary - PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + PYTHONPATH="${S}/third_party/python/which:${S}/config:${S}/build" for sub_dir in python testing/mozbase; do for module_dir in `ls $sub_dir -1`;do [ $module_dir = "virtualenv" ] && continue @@ -96,7 +99,6 @@ do_configure() { cd ${S}/js/src autoconf213 --macrodir=${STAGING_DATADIR_NATIVE}/autoconf213 old-configure.in > old-configure - sed -i 's:refresh = True:refresh = False:g' ${S}/build/moz.configure/old.configure cd ${B} ${S}/js/src/configure ${EXTRA_OECONF} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:32 +0000 Subject: [oe-commits] [openembedded-core] 01/35: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.A9AB923291C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dfb6bdf7490cede54fe478f12d43fd2351a7a00c Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:35 +0000 Subject: [oe-commits] [openembedded-core] 04/35: oeqa: reproducible: Do not strip packages In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.C5EE2232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d6cc9be446b22accd8c1d0c407feadae636a856a Author: Joshua Watt AuthorDate: Sun Jan 19 12:59:59 2020 -0600 oeqa: reproducible: Do not strip packages Do not strip packages when testing reproducible builds. In some cases, stripped data differs between builds, but then gets removed. However, the contents affect the generation of the GCC build-id, which then differs in the resulting ELF files, even though the data that caused this is no longer there. Inhibit stripping so that their causes can be evaluated. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9c715ef..61f0711 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -144,6 +144,7 @@ class ReproducibleTests(OESelftestTestCase): config = textwrap.dedent('''\ INHERIT += "reproducible_build" PACKAGE_CLASSES = "{package_classes}" + INHIBIT_PACKAGE_STRIP = "1" TMPDIR = "{tmpdir}" ''').format(package_classes=' '.join('package_%s' % c for c in self.package_classes), tmpdir=tmpdir) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:31 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (5114494 -> e6b34ea) Message-ID: <158057913151.14293.9431067235111119846@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 5114494 MEMORIAM: Add recognition for contributors no longer with us discard 7640038 libgcc.inc: Fix an issue w/ a recursive symlink discard 982fe05 toaster.bbclass: Fix error when toaster is used to monitor a build discard 38c6d8f sstatesig: Log timestamps for hashequiv in reprodubile builds discard a3105ab u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig discard 107cdf2 devtool/standard.py: Allow recipe to disable menuconfig logic discard 37fad94 kernel-devsrc: update to v5.4+ discard eb54bd7 kern-tools: update Kconfiglib to latest (for 5.4+ kernel) discard dce90ae linux-yocto: introduce 5.4 recipes discard 7a66ae3 systemd: Refresh the patches discard dfcd725 gcc-cross-canadian: A missing space in an append caused an invalid option discard 967d3a4 texinfo-dummy-native: Allow to coexist with texinfo-native discard 571b6a4 autoconf-archive: Add missing texinfo inherit discard fc197e4 bitbake.conf/sanity: Drop makeinfo as being required on buildhost discard e502c9d texinfo: Only build texinfo when api-docs enabled discard e231a86 texinfo/texinfo-dummy-native: Drop native path prefix discard ee03a1d glibc-package.inc: Remove warnings about unpacked directories discard 9bb1d77 systemd: Upgrade 243.2 -> 243.4-latest discard 198136f iptables: upgrade 1.8.3 -> 1.8.4 discard 821fc38 iw: upgrade 5.3 -> 5.4 discard fa4e48b iproute2: upgrade 5.3.0 -> 5.5.0 discard 106808c musl: Update to latest discard 4a20154 valgrind: Fix ptest builds on musl discard ed2d215 valgrind: fix the remaining ptest failures discard ff70cfb HACK: signing: Add extra test debug discard a36dc7b HACK: Enable saving of packages discard f42e7d2 oeqa: reproducible: Do not strip packages discard e046568 glew/curl: specify exclusive package configs discard f43b406 base.bbclass: extend PACKAGECONFIG for conflict package configs discard ba1682d oescripts.py: use unittest.SkipUnless for class skip add cd9006b MEMORIAM: Add recognition for contributors no longer with us new dfb6bdf oescripts.py: use unittest.SkipUnless for class skip new 9975572 base.bbclass: extend PACKAGECONFIG for conflict package configs new 48924a0 glew/curl: specify exclusive package configs new d6cc9be oeqa: reproducible: Do not strip packages new 54f81ec HACK: Enable saving of packages new 5ab5fec HACK: signing: Add extra test debug new 1e8dee2 valgrind: fix the remaining ptest failures new 7885ce5 valgrind: Fix ptest builds on musl new 5f5410e musl: Update to latest new feea0bd iproute2: upgrade 5.3.0 -> 5.5.0 new ff9f720 iw: upgrade 5.3 -> 5.4 new 30f7454 iptables: upgrade 1.8.3 -> 1.8.4 new f96b359 systemd: Upgrade 243.2 -> 243.4-latest new af0f2e6 glibc-package.inc: Remove warnings about unpacked directories new 38576ff texinfo/texinfo-dummy-native: Drop native path prefix new 01b2f2d texinfo: Only build texinfo when api-docs enabled new 21e82c5 bitbake.conf/sanity: Drop makeinfo as being required on buildhost new 5b29f96 autoconf-archive: Add missing texinfo inherit new 515c561 texinfo-dummy-native: Allow to coexist with texinfo-native new 5e8ba7b gcc-cross-canadian: A missing space in an append caused an invalid option new 1d5bd33 systemd: Refresh the patches new c5153e0 linux-yocto: introduce 5.4 recipes new 65a05f3 kern-tools: update Kconfiglib to latest (for 5.4+ kernel) new 4f8cd23 kernel-devsrc: update to v5.4+ new 4db3ec0 devtool/standard.py: Allow recipe to disable menuconfig logic new bbc29d7 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig new b47dc07 sstatesig: Log timestamps for hashequiv in reprodubile builds new 9d75e75 toaster.bbclass: Fix error when toaster is used to monitor a build new fe0bf0d libgcc.inc: Fix an issue w/ a recursive symlink new 9765005 classes/reproducible_build: Read SDE file later new 7a563e6 glibc: merge libc-common.bbclass into glibc.bb new a370793 icu: update SRC_URI new 5b24928 uninative: Recognise ppc64 host ldso new 55f1200 glibc: Update to final 2.31 release new e6b34ea busybox: sort the .config file used by ptests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5114494) \ N -- N -- N refs/heads/master-next (e6b34ea) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 35 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/libc-common.bbclass | 37 ------------------------- meta/classes/reproducible_build.bbclass | 43 +++++++++++++++++++++++------ meta/classes/uninative.bbclass | 2 +- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/busybox/busybox.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++-- meta/recipes-core/glibc/glibc-version.inc | 6 ++-- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++-- 9 files changed, 87 insertions(+), 58 deletions(-) delete mode 100644 meta/classes/libc-common.bbclass -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:33 +0000 Subject: [oe-commits] [openembedded-core] 02/35: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.B3A8323291E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9975572c126bb14ef9c58d5214c92d9690c7443f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:34 +0000 Subject: [oe-commits] [openembedded-core] 03/35: glew/curl: specify exclusive package configs In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.BC6F923291F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 48924a0427cbd3bbf558e804c26ac5e7f6ca1e3f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:36 +0000 Subject: [oe-commits] [openembedded-core] 05/35: HACK: Enable saving of packages In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.D246D23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 54f81ec9448f4dba76a5f1934730c97a10bd163f Author: Joshua Watt AuthorDate: Thu Oct 24 13:09:33 2019 -0500 HACK: Enable saving of packages Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 61f0711..e1f2d3b 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -79,7 +79,7 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = False + save_results = True # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:37 +0000 Subject: [oe-commits] [openembedded-core] 06/35: HACK: signing: Add extra test debug In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.DF63C23292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5ab5fec915cfb6de427ff32c923eb080f42bf100 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:40 +0000 Subject: [oe-commits] [openembedded-core] 09/35: musl: Update to latest In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.0DD41232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5f5410e3f9845011a9be5adb26a487a446890080 Author: Khem Raj AuthorDate: Mon Jan 27 20:08:49 2020 -0800 musl: Update to latest Changelog [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=91e662d1d941215eb024787db5e910dbfb5b169f..83350eb17b9cb355e3f08b0340c4f1e8c437fac9 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 1676e28..6298720 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "91e662d1d941215eb024787db5e910dbfb5b169f" +SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:38 +0000 Subject: [oe-commits] [openembedded-core] 07/35: valgrind: fix the remaining ptest failures In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174531.ECC5B23292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1e8dee2829721e7c4fa58db7ef2bbfb78466762e Author: Alexander Kanavin AuthorDate: Mon Jan 27 15:19:07 2020 +0100 valgrind: fix the remaining ptest failures Particularly, one test is disabled as it is failing everywhere, two patches that actually cause failures are dropped and some binaries are prevented from being stripped where that is expected. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...s-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ++++++++++++++++++++++ ...-valgrind-adjust-std_list-expected-output.patch | 32 -------------------- ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 -------------------- meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 23 +++++++++++++-- 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch new file mode 100644 index 0000000..d641998 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch @@ -0,0 +1,34 @@ +From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 24 Jan 2020 17:55:39 +0100 +Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths + +In oe-core, /tmp is linked to /var/volatile/tmp and +valgrind output changes accordingly + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + none/tests/fdleak_cmsg.stderr.exp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp +index 6e5a797b9..0ede1ab18 100644 +--- a/none/tests/fdleak_cmsg.stderr.exp ++++ b/none/tests/fdleak_cmsg.stderr.exp +@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null + + + FILE DESCRIPTORS: 6 open at exit. +-Open file descriptor ...: /tmp/data2 ++Open file descriptor ...: ... + ... + +-Open file descriptor ...: /tmp/data1 ++Open file descriptor ...: ... + ... + + Open AF_UNIX socket ...: +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch b/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch deleted file mode 100644 index a82972e..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1e9265b03cf51d09c028d657fe826d7156a783 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 13 May 2019 17:26:26 -0400 -Subject: [PATCH 2/2] valgrind: adjust std_list expected output - -The run-ptest script uses a custom --yocto-ptest option -to change the summary statistics that valgrind issues -to a format that matches what ptest-runner expects. - -Only this std_list test which checks that strcpy() works -properly on Ubuntu-12.04 and later is affected by this change. -It's normal output when called with --yocto-ptest is a blank -line so adjust the expected output. - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Randy MacLeod ---- - drd/tests/std_list.stderr.exp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drd/tests/std_list.stderr.exp b/drd/tests/std_list.stderr.exp -index d18786f80..8b1378917 100644 ---- a/drd/tests/std_list.stderr.exp -+++ b/drd/tests/std_list.stderr.exp -@@ -1,3 +1 @@ - -- --ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch deleted file mode 100644 index 05886c7..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 01:20:32 -0700 -Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding - offset to it - -Fixes -error: invalid use of undefined type 'struct __pthread' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - drd/tests/pth_detached3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef1..35d43a6 100644 ---- a/drd/tests/pth_detached3.c -+++ b/drd/tests/pth_detached3.c -@@ -21,7 +21,7 @@ int main(int argc, char** argv) - pthread_detach(thread); - - /* Invoke pthread_detach() with an invalid thread ID. */ -- pthread_detach(thread + 8); -+ pthread_detach((pthread_t*)(&thread + 8)); - - fprintf(stderr, "Finished.\n"); - --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834c..0f86aa4 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0003-correct-include-directive-path-for-config.h.patch \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ - file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ @@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ - file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ + file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" @@ -205,4 +204,24 @@ do_install_ptest() { # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest + + # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) + # https://bugs.kde.org/show_bug.cgi?id=402833 + rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest + + # As the binary isn't stripped or debug-splitted, the source file isn't fetched + # via dwarfsrcfiles either, so it needs to be installed manually. + mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ + install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ } + +# avoid stripping some generated binaries otherwise some of the tests will fail +# run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/none/tests/tls \ + ${PKGD}${PTEST_PATH}/none/tests/tls.so \ + ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ + ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ + ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ + ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:41 +0000 Subject: [oe-commits] [openembedded-core] 10/35: iproute2: upgrade 5.3.0 -> 5.5.0 In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.19134232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit feea0bd1fd3cd91d325da5a7c54717964ade47f9 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:25 2020 +0100 iproute2: upgrade 5.3.0 -> 5.5.0 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iproute2/{iproute2_5.3.0.bb => iproute2_5.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb similarity index 66% rename from meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb index 75772d4..ad0ab13 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb @@ -4,8 +4,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[md5sum] = "227404413c8d6db649d6188ead1e5a6e" -SRC_URI[sha256sum] = "cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f" +SRC_URI[md5sum] = "ee8e2cdb416d4a8ef39525d39ab7c2d0" +SRC_URI[sha256sum] = "bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b" # CFLAGS are computed in Makefile and reference CCOPTS # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:39 +0000 Subject: [oe-commits] [openembedded-core] 08/35: valgrind: Fix ptest builds on musl In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.030B7232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7885ce5eb411efd7c3209efbf76278e950035bff Author: Khem Raj AuthorDate: Mon Jan 27 19:58:50 2020 -0800 valgrind: Fix ptest builds on musl Signed-off-by: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 44 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch new file mode 100644 index 0000000..44d707a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -0,0 +1,44 @@ +From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 27 Jan 2020 17:17:19 -0800 +Subject: [PATCH] tests: Make pthread_detatch call portable across platforms + +pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type +this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable +across glibc and musl + +Fixes +| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' +| 24 | pthread_detach(thread + 8); +| | ^ + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +Signed-off-by: Khem Raj +--- + drd/tests/pth_detached3.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c +index c02eef11a..efeb15b72 100644 +--- a/drd/tests/pth_detached3.c ++++ b/drd/tests/pth_detached3.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + static void* thread_func(void* arg) + { +@@ -21,7 +22,7 @@ int main(int argc, char** argv) + pthread_detach(thread); + + /* Invoke pthread_detach() with an invalid thread ID. */ +- pthread_detach(thread + 8); ++ pthread_detach((pthread_t)((uintptr_t)thread + 8)); + + fprintf(stderr, "Finished.\n"); + +-- +2.25.0 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 0f86aa4..1475ff8 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ + file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:43 +0000 Subject: [oe-commits] [openembedded-core] 12/35: iptables: upgrade 1.8.3 -> 1.8.4 In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.2F0B5232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 30f7454898bd704e1d6f87104864c247c3f15f1d Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:27 2020 +0100 iptables: upgrade 1.8.3 -> 1.8.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iptables/{iptables_1.8.3.bb => iptables_1.8.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb b/meta/recipes-extended/iptables/iptables_1.8.4.bb similarity index 96% rename from meta/recipes-extended/iptables/iptables_1.8.3.bb rename to meta/recipes-extended/iptables/iptables_1.8.4.bb index 96d195d..cf1388c 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.4.bb @@ -16,8 +16,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513" -SRC_URI[sha256sum] = "a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" +SRC_URI[md5sum] = "9b201107957fbf62709c3d8226239b0d" +SRC_URI[sha256sum] = "993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:45 +0000 Subject: [oe-commits] [openembedded-core] 14/35: glibc-package.inc: Remove warnings about unpacked directories In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.4E58523293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af0f2e6ffc2e89644a6234e866e9ef7468b16b3e Author: Richard Purdie AuthorDate: Tue Jan 28 14:37:45 2020 +0000 glibc-package.inc: Remove warnings about unpacked directories If documemtation generation is disabled, the recipe throws warnings about unpackaged files. Avoid this. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index ede9e9b..d2667f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -213,6 +213,8 @@ stash_locale_cleanup () { rm -rf $cleanupdir${libdir}/gconv rm -rf $cleanupdir${localedir} rm -rf $cleanupdir${datadir}/locale + rmdir --ignore-fail-on-non-empty $cleanupdir${datadir} + if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then if [ -d "$cleanupdir${exec_prefix}/lib" ]; then if [ -z "${ARCH_DYNAMIC_LOADER}" -o \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:42 +0000 Subject: [oe-commits] [openembedded-core] 11/35: iw: upgrade 5.3 -> 5.4 In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.2344D232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ff9f720f7a621623f753be52c3b524c922c5c203 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:26 2020 +0100 iw: upgrade 5.3 -> 5.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iw/iw/separate-objdir.patch | 24 ++++++++++++++-------- .../iw/{iw_5.3.bb => iw_5.4.bb} | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index eb01a5a..179fd90 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch @@ -1,3 +1,6 @@ +From ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae +Date: Mon, 27 Jan 2020 22:48:03 +0100 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -11,12 +14,12 @@ Signed-off-by: Maxin B. John 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 33aaf6a..9030796 100644 +index 90f2251..714cdb9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ MAKEFLAGS += --no-print-directory - + +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) @@ -24,19 +27,24 @@ index 33aaf6a..9030796 100644 PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -@@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) +@@ -92,7 +96,7 @@ all: $(ALL) version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ - $(Q)./version.sh $@ + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ - - %.o: %.c iw.h nl80211.h + + nl80211-commands.inc: nl80211.h + @$(NQ) ' GEN ' $@ +@@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h + + %.o: %.c iw.h nl80211.h nl80211-commands.inc @$(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - + ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) --- -2.20.1 (Apple Git-117) +-- +2.23.0 + diff --git a/meta/recipes-connectivity/iw/iw_5.3.bb b/meta/recipes-connectivity/iw/iw_5.4.bb similarity index 85% rename from meta/recipes-connectivity/iw/iw_5.3.bb rename to meta/recipes-connectivity/iw/iw_5.4.bb index f7f13f5..9f58e49 100644 --- a/meta/recipes-connectivity/iw/iw_5.3.bb +++ b/meta/recipes-connectivity/iw/iw_5.4.bb @@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://separate-objdir.patch \ " -SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31" -SRC_URI[sha256sum] = "175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a" +SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6" +SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c" inherit pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:44 +0000 Subject: [oe-commits] [openembedded-core] 13/35: systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.3FC9423293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f96b35973fce39c1e5c447bfed215f00a427b41a Author: Alex Kiernan AuthorDate: Mon Jan 27 23:13:06 2020 +0000 systemd: Upgrade 243.2 -> 243.4-latest Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Commits from v243-stable: 70e8c1978a9a seccomp: real syscall numbers are >= 0 a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change b59d88cc62a4 man: fix typo in net-naming-scheme man page c5e5ac095821 man: fix typos (#14304) 9a2f26564d5a ipv4ll: do not reset conflict counter on restart bc9e1ebfdd3b Fix typo (duplicate "or") c6cb71b7e741 network: if /sys is rw, then udev should be around 67dcdfd95629 nspawn: do not fail if udev is not running a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative b1cf452ff5f6 systemctl: enhance message about kexec missing kernel 07a0e5b42523 man: use mkswap@ instead of makeswap@ 57dc017c6bac journald: don't ask for the machine ID if we don't need it ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field 471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61a0 man: drop reference to machined, add one for journald instead fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b2378 shared/ask-password-api: modify keyctl break value a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed 4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit() d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be* a67a3ae04b89 man: document all pager variables for systemctl and systemd 3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug 733e7f19d3cf travis: add missing closing quote sign 0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter= aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules b9a619bb6738 udevadm: ignore EROFS and return earlier 1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree 7fa7080248aa umount: be happy if /proc/swaps doesn't exist 71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools b50ca0152681 core: do not propagate polkit error to caller 99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list 37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault 3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC 2139d58652bb bpf: fix off-by-one in class whitelisting cb7693595db9 bpf: fix device type filter 56e1ba304b00 core: constify bpf program arrays b06b7ace92c1 run: propagate return code/status from the child 5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection 8d88a2ecd7ce udev: fix error code in the log message c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node f218b65b3246 udev: do not append newline when write attributes ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone 8b888d236007 seccomp: add all *time64 syscalls 53d8feeb2334 libblkid: open device in nonblock mode. b9478046b03d man: describe ordering in case of Conflicts= fa3e5bd2bbb4 man: put description of Wants= above Requires= bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page 9c12127e3d2e man: save pull-raw example file without underscores 4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page 03cc374fca74 shared/format-table: disable ellipsization when piped 0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too fc0451bc0a3f allow an empty DefaultInstance= in configuration files 587266c24aae man/systemd.net-naming-scheme: fix typo e0e63f0f9bb9 nspawn: respect quiet on capabilities warning 37e50c05b564 nspawn: mangle slice name 4fefc493541e mkosi: Find hostname command on Arch Linux c430e8affba4 Fix mkosi on Arch Linux 1765b8d803dd Update to Fedora31 0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2 24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available 14e377ef3519 sd-boot: Only disable optimization on debug builds a39008ddecb9 meson: correct man page deps 4c1dcc06fa30 sd-event: don't invalidate source type on disconnect fb89ee34cedc analyze: fix minor memleak a449299bc087 analyze: sort list of unknown syscalls kernel implements 51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists 819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq d2b4d7ee17de network-generator: Add missing help for --root f1b18c206208 modules-load: do not fail service if modules are not present 606de6626714 pid1: order .automount units after local-fs-pre.target 1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command 00af6c447f25 resolved: set stream type during DnsStream creation 66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function 34fa67bbe732 machine-id-setup: avoid unexpected aborting 24c99fa2ef3d test-socket-util: avoid writing past the defined buffer ce82233f99b3 test: drop duplicated 's' 75a0e7209114 nspawn: fix handling of --console=help f41a282875fc Revert "sysusers: properly mark generated accounts as locked" fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users 6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS 961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure 19590e289ace ceph is a network filesystem 339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func 47d0e23d26af udev: fix memleak caused by wrong cleanup function a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.* cb1d892f1780 parse_hwdb: process files in order ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range 25bb377a73e7 cgroup: fix typo in BPF firewall support warning message 6d97aca0d503 fix build with compilers with default stack-protector enabled fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p 20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV 6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment 9d8e889810b5 nspawn: consistenly fail if parsing the environment fails 40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min ea248e53bf76 cgroup: Check ancestor memory min for unified memory config de1d25a506db cgroup: docs: memory.high doc fixups 2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem 5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly 8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments a0577353f191 man: Add a missing space in machinectl(1) 693e98398869 log: Add missing "%" in "%m" log format strings ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 2 - 6 files changed, 18 insertions(+), 212 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.2.bb b/meta/recipes-core/systemd/systemd-boot_243.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.2.bb rename to meta/recipes-core/systemd/systemd-boot_243.4.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 18f17d2..2fca6dc 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" +SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +PV = "243.4+git${SRCPV}" + S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff..ea37680 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/units/meson.build b/units/meson.build -index e1ee9f86c3..6bb7771b36 100644 ---- a/units/meson.build -+++ b/units/meson.build +Index: systemd-stable/units/meson.build +=================================================================== +--- systemd-stable.orig/units/meson.build ++++ systemd-stable/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 30a6bc9918..4231f3b70f 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount +Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount ++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index e940c7c9ad..6be7f5cc9b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +Index: systemd-stable/units/systemd-binfmt.service.in +=================================================================== +--- systemd-stable.orig/units/systemd-binfmt.service.in ++++ systemd-stable/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount + After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target - ConditionPathIsReadWrite=/proc/sys/ -@@ -28,3 +29,6 @@ Type=oneshot +@@ -29,3 +30,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt TimeoutSec=90s diff --git a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch b/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted file mode 100644 index f359d28..0000000 --- a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Nov 2019 17:51:30 +0100 -Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's - __NR_xyz namespace invasion - -A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the -same conditioning for all cases of our __NR_xyz use. - -Fixes: #14031 - -Reference: -https://github.com/systemd/systemd/pull/14032/commits/62f66fdbcc33580467c01b1f149474b6c973df5a - -Upstream-Status: Backport - -Signed-off-by: Ming Liu ---- - src/basic/missing_syscall.h | 10 +++++----- - src/test/test-seccomp.c | 19 ++++++++++--------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 6d9b125..1255d8b 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c - - #if !HAVE_KCMP - static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { --# ifdef __NR_kcmp -+# if defined __NR_kcmp && __NR_kcmp > 0 - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else - errno = ENOSYS; -@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i - - #if !HAVE_KEYCTL - static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { --# ifdef __NR_keyctl -+# if defined __NR_keyctl && __NR_keyctl > 0 - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; -@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg - } - - static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { --# ifdef __NR_add_key -+# if defined __NR_add_key && __NR_add_key > 0 - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; -@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip - } - - static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { --# ifdef __NR_request_key -+# if defined __NR_request_key && __NR_request_key > 0 - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; -@@ -496,7 +496,7 @@ enum { - static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, - unsigned long maxnode) { - long i; --# ifdef __NR_set_mempolicy -+# if defined __NR_set_mempolicy && __NR_set_mempolicy > 0 - i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); - # else - errno = ENOSYS; -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 018c20f..c669204 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -28,7 +28,8 @@ - #include "tmpfile-util.h" - #include "virt.h" - --#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) -+/* __NR_socket may be invalid due to libseccomp */ -+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) - /* On these archs, socket() is implemented via the socketcall() syscall multiplexer, - * and we can't restrict it hence via seccomp. */ - # define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1 -@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) { - assert_se(pid >= 0); - - if (pid == 0) { --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); - #endif - - assert_se(seccomp_protect_sysctl() >= 0); - --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0); - assert_se(errno == EPERM); - #endif -@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(poll(NULL, 0, 0) == 0); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0); -@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); -@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) { - * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On - * other architectures, let's just fall back to the glibc call. */ - --#ifdef SYS_open -- return (int) syscall(SYS_open, path, flags, mode); -+#if defined __NR_open && __NR_open > 0 -+ return (int) syscall(__NR_open, path, flags, mode); - #else - return open(path, flags, mode); - #endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch b/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted file mode 100644 index ba20a0b..0000000 --- a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d0122c077d2d8fd0fd29b463c501e7ddf9177ff3 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 24 Sep 2019 17:04:50 +0800 -Subject: [PATCH] unit-file.c: consider symlink on filesystems like NFS - -Some filesystems do not fully support readdir, according to the manual, -so we should also consider DT_UNKNOWN to correctly handle symlinks. - -Signed-off-by: Chen Qi - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/13637] ---- - src/shared/unit-file.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c -index 4a5f23e6c1..8373103000 100644 ---- a/src/shared/unit-file.c -+++ b/src/shared/unit-file.c -@@ -247,6 +247,7 @@ int unit_file_build_name_map( - _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; - const char *suffix, *dst = NULL; - bool valid_unit_name; -+ struct stat sb; - - valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY); - -@@ -279,7 +280,10 @@ int unit_file_build_name_map( - if (hashmap_contains(ids, de->d_name)) - continue; - -- if (de->d_type == DT_LNK) { -+ if (de->d_type == DT_LNK || -+ (de->d_type == DT_UNKNOWN && -+ lstat(filename, &sb) == 0 && -+ (sb.st_mode & S_IFMT) == S_IFLNK)) { - /* We don't explicitly check for alias loops here. unit_ids_map_get() which - * limits the number of hops should be used to access the map. */ - --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_243.2.bb b/meta/recipes-core/systemd/systemd_243.4.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.2.bb rename to meta/recipes-core/systemd/systemd_243.4.bb index e31fac8..5020165 100644 --- a/meta/recipes-core/systemd/systemd_243.2.bb +++ b/meta/recipes-core/systemd/systemd_243.4.bb @@ -22,8 +22,6 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0004-rules-whitelist-hd-devices.patch \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ - file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \ file://99-default.preset \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:46 +0000 Subject: [oe-commits] [openembedded-core] 15/35: texinfo/texinfo-dummy-native: Drop native path prefix In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.59C5C23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 38576ff63ef843f8808a98f64cd38a29c2d4af48 Author: Richard Purdie AuthorDate: Tue Jan 28 14:42:55 2020 +0000 texinfo/texinfo-dummy-native: Drop native path prefix Now we have recipe specific sysroots we don't need this native path prefix. It was breaking the crosssdk/cross-canadian cases and causing bugs, removing it is the simplest solution. Signed-off-by: Richard Purdie --- meta/classes/texinfo.bbclass | 4 +--- meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass index 6b0def0..72091c7 100644 --- a/meta/classes/texinfo.bbclass +++ b/meta/classes/texinfo.bbclass @@ -10,9 +10,7 @@ TEXDEP = "texinfo-native" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" -PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" -PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" # libtool-cross doesn't inherit cross TEXDEP_pn-libtool-cross = "texinfo-dummy-native" -PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" + diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 1254bc8..3e6dfb0 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -9,8 +9,6 @@ SRC_URI = "file://template.py file://COPYING" S = "${WORKDIR}" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - inherit native do_install_name() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:47 +0000 Subject: [oe-commits] [openembedded-core] 16/35: texinfo: Only build texinfo when api-docs enabled In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.6928E23291C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 01b2f2da6ba731dbd2e83ec91ad7656e12ebed5f Author: Richard Purdie AuthorDate: Tue Jan 28 14:45:27 2020 +0000 texinfo: Only build texinfo when api-docs enabled Also fix the crosssdk and cross-canadian cases. Signed-off-by: Richard Purdie --- meta/classes/texinfo.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass index 72091c7..f46baca 100644 --- a/meta/classes/texinfo.bbclass +++ b/meta/classes/texinfo.bbclass @@ -6,9 +6,11 @@ # Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and # makeinfo from SANITY_REQUIRED_UTILITIES. -TEXDEP = "texinfo-native" +TEXDEP = "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'texinfo-replacement-native', 'texinfo-dummy-native', d)}" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" +TEXDEP_class-crosssdk = "texinfo-dummy-native" +TEXDEP_class-cross-canadian = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" # libtool-cross doesn't inherit cross -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:50 +0000 Subject: [oe-commits] [openembedded-core] 19/35: texinfo-dummy-native: Allow to coexist with texinfo-native In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.96F4423291F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 515c561df449dd72b3be3ac614e87eb31cc49d5f Author: Richard Purdie AuthorDate: Wed Jan 29 11:38:07 2020 +0000 texinfo-dummy-native: Allow to coexist with texinfo-native Signed-off-by: Richard Purdie --- .../recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 3e6dfb0..ec04bfe 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -11,15 +11,19 @@ S = "${WORKDIR}" inherit native +# +# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir +# which is later in PATH than bindir where texinfo-native installs +# do_install_name() { - FILENAME="${D}${bindir}/$1" + FILENAME="${D}${base_bindir}/$1" # Using ln causes problems with rm_work cp -T "${S}/template.py" "$FILENAME" chmod +x $FILENAME } do_install() { - mkdir -p "${D}${bindir}" + mkdir -p "${D}${base_bindir}" for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \ txixml2texi texi2any install-info ginstall-info \ update-info-dir; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:51 +0000 Subject: [oe-commits] [openembedded-core] 20/35: gcc-cross-canadian: A missing space in an append caused an invalid option In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.A0BE0232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5e8ba7ba52b9aaab041b1287bbd2531e851e6c87 Author: Mark Hatle AuthorDate: Tue Jan 28 12:12:28 2020 -0600 gcc-cross-canadian: A missing space in an append caused an invalid option When configuring the cross-candian toolchain for a non-linux target system, the resulting gcc configuration included: --enable-initfini-array--without-headers these should have been two separate options. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index f14cbf7..4aac345 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -158,7 +158,7 @@ SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = "--without-headers --with-newlib" -EXTRA_OECONF_append_eabi = "--without-headers --with-newlib" +EXTRA_OECONF_append_elf = " --without-headers --with-newlib" +EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:55 +0000 Subject: [oe-commits] [openembedded-core] 24/35: kernel-devsrc: update to v5.4+ In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.C7DEC232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4f8cd237a7fbf919647e78f6aeb7b37bc3226306 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:10 2020 -0500 kernel-devsrc: update to v5.4+ To support on-target module building, we need to include syscall.tbl for ARM64 (just like we do for other architectures). We also copy .config with -a to ensure that we don't trigger extra processing and regen configs. Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index b6f2dbc..2fa4be6 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -78,7 +78,7 @@ do_install() { cp Module.markers $kerneldir/build fi - cp .config $kerneldir/build + cp -a .config $kerneldir/build # This scripts copy blow up QA, so for now, we require a more # complex 'make scripts' to restore these, versus copying them @@ -128,11 +128,12 @@ do_install() { # extra files, just in case cp -a --parents tools/objtool/* $kerneldir/build/ - cp -a --parents tools/lib/str_error_r.c $kerneldir/build/ - cp -a --parents tools/lib/string.c $kerneldir/build/ + cp -a --parents tools/lib/* $kerneldir/build/ cp -a --parents tools/lib/subcmd/* $kerneldir/build/ cp -a --parents tools/include/* $kerneldir/build/ + + cp -a --parents $(find tools/arch/${ARCH}/ -type f) $kerneldir/build/ fi if [ "${ARCH}" = "arm64" ]; then @@ -186,6 +187,7 @@ do_install() { # required for generate missing syscalls prepare phase cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build if [ "${ARCH}" = "x86" ]; then # files for 'make prepare' to succeed with kernel-devel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:56 +0000 Subject: [oe-commits] [openembedded-core] 25/35: devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.D1E4023292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4db3ec037626774e4c4c536eb998e8c83ffee22d Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:44 2019 +0000 devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 52efeae..bab644b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:57 +0000 Subject: [oe-commits] [openembedded-core] 26/35: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.DAF8923292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bbc29d7edc85ded270d3b1e44a5f4cb6d49e8685 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:51 2019 +0000 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ec77762..648298d 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -85,6 +85,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:52 +0000 Subject: [oe-commits] [openembedded-core] 21/35: systemd: Refresh the patches In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.A9BAD232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1d5bd33a0ff5b6de82c239d81af1f4774a8eeb6a Author: Khem Raj AuthorDate: Tue Jan 28 12:21:14 2020 -0800 systemd: Refresh the patches Fixes WARNING: systemd-1_243.4+gitAUTOINC+70e8c1978a-r0 do_patch: Fuzz detected: Applying patch 0001-do-not-disable-buffer-in-writing-files.patch ... QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...01-do-not-disable-buffer-in-writing-files.patch | 88 +++++++--------------- 1 file changed, 27 insertions(+), 61 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 2f4daf8..d6d68a0 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -38,11 +38,9 @@ Signed-off-by: Scott Murray src/vconsole/vconsole-setup.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -51,7 +49,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -105,11 +103,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,11 +121,9 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -138,8 +132,6 @@ index 123d00e13e..e7ea78f349 100644 if (r < 0) return r; -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -294,7 +294,7 @@ void disable_coredumps(void) { @@ -151,11 +143,9 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) if (!fn) return log_oom(); @@ -164,7 +154,7 @@ index aa9d811f2e..8c7f2dae7a 100644 } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) (void) delete_rule(rule); @@ -182,11 +172,9 @@ index aa9d811f2e..8c7f2dae7a 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -195,7 +183,7 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -204,11 +192,9 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) } #ifdef SMACK_RUN_LABEL @@ -230,8 +216,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,11 +227,9 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -256,11 +238,9 @@ index c4a7f2f3d3..bcac758284 100644 if (r < 0) { if (r == -ELOOP) return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { +@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd if (!t) return -ENOMEM; @@ -269,11 +249,9 @@ index 30b9a66334..cc1d577933 100644 } return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +260,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,7 +271,7 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -311,11 +287,9 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c +@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con log_debug("Setting '%s' to '%s'", p, value); @@ -324,11 +298,9 @@ index 93bdcf11bf..68cddb7a9f 100644 } int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +@@ -54,7 +54,7 @@ static int write_hibernate_location_info /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { @@ -337,7 +309,7 @@ index b9fe96635d..f168d7f890 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +@@ -98,14 +98,14 @@ static int write_hibernate_location_info offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); @@ -363,7 +335,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,24 +344,20 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 + bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { +@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -398,11 +366,9 @@ index cb5123042a..ea309a9e7f 100644 if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:48 +0000 Subject: [oe-commits] [openembedded-core] 17/35: bitbake.conf/sanity: Drop makeinfo as being required on buildhost In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.7A5C4232916@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 21e82c57604c0892a91078de3421b369c5c1f04f Author: Richard Purdie AuthorDate: Tue Jan 28 14:46:22 2020 +0000 bitbake.conf/sanity: Drop makeinfo as being required on buildhost This is a long standing 'odd' dependency which we've meant to resolve. We shouldn't need it and it introduces reproducability issues. We already have texinfo-dummy-native and texinfo-native which can provide it but the work to remove the hosttool was never completed. After cleaning up texinfo.bbclass, this can now be removed with minimal impact on build time. [YOCTO #13753] Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5c2f8f9..cca5cda 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -2,7 +2,7 @@ # Sanity check the users setup for common misconfigurations # -SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \ +SANITY_REQUIRED_UTILITIES ?= "patch diffstat git bzip2 tar \ gzip gawk chrpath wget cpio perl file which" def bblayers_conf_file(d): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b6aa9f3..259c50b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -487,7 +487,7 @@ HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ - head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ + head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:49 +0000 Subject: [oe-commits] [openembedded-core] 18/35: autoconf-archive: Add missing texinfo inherit In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.8987123291E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5b29f9685a05f81e5e8204da8f14f47e41acd701 Author: Richard Purdie AuthorDate: Tue Jan 28 19:15:51 2020 +0000 autoconf-archive: Add missing texinfo inherit Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb index 985a254..13593d7 100644 --- a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb @@ -9,7 +9,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "d46413c8b00a125b1529bae385bbec55" SRC_URI[sha256sum] = "17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f" -inherit autotools allarch +inherit autotools allarch texinfo PACKAGES = "${PN} ${PN}-doc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:03 +0000 Subject: [oe-commits] [openembedded-core] 32/35: icu: update SRC_URI In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.2562223291C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a37079356d31445cc4cf6b394ad66adef19e43c6 Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:54 +0000 Subject: [oe-commits] [openembedded-core] 23/35: kern-tools: update Kconfiglib to latest (for 5.4+ kernel) In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.BD27D232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 65a05f3fcacbf4161d4fc814c7f42f52ae886164 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:09 2020 -0500 kern-tools: update Kconfiglib to latest (for 5.4+ kernel) When a symbol doesn't make it into the final analysis is run using Kconfiglib to show dependencies. v5.4 has introduced Kconfig elements that Kconfiglib can't parse (hence we get no analysis). Updating the Kconfiglib snapshot solves our problem. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 8ca7193..a4c0b6f 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "bb6df0ef2365689cd3df6f76a8838cddae0d9343" +SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:04 +0000 Subject: [oe-commits] [openembedded-core] 33/35: uninative: Recognise ppc64 host ldso In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.2E645232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5b249286c4900b3202f0e49a2484f76f4fb7e9bf Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:02 +0000 Subject: [oe-commits] [openembedded-core] 31/35: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.1AB7A232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a563e61717f446b6a7adacc360adb2a435ab8fb Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:58 +0000 Subject: [oe-commits] [openembedded-core] 27/35: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.E3AA1232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b47dc076c5f48973891394e61af150c5275535b4 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:59 +0000 Subject: [oe-commits] [openembedded-core] 28/35: toaster.bbclass: Fix error when toaster is used to monitor a build In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.EE0E123292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9d75e75d83e30f2dfc22b4f5ba488c11f958c640 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:01 2020 -0600 toaster.bbclass: Fix error when toaster is used to monitor a build The error being corrected looks like: File: '/home/jenkins/workspace/OEBuild/build-32/oe-core/meta/classes/toaster.bbclass', lineno: 130, function: toaster_package_dumpdata 0126: lpkgdata = {} 0127: datadir = os.path.join(pkgdatadir, 'runtime') 0128: 0129: # scan and send data for each generated package *** 0130: for datafile in os.listdir(datadir): 0131: if not datafile.endswith('.packaged'): 0132: lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) 0133: # Fire an event containing the pkg data 0134: bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/jenkins/workspace/OEBuild/builds/build-32/tmp-glibc/work/core2-64-oe-linux/puzzles/2_0.0+gitAUTOINC+c6e0161dd4-r0/pkgdata/runtime' There must be a small window before the data is available, but while the monitoring is on-going. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 6a65ecb..9518ddf 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -126,11 +126,12 @@ def _toaster_dumpdata(pkgdatadir, d): datadir = os.path.join(pkgdatadir, 'runtime') # scan and send data for each generated package - for datafile in os.listdir(datadir): - if not datafile.endswith('.packaged'): - lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) - # Fire an event containing the pkg data - bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) + if os.path.exists(datadir): + for datafile in os.listdir(datadir): + if not datafile.endswith('.packaged'): + lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) + # Fire an event containing the pkg data + bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) python toaster_package_dumpdata() { _toaster_dumpdata(d.getVar('PKGDESTWORK'), d) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:45:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:45:53 +0000 Subject: [oe-commits] [openembedded-core] 22/35: linux-yocto: introduce 5.4 recipes In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174532.B2E78232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c5153e0f14bf4af479551efb54eafba425e1af8b Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:08 2020 -0500 linux-yocto: introduce 5.4 recipes This creates recipes for the v5.4/* branches of the linux-yocto reference kernel. preempt-rt, yaffs2, aufs5 and reference board specific patches are part of these branches. All major architectures: x86,x86-64,ARM, ARM64,ppc,mips and mips64 have been feature tested against this reference. 5.4 is a LTS release, and as such will receive -stable updates for the duration of upstream korg support. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 44 ++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 32 ++++++++++++++ meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb new file mode 100644 index 0000000..52f0e3b --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -0,0 +1,44 @@ +KBRANCH ?= "v5.4/standard/preempt-rt/base" + +require recipes-kernel/linux/linux-yocto.inc + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LINUX_VERSION ?= "5.4.15" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "5.4.15" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +LINUX_KERNEL_TYPE = "preempt-rt" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb new file mode 100644 index 0000000..a028b37 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -0,0 +1,32 @@ +KBRANCH ?= "v5.4/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" + +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "5.4.15" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +PV = "5.4.15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb new file mode 100644 index 0000000..9fbc47d --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -0,0 +1,54 @@ +KBRANCH ?= "v5.4/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" +KBRANCH_qemux86 ?= "v5.4/standard/base" +KBRANCH_qemux86-64 ?= "v5.4/standard/base" +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +# remap qemuarm to qemuarma15 for the 5.4 kernel +# KMACHINE_qemuarm ?= "qemuarma15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION ?= "5.4.15" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "5.4.15" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:05 +0000 Subject: [oe-commits] [openembedded-core] 34/35: glibc: Update to final 2.31 release In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.3760D232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 55f12003d11a33d000d707b964f093a88d1442fd Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:00 +0000 Subject: [oe-commits] [openembedded-core] 29/35: libgcc.inc: Fix an issue w/ a recursive symlink In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.08477232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fe0bf0d431bf316ea998dc464e330e80b0b0eb6a Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:02 2020 -0600 libgcc.inc: Fix an issue w/ a recursive symlink If the OS is not Linux, the code could end up generating a recursive symlink. This can happen because the same symlink can be created twice in a row. If this happenes, the second symlink becomes a link to itself within the directory pointed to by the original link. In order to prevent this, verify that the destination does not already exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index e008d14..6d48ec9 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -9,14 +9,18 @@ do_install_append_class-target () { "linux-musleabi") extra_target_os="linux-gnueabi";; *) extra_target_os="linux";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then case "${TARGET_OS}" in "linux-musleabi") extra_target_os="linux-musleabihf";; "linux-gnueabi") extra_target_os="linux-gnueabihf";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:06 +0000 Subject: [oe-commits] [openembedded-core] 35/35: busybox: sort the .config file used by ptests In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.426F923291F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e6b34ea4d03c3b657e4cb8ca355edf1a75080351 Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 1 17:46:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Feb 2020 17:46:01 +0000 Subject: [oe-commits] [openembedded-core] 30/35: classes/reproducible_build: Read SDE file later In-Reply-To: <158057913151.14293.9431067235111119846@git.openembedded.org> References: <158057913151.14293.9431067235111119846@git.openembedded.org> Message-ID: <20200201174533.112B3232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 976500517c32dd72e36a620702802f1e7d13cf70 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 43 ++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..41950f1 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,35 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + if d.getVar('BUILD_REPRODUCIBLE_BINARIES') != '1': + return '' + + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 01:41:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 01:41:59 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: python3-pexpect: upgrade 4.7.0 -> 4.8.0 Message-ID: <158060771934.14321.12765412871281729500@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 1f64375 python3-pexpect: upgrade 4.7.0 -> 4.8.0 1f64375 is described below commit 1f6437584f24b2d94d5730d6284d2c0aeb22a0e3 Author: Trevor Gamblin AuthorDate: Sat Feb 1 15:20:02 2020 -0500 python3-pexpect: upgrade 4.7.0 -> 4.8.0 Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pexpect.inc | 4 ++-- .../python/{python3-pexpect_4.7.0.bb => python3-pexpect_4.8.0.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pexpect.inc b/meta-python/recipes-devtools/python/python-pexpect.inc index 6d78eb9..f02aa99 100644 --- a/meta-python/recipes-devtools/python/python-pexpect.inc +++ b/meta-python/recipes-devtools/python/python-pexpect.inc @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c7a725251880af8c6a148181665385b" -SRC_URI[md5sum] = "ed003242cbf308aee1b1eaecdef59e43" -SRC_URI[sha256sum] = "9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb" +SRC_URI[md5sum] = "153eb25184249d6a85fde9acf4804085" +SRC_URI[sha256sum] = "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect" diff --git a/meta-python/recipes-devtools/python/python3-pexpect_4.7.0.bb b/meta-python/recipes-devtools/python/python3-pexpect_4.8.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pexpect_4.7.0.bb rename to meta-python/recipes-devtools/python/python3-pexpect_4.8.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 07:22:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 07:22:45 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: gpsd: Only require and build for Python3 Message-ID: <158062816530.27257.12295700139015480752@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new b42f4a2 gpsd: Only require and build for Python3 b42f4a2 is described below commit b42f4a24fbd55ee2e8b3b2a57edc9bc786262cae Author: Alistair Francis AuthorDate: Sat Feb 1 18:17:38 2020 -0800 gpsd: Only require and build for Python3 Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index dbbc714..f74ebda 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -2,7 +2,7 @@ SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" -DEPENDS = "dbus ncurses python python3 pps-tools" +DEPENDS = "dbus ncurses python3 pps-tools" PROVIDES = "virtual/gpsd" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ @@ -84,7 +84,7 @@ do_install_append() { install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket } -PACKAGES =+ "libgps libgpsd python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" +PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" RPROVIDES_${PN}-dbg += "python-pygps-dbg" @@ -114,17 +114,17 @@ FILES_gpsd-gpsctl = "${bindir}/gpsctl" SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" # Python files are required for gps/fake, required for gpsfake. FILES_gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ +RDEPENDS_gps-utils = "python3-pygps" + +SUMMARY_python3-pygps = "Python bindings to gpsd" +FILES_python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" +RDEPENDS_python3-pygps = " \ + python3-core \ + python3-io \ + python3-threading \ + python3-terminal \ gpsd \ - python-json" + python3-json" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:22 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (cd9006b -> 0de55be) Message-ID: <158064002210.32294.5893279186674473348@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from cd9006b MEMORIAM: Add recognition for contributors no longer with us new 72af20f bsp-hw.json: remove mpc8315e-rdb manual tests new 0de55be parselogs: remove mpc8315e-rdb from errors The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/manual/bsp-hw.json | 52 -------------------------------- meta/lib/oeqa/runtime/cases/parselogs.py | 5 --- 2 files changed, 57 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:24 +0000 Subject: [oe-commits] [openembedded-core] 02/02: parselogs: remove mpc8315e-rdb from errors In-Reply-To: <158064002210.32294.5893279186674473348@git.openembedded.org> References: <158064002210.32294.5893279186674473348@git.openembedded.org> Message-ID: <20200202104022.54FA823292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0de55be071efff60944c89582ae0e736f3bdc828 Author: Armin Kuster AuthorDate: Thu Jan 30 16:28:01 2020 -0800 parselogs: remove mpc8315e-rdb from errors Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/parselogs.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index b7c7b30..9dafb89 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -185,11 +185,6 @@ ignore_errors = { 'Failed to make EGL context current', 'glamor initialization failed', ] + common_errors, - 'mpc8315e-rdb' : [ - 'of_irq_parse_pci: failed with', - 'Fatal server error:', - 'Server terminated with error', - ] + common_errors, } log_locations = ["/var/log/","/var/log/dmesg", "/tmp/dmesg_output.log"] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:23 +0000 Subject: [oe-commits] [openembedded-core] 01/02: bsp-hw.json: remove mpc8315e-rdb manual tests In-Reply-To: <158064002210.32294.5893279186674473348@git.openembedded.org> References: <158064002210.32294.5893279186674473348@git.openembedded.org> Message-ID: <20200202104022.47E8523292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 72af20f445dfd8ac0b472f80ed84e1b1c556e8ef Author: Armin Kuster AuthorDate: Thu Jan 30 16:28:00 2020 -0800 bsp-hw.json: remove mpc8315e-rdb manual tests Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/lib/oeqa/manual/bsp-hw.json | 52 ---------------------------------------- 1 file changed, 52 deletions(-) diff --git a/meta/lib/oeqa/manual/bsp-hw.json b/meta/lib/oeqa/manual/bsp-hw.json index 5c5b9b5..73cbaaa 100644 --- a/meta/lib/oeqa/manual/bsp-hw.json +++ b/meta/lib/oeqa/manual/bsp-hw.json @@ -917,28 +917,6 @@ }, { "test": { - "@alias": "bsps-hw.bsps-hw.Check_if_target_can_support_EEPROM", - "author": [ - { - "email": "yi.zhao at windriver.com", - "name": "yi.zhao at windriver.com" - } - ], - "execution": { - "1": { - "action": "Check eeprom device exist in /sys/bus/i2c/devices/ ", - "expected_results": "Hexdump can read data from eeprom.\n" - }, - "2": { - "action": "Run \"hexdump eeprom\" commandroot at mpc8315e-rdb:/sys/bus/i2c/devices/1-0051> hexdump eeprom0000000 9210 0b02 0211 0009 0b52 0108 0c00 3c000000010 6978 6930 6911 208c 7003 3c3c 00f0 8381\u2026\n", - "expected_results": "" - } - }, - "summary": "Check_if_target_can_support_EEPROM" - } - }, - { - "test": { "@alias": "bsps-hw.bsps-hw.System_can_boot_up_via_NFS", "author": [ { @@ -967,34 +945,4 @@ "summary": "System_can_boot_up_via_NFS" } }, - { - "test": { - "@alias": "bsps-hw.bsps-hw.Boot_from_JFFS2_image", - "author": [ - { - "email": "yi.zhao at windriver.com", - "name": "yi.zhao at windriver.com" - } - ], - "execution": { - "1": { - "action": "First boot the board with NFS root. ", - "expected_results": "The system can boot up without problem\n" - }, - "2": { - "action": "Install mtd-utils package. Erase the MTD partition which will be used as root: $ flash_eraseall /dev/mtd3 ", - "expected_results": "" - }, - "3": { - "action": "Copy the JFFS2 image to the MTD partition: $ flashcp core-image-minimal-mpc8315e-rdb.jffs2 /dev/mtd3 ", - "expected_results": "" - }, - "4": { - "action": "Then reboot the board and set up the environment in U-Boot: => setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,115200 ", - "expected_results": "" - } - }, - "summary": "Boot_from_JFFS2_image" - } - } ] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:31 +0000 Subject: [oe-commits] [openembedded-core] 01/23: HACK: Enable saving of packages In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.63D9E23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ea4a2ab3e4b76e77c57372584635d3156ab0dc9f Author: Joshua Watt AuthorDate: Thu Oct 24 13:09:33 2019 -0500 HACK: Enable saving of packages Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9c715ef..9d1bcf3 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -79,7 +79,7 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = False + save_results = True # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:30 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (e6b34ea -> f9f3eca) Message-ID: <158064003021.32586.9882975648043576683@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard e6b34ea busybox: sort the .config file used by ptests discard 55f1200 glibc: Update to final 2.31 release discard 5b24928 uninative: Recognise ppc64 host ldso discard a370793 icu: update SRC_URI discard 7a563e6 glibc: merge libc-common.bbclass into glibc.bb discard 9765005 classes/reproducible_build: Read SDE file later discard fe0bf0d libgcc.inc: Fix an issue w/ a recursive symlink discard 9d75e75 toaster.bbclass: Fix error when toaster is used to monitor a build discard b47dc07 sstatesig: Log timestamps for hashequiv in reprodubile builds discard bbc29d7 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig discard 4db3ec0 devtool/standard.py: Allow recipe to disable menuconfig logic discard 4f8cd23 kernel-devsrc: update to v5.4+ discard 65a05f3 kern-tools: update Kconfiglib to latest (for 5.4+ kernel) discard c5153e0 linux-yocto: introduce 5.4 recipes discard 1d5bd33 systemd: Refresh the patches discard 5e8ba7b gcc-cross-canadian: A missing space in an append caused an invalid option discard 515c561 texinfo-dummy-native: Allow to coexist with texinfo-native discard 5b29f96 autoconf-archive: Add missing texinfo inherit discard 21e82c5 bitbake.conf/sanity: Drop makeinfo as being required on buildhost discard 01b2f2d texinfo: Only build texinfo when api-docs enabled discard 38576ff texinfo/texinfo-dummy-native: Drop native path prefix discard af0f2e6 glibc-package.inc: Remove warnings about unpacked directories discard f96b359 systemd: Upgrade 243.2 -> 243.4-latest discard 30f7454 iptables: upgrade 1.8.3 -> 1.8.4 discard ff9f720 iw: upgrade 5.3 -> 5.4 discard feea0bd iproute2: upgrade 5.3.0 -> 5.5.0 discard 5f5410e musl: Update to latest discard 7885ce5 valgrind: Fix ptest builds on musl discard 1e8dee2 valgrind: fix the remaining ptest failures discard 5ab5fec HACK: signing: Add extra test debug discard 54f81ec HACK: Enable saving of packages discard d6cc9be oeqa: reproducible: Do not strip packages discard 48924a0 glew/curl: specify exclusive package configs discard 9975572 base.bbclass: extend PACKAGECONFIG for conflict package configs discard dfb6bdf oescripts.py: use unittest.SkipUnless for class skip new ea4a2ab HACK: Enable saving of packages new cadc565 valgrind: fix the remaining ptest failures new 67147e8 valgrind: Fix ptest builds on musl new ce8115b musl: Update to latest new 3a6ec7c iproute2: upgrade 5.3.0 -> 5.5.0 new 1a3eb06 iw: upgrade 5.3 -> 5.4 new efd610c iptables: upgrade 1.8.3 -> 1.8.4 new e26d00f systemd: Upgrade 243.2 -> 243.4-latest new 1f0fdad glibc-package.inc: Remove warnings about unpacked directories new af19339 autoconf-archive: Add missing texinfo inherit new 08edca6 texinfo-dummy-native: Allow to coexist with texinfo-native new c3893f0 gcc-cross-canadian: A missing space in an append caused an invalid option new 17d2606 systemd: Refresh the patches new f1cc7db devtool/standard.py: Allow recipe to disable menuconfig logic new 41c37cb u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig new dc6eb42 toaster.bbclass: Fix error when toaster is used to monitor a build new 38cb787 libgcc.inc: Fix an issue w/ a recursive symlink new 2242695 classes/reproducible_build: Read SDE file later new 257b0de glibc: merge libc-common.bbclass into glibc.bb new c93c34d icu: update SRC_URI new 670760d uninative: Recognise ppc64 host ldso new 70d1a21 glibc: Update to final 2.31 release new f9f3eca busybox: sort the .config file used by ptests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e6b34ea) \ N -- N -- N refs/heads/master-next (f9f3eca) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 23 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/base.bbclass | 20 ++------ meta/classes/sanity.bbclass | 2 +- meta/classes/texinfo.bbclass | 8 ++-- meta/conf/bitbake.conf | 2 +- meta/lib/oe/sstatesig.py | 4 -- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +-- meta/lib/oeqa/selftest/cases/reproducible.py | 1 - meta/lib/oeqa/selftest/cases/signing.py | 8 +--- .../texinfo-dummy-native/texinfo-dummy-native.bb | 2 + meta/recipes-graphics/glew/glew_2.1.0.bb | 4 +- .../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 ++-- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 44 ------------------ meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 32 ------------- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 ---------------------- meta/recipes-support/curl/curl_7.68.0.bb | 4 +- 16 files changed, 24 insertions(+), 178 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:32 +0000 Subject: [oe-commits] [openembedded-core] 02/23: valgrind: fix the remaining ptest failures In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.7107C23292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cadc5653dd75aebc4ec4454ceeee7588ff3f528e Author: Alexander Kanavin AuthorDate: Mon Jan 27 15:19:07 2020 +0100 valgrind: fix the remaining ptest failures Particularly, one test is disabled as it is failing everywhere, two patches that actually cause failures are dropped and some binaries are prevented from being stripped where that is expected. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...s-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ++++++++++++++++++++++ ...-valgrind-adjust-std_list-expected-output.patch | 32 -------------------- ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 -------------------- meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 23 +++++++++++++-- 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch new file mode 100644 index 0000000..d641998 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch @@ -0,0 +1,34 @@ +From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 24 Jan 2020 17:55:39 +0100 +Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths + +In oe-core, /tmp is linked to /var/volatile/tmp and +valgrind output changes accordingly + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + none/tests/fdleak_cmsg.stderr.exp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp +index 6e5a797b9..0ede1ab18 100644 +--- a/none/tests/fdleak_cmsg.stderr.exp ++++ b/none/tests/fdleak_cmsg.stderr.exp +@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null + + + FILE DESCRIPTORS: 6 open at exit. +-Open file descriptor ...: /tmp/data2 ++Open file descriptor ...: ... + ... + +-Open file descriptor ...: /tmp/data1 ++Open file descriptor ...: ... + ... + + Open AF_UNIX socket ...: +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch b/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch deleted file mode 100644 index a82972e..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1e9265b03cf51d09c028d657fe826d7156a783 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 13 May 2019 17:26:26 -0400 -Subject: [PATCH 2/2] valgrind: adjust std_list expected output - -The run-ptest script uses a custom --yocto-ptest option -to change the summary statistics that valgrind issues -to a format that matches what ptest-runner expects. - -Only this std_list test which checks that strcpy() works -properly on Ubuntu-12.04 and later is affected by this change. -It's normal output when called with --yocto-ptest is a blank -line so adjust the expected output. - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Randy MacLeod ---- - drd/tests/std_list.stderr.exp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drd/tests/std_list.stderr.exp b/drd/tests/std_list.stderr.exp -index d18786f80..8b1378917 100644 ---- a/drd/tests/std_list.stderr.exp -+++ b/drd/tests/std_list.stderr.exp -@@ -1,3 +1 @@ - -- --ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch deleted file mode 100644 index 05886c7..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 01:20:32 -0700 -Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding - offset to it - -Fixes -error: invalid use of undefined type 'struct __pthread' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - drd/tests/pth_detached3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef1..35d43a6 100644 ---- a/drd/tests/pth_detached3.c -+++ b/drd/tests/pth_detached3.c -@@ -21,7 +21,7 @@ int main(int argc, char** argv) - pthread_detach(thread); - - /* Invoke pthread_detach() with an invalid thread ID. */ -- pthread_detach(thread + 8); -+ pthread_detach((pthread_t*)(&thread + 8)); - - fprintf(stderr, "Finished.\n"); - --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834c..0f86aa4 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0003-correct-include-directive-path-for-config.h.patch \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ - file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ @@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ - file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ + file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" @@ -205,4 +204,24 @@ do_install_ptest() { # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest + + # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) + # https://bugs.kde.org/show_bug.cgi?id=402833 + rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest + + # As the binary isn't stripped or debug-splitted, the source file isn't fetched + # via dwarfsrcfiles either, so it needs to be installed manually. + mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ + install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ } + +# avoid stripping some generated binaries otherwise some of the tests will fail +# run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/none/tests/tls \ + ${PKGD}${PTEST_PATH}/none/tests/tls.so \ + ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ + ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ + ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ + ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:34 +0000 Subject: [oe-commits] [openembedded-core] 04/23: musl: Update to latest In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.8A16D232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ce8115bab35d94250178307cd338ed3812a0f1a5 Author: Khem Raj AuthorDate: Mon Jan 27 20:08:49 2020 -0800 musl: Update to latest Changelog [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=91e662d1d941215eb024787db5e910dbfb5b169f..83350eb17b9cb355e3f08b0340c4f1e8c437fac9 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 1676e28..6298720 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "91e662d1d941215eb024787db5e910dbfb5b169f" +SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:33 +0000 Subject: [oe-commits] [openembedded-core] 03/23: valgrind: Fix ptest builds on musl In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.7D99123292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 67147e8f8166b3282a95ad3d3afe2bfe768a58d8 Author: Khem Raj AuthorDate: Mon Jan 27 19:58:50 2020 -0800 valgrind: Fix ptest builds on musl Signed-off-by: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 44 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch new file mode 100644 index 0000000..44d707a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -0,0 +1,44 @@ +From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 27 Jan 2020 17:17:19 -0800 +Subject: [PATCH] tests: Make pthread_detatch call portable across platforms + +pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type +this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable +across glibc and musl + +Fixes +| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' +| 24 | pthread_detach(thread + 8); +| | ^ + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +Signed-off-by: Khem Raj +--- + drd/tests/pth_detached3.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c +index c02eef11a..efeb15b72 100644 +--- a/drd/tests/pth_detached3.c ++++ b/drd/tests/pth_detached3.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + static void* thread_func(void* arg) + { +@@ -21,7 +22,7 @@ int main(int argc, char** argv) + pthread_detach(thread); + + /* Invoke pthread_detach() with an invalid thread ID. */ +- pthread_detach(thread + 8); ++ pthread_detach((pthread_t)((uintptr_t)thread + 8)); + + fprintf(stderr, "Finished.\n"); + +-- +2.25.0 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 0f86aa4..1475ff8 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ + file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:35 +0000 Subject: [oe-commits] [openembedded-core] 05/23: iproute2: upgrade 5.3.0 -> 5.5.0 In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.951B3232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a6ec7cd669ab7cdf706c029aa110127f10ed547 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:25 2020 +0100 iproute2: upgrade 5.3.0 -> 5.5.0 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iproute2/{iproute2_5.3.0.bb => iproute2_5.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb similarity index 66% rename from meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb index 75772d4..ad0ab13 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb @@ -4,8 +4,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[md5sum] = "227404413c8d6db649d6188ead1e5a6e" -SRC_URI[sha256sum] = "cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f" +SRC_URI[md5sum] = "ee8e2cdb416d4a8ef39525d39ab7c2d0" +SRC_URI[sha256sum] = "bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b" # CFLAGS are computed in Makefile and reference CCOPTS # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:37 +0000 Subject: [oe-commits] [openembedded-core] 07/23: iptables: upgrade 1.8.3 -> 1.8.4 In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.B0F46232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit efd610c582523a68e3d05133e6d71b455f726c48 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:27 2020 +0100 iptables: upgrade 1.8.3 -> 1.8.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iptables/{iptables_1.8.3.bb => iptables_1.8.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb b/meta/recipes-extended/iptables/iptables_1.8.4.bb similarity index 96% rename from meta/recipes-extended/iptables/iptables_1.8.3.bb rename to meta/recipes-extended/iptables/iptables_1.8.4.bb index 96d195d..cf1388c 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.4.bb @@ -16,8 +16,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513" -SRC_URI[sha256sum] = "a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" +SRC_URI[md5sum] = "9b201107957fbf62709c3d8226239b0d" +SRC_URI[sha256sum] = "993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:39 +0000 Subject: [oe-commits] [openembedded-core] 09/23: glibc-package.inc: Remove warnings about unpacked directories In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.CD53023293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f0fdada1dae272fb4f7c4327054a14ccf8d6de5 Author: Richard Purdie AuthorDate: Tue Jan 28 14:37:45 2020 +0000 glibc-package.inc: Remove warnings about unpacked directories If documemtation generation is disabled, the recipe throws warnings about unpackaged files. Avoid this. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index ede9e9b..d2667f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -213,6 +213,8 @@ stash_locale_cleanup () { rm -rf $cleanupdir${libdir}/gconv rm -rf $cleanupdir${localedir} rm -rf $cleanupdir${datadir}/locale + rmdir --ignore-fail-on-non-empty $cleanupdir${datadir} + if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then if [ -d "$cleanupdir${exec_prefix}/lib" ]; then if [ -z "${ARCH_DYNAMIC_LOADER}" -o \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:36 +0000 Subject: [oe-commits] [openembedded-core] 06/23: iw: upgrade 5.3 -> 5.4 In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.A2966232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1a3eb06b9fe771ad2263dcdf6cb9c964e20eb3f1 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:26 2020 +0100 iw: upgrade 5.3 -> 5.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iw/iw/separate-objdir.patch | 24 ++++++++++++++-------- .../iw/{iw_5.3.bb => iw_5.4.bb} | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index eb01a5a..179fd90 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch @@ -1,3 +1,6 @@ +From ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae +Date: Mon, 27 Jan 2020 22:48:03 +0100 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -11,12 +14,12 @@ Signed-off-by: Maxin B. John 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 33aaf6a..9030796 100644 +index 90f2251..714cdb9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ MAKEFLAGS += --no-print-directory - + +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) @@ -24,19 +27,24 @@ index 33aaf6a..9030796 100644 PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -@@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) +@@ -92,7 +96,7 @@ all: $(ALL) version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ - $(Q)./version.sh $@ + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ - - %.o: %.c iw.h nl80211.h + + nl80211-commands.inc: nl80211.h + @$(NQ) ' GEN ' $@ +@@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h + + %.o: %.c iw.h nl80211.h nl80211-commands.inc @$(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - + ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) --- -2.20.1 (Apple Git-117) +-- +2.23.0 + diff --git a/meta/recipes-connectivity/iw/iw_5.3.bb b/meta/recipes-connectivity/iw/iw_5.4.bb similarity index 85% rename from meta/recipes-connectivity/iw/iw_5.3.bb rename to meta/recipes-connectivity/iw/iw_5.4.bb index f7f13f5..9f58e49 100644 --- a/meta/recipes-connectivity/iw/iw_5.3.bb +++ b/meta/recipes-connectivity/iw/iw_5.4.bb @@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://separate-objdir.patch \ " -SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31" -SRC_URI[sha256sum] = "175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a" +SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6" +SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c" inherit pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:38 +0000 Subject: [oe-commits] [openembedded-core] 08/23: systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.C0E56232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e26d00f8579e5aaa1e5a45e9222b8dcb6d504a4c Author: Alex Kiernan AuthorDate: Mon Jan 27 23:13:06 2020 +0000 systemd: Upgrade 243.2 -> 243.4-latest Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Commits from v243-stable: 70e8c1978a9a seccomp: real syscall numbers are >= 0 a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change b59d88cc62a4 man: fix typo in net-naming-scheme man page c5e5ac095821 man: fix typos (#14304) 9a2f26564d5a ipv4ll: do not reset conflict counter on restart bc9e1ebfdd3b Fix typo (duplicate "or") c6cb71b7e741 network: if /sys is rw, then udev should be around 67dcdfd95629 nspawn: do not fail if udev is not running a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative b1cf452ff5f6 systemctl: enhance message about kexec missing kernel 07a0e5b42523 man: use mkswap@ instead of makeswap@ 57dc017c6bac journald: don't ask for the machine ID if we don't need it ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field 471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61a0 man: drop reference to machined, add one for journald instead fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b2378 shared/ask-password-api: modify keyctl break value a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed 4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit() d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be* a67a3ae04b89 man: document all pager variables for systemctl and systemd 3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug 733e7f19d3cf travis: add missing closing quote sign 0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter= aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules b9a619bb6738 udevadm: ignore EROFS and return earlier 1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree 7fa7080248aa umount: be happy if /proc/swaps doesn't exist 71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools b50ca0152681 core: do not propagate polkit error to caller 99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list 37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault 3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC 2139d58652bb bpf: fix off-by-one in class whitelisting cb7693595db9 bpf: fix device type filter 56e1ba304b00 core: constify bpf program arrays b06b7ace92c1 run: propagate return code/status from the child 5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection 8d88a2ecd7ce udev: fix error code in the log message c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node f218b65b3246 udev: do not append newline when write attributes ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone 8b888d236007 seccomp: add all *time64 syscalls 53d8feeb2334 libblkid: open device in nonblock mode. b9478046b03d man: describe ordering in case of Conflicts= fa3e5bd2bbb4 man: put description of Wants= above Requires= bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page 9c12127e3d2e man: save pull-raw example file without underscores 4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page 03cc374fca74 shared/format-table: disable ellipsization when piped 0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too fc0451bc0a3f allow an empty DefaultInstance= in configuration files 587266c24aae man/systemd.net-naming-scheme: fix typo e0e63f0f9bb9 nspawn: respect quiet on capabilities warning 37e50c05b564 nspawn: mangle slice name 4fefc493541e mkosi: Find hostname command on Arch Linux c430e8affba4 Fix mkosi on Arch Linux 1765b8d803dd Update to Fedora31 0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2 24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available 14e377ef3519 sd-boot: Only disable optimization on debug builds a39008ddecb9 meson: correct man page deps 4c1dcc06fa30 sd-event: don't invalidate source type on disconnect fb89ee34cedc analyze: fix minor memleak a449299bc087 analyze: sort list of unknown syscalls kernel implements 51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists 819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq d2b4d7ee17de network-generator: Add missing help for --root f1b18c206208 modules-load: do not fail service if modules are not present 606de6626714 pid1: order .automount units after local-fs-pre.target 1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command 00af6c447f25 resolved: set stream type during DnsStream creation 66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function 34fa67bbe732 machine-id-setup: avoid unexpected aborting 24c99fa2ef3d test-socket-util: avoid writing past the defined buffer ce82233f99b3 test: drop duplicated 's' 75a0e7209114 nspawn: fix handling of --console=help f41a282875fc Revert "sysusers: properly mark generated accounts as locked" fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users 6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS 961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure 19590e289ace ceph is a network filesystem 339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func 47d0e23d26af udev: fix memleak caused by wrong cleanup function a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.* cb1d892f1780 parse_hwdb: process files in order ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range 25bb377a73e7 cgroup: fix typo in BPF firewall support warning message 6d97aca0d503 fix build with compilers with default stack-protector enabled fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p 20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV 6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment 9d8e889810b5 nspawn: consistenly fail if parsing the environment fails 40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min ea248e53bf76 cgroup: Check ancestor memory min for unified memory config de1d25a506db cgroup: docs: memory.high doc fixups 2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem 5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly 8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments a0577353f191 man: Add a missing space in machinectl(1) 693e98398869 log: Add missing "%" in "%m" log format strings ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 2 - 6 files changed, 18 insertions(+), 212 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.2.bb b/meta/recipes-core/systemd/systemd-boot_243.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.2.bb rename to meta/recipes-core/systemd/systemd-boot_243.4.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 18f17d2..2fca6dc 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" +SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +PV = "243.4+git${SRCPV}" + S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff..ea37680 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/units/meson.build b/units/meson.build -index e1ee9f86c3..6bb7771b36 100644 ---- a/units/meson.build -+++ b/units/meson.build +Index: systemd-stable/units/meson.build +=================================================================== +--- systemd-stable.orig/units/meson.build ++++ systemd-stable/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 30a6bc9918..4231f3b70f 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount +Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount ++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index e940c7c9ad..6be7f5cc9b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +Index: systemd-stable/units/systemd-binfmt.service.in +=================================================================== +--- systemd-stable.orig/units/systemd-binfmt.service.in ++++ systemd-stable/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount + After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target - ConditionPathIsReadWrite=/proc/sys/ -@@ -28,3 +29,6 @@ Type=oneshot +@@ -29,3 +30,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt TimeoutSec=90s diff --git a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch b/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted file mode 100644 index f359d28..0000000 --- a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Nov 2019 17:51:30 +0100 -Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's - __NR_xyz namespace invasion - -A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the -same conditioning for all cases of our __NR_xyz use. - -Fixes: #14031 - -Reference: -https://github.com/systemd/systemd/pull/14032/commits/62f66fdbcc33580467c01b1f149474b6c973df5a - -Upstream-Status: Backport - -Signed-off-by: Ming Liu ---- - src/basic/missing_syscall.h | 10 +++++----- - src/test/test-seccomp.c | 19 ++++++++++--------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 6d9b125..1255d8b 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c - - #if !HAVE_KCMP - static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { --# ifdef __NR_kcmp -+# if defined __NR_kcmp && __NR_kcmp > 0 - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else - errno = ENOSYS; -@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i - - #if !HAVE_KEYCTL - static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { --# ifdef __NR_keyctl -+# if defined __NR_keyctl && __NR_keyctl > 0 - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; -@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg - } - - static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { --# ifdef __NR_add_key -+# if defined __NR_add_key && __NR_add_key > 0 - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; -@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip - } - - static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { --# ifdef __NR_request_key -+# if defined __NR_request_key && __NR_request_key > 0 - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; -@@ -496,7 +496,7 @@ enum { - static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, - unsigned long maxnode) { - long i; --# ifdef __NR_set_mempolicy -+# if defined __NR_set_mempolicy && __NR_set_mempolicy > 0 - i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); - # else - errno = ENOSYS; -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 018c20f..c669204 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -28,7 +28,8 @@ - #include "tmpfile-util.h" - #include "virt.h" - --#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) -+/* __NR_socket may be invalid due to libseccomp */ -+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) - /* On these archs, socket() is implemented via the socketcall() syscall multiplexer, - * and we can't restrict it hence via seccomp. */ - # define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1 -@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) { - assert_se(pid >= 0); - - if (pid == 0) { --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); - #endif - - assert_se(seccomp_protect_sysctl() >= 0); - --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0); - assert_se(errno == EPERM); - #endif -@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(poll(NULL, 0, 0) == 0); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0); -@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); -@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) { - * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On - * other architectures, let's just fall back to the glibc call. */ - --#ifdef SYS_open -- return (int) syscall(SYS_open, path, flags, mode); -+#if defined __NR_open && __NR_open > 0 -+ return (int) syscall(__NR_open, path, flags, mode); - #else - return open(path, flags, mode); - #endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch b/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted file mode 100644 index ba20a0b..0000000 --- a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d0122c077d2d8fd0fd29b463c501e7ddf9177ff3 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 24 Sep 2019 17:04:50 +0800 -Subject: [PATCH] unit-file.c: consider symlink on filesystems like NFS - -Some filesystems do not fully support readdir, according to the manual, -so we should also consider DT_UNKNOWN to correctly handle symlinks. - -Signed-off-by: Chen Qi - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/13637] ---- - src/shared/unit-file.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c -index 4a5f23e6c1..8373103000 100644 ---- a/src/shared/unit-file.c -+++ b/src/shared/unit-file.c -@@ -247,6 +247,7 @@ int unit_file_build_name_map( - _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; - const char *suffix, *dst = NULL; - bool valid_unit_name; -+ struct stat sb; - - valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY); - -@@ -279,7 +280,10 @@ int unit_file_build_name_map( - if (hashmap_contains(ids, de->d_name)) - continue; - -- if (de->d_type == DT_LNK) { -+ if (de->d_type == DT_LNK || -+ (de->d_type == DT_UNKNOWN && -+ lstat(filename, &sb) == 0 && -+ (sb.st_mode & S_IFMT) == S_IFLNK)) { - /* We don't explicitly check for alias loops here. unit_ids_map_get() which - * limits the number of hops should be used to access the map. */ - --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_243.2.bb b/meta/recipes-core/systemd/systemd_243.4.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.2.bb rename to meta/recipes-core/systemd/systemd_243.4.bb index e31fac8..5020165 100644 --- a/meta/recipes-core/systemd/systemd_243.2.bb +++ b/meta/recipes-core/systemd/systemd_243.4.bb @@ -22,8 +22,6 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0004-rules-whitelist-hd-devices.patch \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ - file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \ file://99-default.preset \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:40 +0000 Subject: [oe-commits] [openembedded-core] 10/23: autoconf-archive: Add missing texinfo inherit In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.DAB6C23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af19339484a1ee1618439d2bf5272eb0d307b566 Author: Richard Purdie AuthorDate: Tue Jan 28 19:15:51 2020 +0000 autoconf-archive: Add missing texinfo inherit Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb index 985a254..13593d7 100644 --- a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb @@ -9,7 +9,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "d46413c8b00a125b1529bae385bbec55" SRC_URI[sha256sum] = "17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f" -inherit autotools allarch +inherit autotools allarch texinfo PACKAGES = "${PN} ${PN}-doc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:41 +0000 Subject: [oe-commits] [openembedded-core] 11/23: texinfo-dummy-native: Allow to coexist with texinfo-native In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104030.EB712232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 08edca69b641827d35e1280cb0573a3890e24b12 Author: Richard Purdie AuthorDate: Wed Jan 29 11:38:07 2020 +0000 texinfo-dummy-native: Allow to coexist with texinfo-native Signed-off-by: Richard Purdie --- .../recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 1254bc8..3732d4f 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -13,15 +13,19 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" inherit native +# +# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir +# which is later in PATH than bindir where texinfo-native installs +# do_install_name() { - FILENAME="${D}${bindir}/$1" + FILENAME="${D}${base_bindir}/$1" # Using ln causes problems with rm_work cp -T "${S}/template.py" "$FILENAME" chmod +x $FILENAME } do_install() { - mkdir -p "${D}${bindir}" + mkdir -p "${D}${base_bindir}" for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \ txixml2texi texi2any install-info ginstall-info \ update-info-dir; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:42 +0000 Subject: [oe-commits] [openembedded-core] 12/23: gcc-cross-canadian: A missing space in an append caused an invalid option In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.063CB23292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c3893f0ffcc25502797b8a39c216300c8ad13d99 Author: Mark Hatle AuthorDate: Tue Jan 28 12:12:28 2020 -0600 gcc-cross-canadian: A missing space in an append caused an invalid option When configuring the cross-candian toolchain for a non-linux target system, the resulting gcc configuration included: --enable-initfini-array--without-headers these should have been two separate options. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index f14cbf7..4aac345 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -158,7 +158,7 @@ SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = "--without-headers --with-newlib" -EXTRA_OECONF_append_eabi = "--without-headers --with-newlib" +EXTRA_OECONF_append_elf = " --without-headers --with-newlib" +EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:45 +0000 Subject: [oe-commits] [openembedded-core] 15/23: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.3187623293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41c37cb0f35ef6bc95df43d3401f11ebf177dd19 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:51 2019 +0000 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ec77762..648298d 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -85,6 +85,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:44 +0000 Subject: [oe-commits] [openembedded-core] 14/23: devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.2471C23292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f1cc7db01d3e4c6c15544074e3d070fb423b7789 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:44 2019 +0000 devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 52efeae..bab644b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:47 +0000 Subject: [oe-commits] [openembedded-core] 17/23: libgcc.inc: Fix an issue w/ a recursive symlink In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.49A46232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 38cb7877eeeb8565b1cbecac986611c9d4d30f6d Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:02 2020 -0600 libgcc.inc: Fix an issue w/ a recursive symlink If the OS is not Linux, the code could end up generating a recursive symlink. This can happen because the same symlink can be created twice in a row. If this happenes, the second symlink becomes a link to itself within the directory pointed to by the original link. In order to prevent this, verify that the destination does not already exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index e008d14..6d48ec9 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -9,14 +9,18 @@ do_install_append_class-target () { "linux-musleabi") extra_target_os="linux-gnueabi";; *) extra_target_os="linux";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then case "${TARGET_OS}" in "linux-musleabi") extra_target_os="linux-musleabihf";; "linux-gnueabi") extra_target_os="linux-gnueabihf";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:43 +0000 Subject: [oe-commits] [openembedded-core] 13/23: systemd: Refresh the patches In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.14DF6232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 17d26063b007d7e725522c30a70a6cb1b71e39c8 Author: Khem Raj AuthorDate: Tue Jan 28 12:21:14 2020 -0800 systemd: Refresh the patches Fixes WARNING: systemd-1_243.4+gitAUTOINC+70e8c1978a-r0 do_patch: Fuzz detected: Applying patch 0001-do-not-disable-buffer-in-writing-files.patch ... QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...01-do-not-disable-buffer-in-writing-files.patch | 88 +++++++--------------- 1 file changed, 27 insertions(+), 61 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 2f4daf8..d6d68a0 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -38,11 +38,9 @@ Signed-off-by: Scott Murray src/vconsole/vconsole-setup.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -51,7 +49,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -105,11 +103,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,11 +121,9 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -138,8 +132,6 @@ index 123d00e13e..e7ea78f349 100644 if (r < 0) return r; -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -294,7 +294,7 @@ void disable_coredumps(void) { @@ -151,11 +143,9 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) if (!fn) return log_oom(); @@ -164,7 +154,7 @@ index aa9d811f2e..8c7f2dae7a 100644 } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) (void) delete_rule(rule); @@ -182,11 +172,9 @@ index aa9d811f2e..8c7f2dae7a 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -195,7 +183,7 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -204,11 +192,9 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) } #ifdef SMACK_RUN_LABEL @@ -230,8 +216,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,11 +227,9 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -256,11 +238,9 @@ index c4a7f2f3d3..bcac758284 100644 if (r < 0) { if (r == -ELOOP) return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { +@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd if (!t) return -ENOMEM; @@ -269,11 +249,9 @@ index 30b9a66334..cc1d577933 100644 } return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +260,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,7 +271,7 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -311,11 +287,9 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c +@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con log_debug("Setting '%s' to '%s'", p, value); @@ -324,11 +298,9 @@ index 93bdcf11bf..68cddb7a9f 100644 } int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +@@ -54,7 +54,7 @@ static int write_hibernate_location_info /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { @@ -337,7 +309,7 @@ index b9fe96635d..f168d7f890 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +@@ -98,14 +98,14 @@ static int write_hibernate_location_info offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); @@ -363,7 +335,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,24 +344,20 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 + bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { +@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -398,11 +366,9 @@ index cb5123042a..ea309a9e7f 100644 if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:50 +0000 Subject: [oe-commits] [openembedded-core] 20/23: icu: update SRC_URI In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.6A289232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c93c34d31c3f6d473bd5e1c469946be187da70e0 Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:51 +0000 Subject: [oe-commits] [openembedded-core] 21/23: uninative: Recognise ppc64 host ldso In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.73681232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 670760d8143573f354a216c6930fa61dd07d34a5 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:52 +0000 Subject: [oe-commits] [openembedded-core] 22/23: glibc: Update to final 2.31 release In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.7F7F223292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 70d1a218f46b160f83452731492cef9657b49372 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:46 +0000 Subject: [oe-commits] [openembedded-core] 16/23: toaster.bbclass: Fix error when toaster is used to monitor a build In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.3C08923293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dc6eb4235c3f92e85cc770563d44717372fb25b6 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:01 2020 -0600 toaster.bbclass: Fix error when toaster is used to monitor a build The error being corrected looks like: File: '/home/jenkins/workspace/OEBuild/build-32/oe-core/meta/classes/toaster.bbclass', lineno: 130, function: toaster_package_dumpdata 0126: lpkgdata = {} 0127: datadir = os.path.join(pkgdatadir, 'runtime') 0128: 0129: # scan and send data for each generated package *** 0130: for datafile in os.listdir(datadir): 0131: if not datafile.endswith('.packaged'): 0132: lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) 0133: # Fire an event containing the pkg data 0134: bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/jenkins/workspace/OEBuild/builds/build-32/tmp-glibc/work/core2-64-oe-linux/puzzles/2_0.0+gitAUTOINC+c6e0161dd4-r0/pkgdata/runtime' There must be a small window before the data is available, but while the monitoring is on-going. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 6a65ecb..9518ddf 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -126,11 +126,12 @@ def _toaster_dumpdata(pkgdatadir, d): datadir = os.path.join(pkgdatadir, 'runtime') # scan and send data for each generated package - for datafile in os.listdir(datadir): - if not datafile.endswith('.packaged'): - lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) - # Fire an event containing the pkg data - bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) + if os.path.exists(datadir): + for datafile in os.listdir(datadir): + if not datafile.endswith('.packaged'): + lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) + # Fire an event containing the pkg data + bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) python toaster_package_dumpdata() { _toaster_dumpdata(d.getVar('PKGDESTWORK'), d) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:49 +0000 Subject: [oe-commits] [openembedded-core] 19/23: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.5FB00232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 257b0dedf1cfbd359a6b4a0f912395493db5545c Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:53 +0000 Subject: [oe-commits] [openembedded-core] 23/23: busybox: sort the .config file used by ptests In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.8B47F232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f9f3eca521505d504f0cc6fe012c81211b6f027f Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 10:40:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 10:40:48 +0000 Subject: [oe-commits] [openembedded-core] 18/23: classes/reproducible_build: Read SDE file later In-Reply-To: <158064003021.32586.9882975648043576683@git.openembedded.org> References: <158064003021.32586.9882975648043576683@git.openembedded.org> Message-ID: <20200202104031.543CA232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 224269554bfb5602e88f2d36ffc34b87ce723764 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 43 ++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..41950f1 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,35 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + if d.getVar('BUILD_REPRODUCIBLE_BINARIES') != '1': + return '' + + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:40 +0000 Subject: [oe-commits] [openembedded-core] 01/25: HACK: Enable saving of packages In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.45AED23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 96bd67398ed311158d6320407fd706bcdc5947d7 Author: Joshua Watt AuthorDate: Thu Oct 24 13:09:33 2019 -0500 HACK: Enable saving of packages Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9c715ef..9d1bcf3 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -79,7 +79,7 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = False + save_results = True # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:39 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f9f3eca -> 039c543) Message-ID: <158064135961.7758.1818318539401173448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard f9f3eca busybox: sort the .config file used by ptests discard 70d1a21 glibc: Update to final 2.31 release discard 670760d uninative: Recognise ppc64 host ldso discard c93c34d icu: update SRC_URI discard 257b0de glibc: merge libc-common.bbclass into glibc.bb discard 2242695 classes/reproducible_build: Read SDE file later discard 38cb787 libgcc.inc: Fix an issue w/ a recursive symlink discard dc6eb42 toaster.bbclass: Fix error when toaster is used to monitor a build discard 41c37cb u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig discard f1cc7db devtool/standard.py: Allow recipe to disable menuconfig logic discard 17d2606 systemd: Refresh the patches discard c3893f0 gcc-cross-canadian: A missing space in an append caused an invalid option discard 08edca6 texinfo-dummy-native: Allow to coexist with texinfo-native discard af19339 autoconf-archive: Add missing texinfo inherit discard 1f0fdad glibc-package.inc: Remove warnings about unpacked directories discard e26d00f systemd: Upgrade 243.2 -> 243.4-latest discard efd610c iptables: upgrade 1.8.3 -> 1.8.4 discard 1a3eb06 iw: upgrade 5.3 -> 5.4 discard 3a6ec7c iproute2: upgrade 5.3.0 -> 5.5.0 discard ce8115b musl: Update to latest discard 67147e8 valgrind: Fix ptest builds on musl discard cadc565 valgrind: fix the remaining ptest failures discard ea4a2ab HACK: Enable saving of packages add 72af20f bsp-hw.json: remove mpc8315e-rdb manual tests add 0de55be parselogs: remove mpc8315e-rdb from errors new 96bd673 HACK: Enable saving of packages new 1d52ada valgrind: fix the remaining ptest failures new d9abe61 valgrind: Fix ptest builds on musl new 5b4c4b4 musl: Update to latest new 35ddbf2 iproute2: upgrade 5.3.0 -> 5.5.0 new aa443e2 iw: upgrade 5.3 -> 5.4 new f4c271b iptables: upgrade 1.8.3 -> 1.8.4 new 3a2f963 glibc-package.inc: Remove warnings about unpacked directories new bfcef54 autoconf-archive: Add missing texinfo inherit new 5cc2243 texinfo-dummy-native: Allow to coexist with texinfo-native new f28d83c gcc-cross-canadian: A missing space in an append caused an invalid option new b3e769f devtool/standard.py: Allow recipe to disable menuconfig logic new e53bb9c u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig new b569dbb toaster.bbclass: Fix error when toaster is used to monitor a build new cb2c03f libgcc.inc: Fix an issue w/ a recursive symlink new ccb6427 classes/reproducible_build: Read SDE file later new c22b42c glibc: merge libc-common.bbclass into glibc.bb new 46ff333 icu: update SRC_URI new 934d273 uninative: Recognise ppc64 host ldso new 3391216 glibc: Update to final 2.31 release new 29572ba busybox: sort the .config file used by ptests new 2d044ce gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build new 22a9619 fixup new 2e51f98 opensbi: Remove dependency on FDT new 039c543 reproducible: Allow configuration of saved debug output This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f9f3eca) \ N -- N -- N refs/heads/master-next (039c543) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 25 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/reproducible_build.bbclass | 2 +- meta/lib/oeqa/manual/bsp-hw.json | 52 ------- meta/lib/oeqa/runtime/cases/parselogs.py | 5 - meta/lib/oeqa/selftest/cases/reproducible.py | 12 +- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +-- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +- ...systemd-boot_243.4.bb => systemd-boot_243.2.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 ++++++++---- ...e-comprehensive-protection-against-libsec.patch | 152 +++++++++++++++++++++ ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ++++++ .../systemd/{systemd_243.4.bb => systemd_243.2.bb} | 2 + ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 +++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + 15 files changed, 336 insertions(+), 127 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_243.4.bb => systemd-boot_243.2.bb} (100%) create mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch create mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch rename meta/recipes-core/systemd/{systemd_243.4.bb => systemd_243.2.bb} (99%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:41 +0000 Subject: [oe-commits] [openembedded-core] 02/25: valgrind: fix the remaining ptest failures In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.52EC123292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1d52ada434ba44083ccaba9c50bdaa58390983f1 Author: Alexander Kanavin AuthorDate: Mon Jan 27 15:19:07 2020 +0100 valgrind: fix the remaining ptest failures Particularly, one test is disabled as it is failing everywhere, two patches that actually cause failures are dropped and some binaries are prevented from being stripped where that is expected. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...s-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ++++++++++++++++++++++ ...-valgrind-adjust-std_list-expected-output.patch | 32 -------------------- ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 -------------------- meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 23 +++++++++++++-- 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch new file mode 100644 index 0000000..d641998 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch @@ -0,0 +1,34 @@ +From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 24 Jan 2020 17:55:39 +0100 +Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths + +In oe-core, /tmp is linked to /var/volatile/tmp and +valgrind output changes accordingly + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + none/tests/fdleak_cmsg.stderr.exp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp +index 6e5a797b9..0ede1ab18 100644 +--- a/none/tests/fdleak_cmsg.stderr.exp ++++ b/none/tests/fdleak_cmsg.stderr.exp +@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null + + + FILE DESCRIPTORS: 6 open at exit. +-Open file descriptor ...: /tmp/data2 ++Open file descriptor ...: ... + ... + +-Open file descriptor ...: /tmp/data1 ++Open file descriptor ...: ... + ... + + Open AF_UNIX socket ...: +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch b/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch deleted file mode 100644 index a82972e..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1e9265b03cf51d09c028d657fe826d7156a783 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 13 May 2019 17:26:26 -0400 -Subject: [PATCH 2/2] valgrind: adjust std_list expected output - -The run-ptest script uses a custom --yocto-ptest option -to change the summary statistics that valgrind issues -to a format that matches what ptest-runner expects. - -Only this std_list test which checks that strcpy() works -properly on Ubuntu-12.04 and later is affected by this change. -It's normal output when called with --yocto-ptest is a blank -line so adjust the expected output. - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Randy MacLeod ---- - drd/tests/std_list.stderr.exp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drd/tests/std_list.stderr.exp b/drd/tests/std_list.stderr.exp -index d18786f80..8b1378917 100644 ---- a/drd/tests/std_list.stderr.exp -+++ b/drd/tests/std_list.stderr.exp -@@ -1,3 +1 @@ - -- --ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch deleted file mode 100644 index 05886c7..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 01:20:32 -0700 -Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding - offset to it - -Fixes -error: invalid use of undefined type 'struct __pthread' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - drd/tests/pth_detached3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef1..35d43a6 100644 ---- a/drd/tests/pth_detached3.c -+++ b/drd/tests/pth_detached3.c -@@ -21,7 +21,7 @@ int main(int argc, char** argv) - pthread_detach(thread); - - /* Invoke pthread_detach() with an invalid thread ID. */ -- pthread_detach(thread + 8); -+ pthread_detach((pthread_t*)(&thread + 8)); - - fprintf(stderr, "Finished.\n"); - --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834c..0f86aa4 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0003-correct-include-directive-path-for-config.h.patch \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ - file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ @@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ - file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ + file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" @@ -205,4 +204,24 @@ do_install_ptest() { # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest + + # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) + # https://bugs.kde.org/show_bug.cgi?id=402833 + rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest + + # As the binary isn't stripped or debug-splitted, the source file isn't fetched + # via dwarfsrcfiles either, so it needs to be installed manually. + mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ + install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ } + +# avoid stripping some generated binaries otherwise some of the tests will fail +# run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/none/tests/tls \ + ${PKGD}${PTEST_PATH}/none/tests/tls.so \ + ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ + ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ + ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ + ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:43 +0000 Subject: [oe-commits] [openembedded-core] 04/25: musl: Update to latest In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.6A477232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5b4c4b400894fd379d5153155235813fc25071ca Author: Khem Raj AuthorDate: Mon Jan 27 20:08:49 2020 -0800 musl: Update to latest Changelog [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=91e662d1d941215eb024787db5e910dbfb5b169f..83350eb17b9cb355e3f08b0340c4f1e8c437fac9 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 1676e28..6298720 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "91e662d1d941215eb024787db5e910dbfb5b169f" +SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:42 +0000 Subject: [oe-commits] [openembedded-core] 03/25: valgrind: Fix ptest builds on musl In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.5E54B23292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d9abe610056c808766451698be3ad546f18b8b01 Author: Khem Raj AuthorDate: Mon Jan 27 19:58:50 2020 -0800 valgrind: Fix ptest builds on musl Signed-off-by: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 44 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch new file mode 100644 index 0000000..44d707a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -0,0 +1,44 @@ +From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 27 Jan 2020 17:17:19 -0800 +Subject: [PATCH] tests: Make pthread_detatch call portable across platforms + +pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type +this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable +across glibc and musl + +Fixes +| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' +| 24 | pthread_detach(thread + 8); +| | ^ + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +Signed-off-by: Khem Raj +--- + drd/tests/pth_detached3.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c +index c02eef11a..efeb15b72 100644 +--- a/drd/tests/pth_detached3.c ++++ b/drd/tests/pth_detached3.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + static void* thread_func(void* arg) + { +@@ -21,7 +22,7 @@ int main(int argc, char** argv) + pthread_detach(thread); + + /* Invoke pthread_detach() with an invalid thread ID. */ +- pthread_detach(thread + 8); ++ pthread_detach((pthread_t)((uintptr_t)thread + 8)); + + fprintf(stderr, "Finished.\n"); + +-- +2.25.0 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 0f86aa4..1475ff8 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ + file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:44 +0000 Subject: [oe-commits] [openembedded-core] 05/25: iproute2: upgrade 5.3.0 -> 5.5.0 In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.7B0A4232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 35ddbf2de932c9f5ff85e003fa5a7db5232b9109 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:25 2020 +0100 iproute2: upgrade 5.3.0 -> 5.5.0 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iproute2/{iproute2_5.3.0.bb => iproute2_5.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb similarity index 66% rename from meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb index 75772d4..ad0ab13 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb @@ -4,8 +4,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[md5sum] = "227404413c8d6db649d6188ead1e5a6e" -SRC_URI[sha256sum] = "cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f" +SRC_URI[md5sum] = "ee8e2cdb416d4a8ef39525d39ab7c2d0" +SRC_URI[sha256sum] = "bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b" # CFLAGS are computed in Makefile and reference CCOPTS # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:46 +0000 Subject: [oe-commits] [openembedded-core] 07/25: iptables: upgrade 1.8.3 -> 1.8.4 In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.9B3E7232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f4c271b4ef6c540867e629106fa22bfaaed3e49c Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:27 2020 +0100 iptables: upgrade 1.8.3 -> 1.8.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iptables/{iptables_1.8.3.bb => iptables_1.8.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb b/meta/recipes-extended/iptables/iptables_1.8.4.bb similarity index 96% rename from meta/recipes-extended/iptables/iptables_1.8.3.bb rename to meta/recipes-extended/iptables/iptables_1.8.4.bb index 96d195d..cf1388c 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.4.bb @@ -16,8 +16,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513" -SRC_URI[sha256sum] = "a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" +SRC_URI[md5sum] = "9b201107957fbf62709c3d8226239b0d" +SRC_URI[sha256sum] = "993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:47 +0000 Subject: [oe-commits] [openembedded-core] 08/25: glibc-package.inc: Remove warnings about unpacked directories In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.AC195232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a2f963400c2f9e9429145e809c7e57f0cb205eb Author: Richard Purdie AuthorDate: Tue Jan 28 14:37:45 2020 +0000 glibc-package.inc: Remove warnings about unpacked directories If documemtation generation is disabled, the recipe throws warnings about unpackaged files. Avoid this. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index ede9e9b..d2667f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -213,6 +213,8 @@ stash_locale_cleanup () { rm -rf $cleanupdir${libdir}/gconv rm -rf $cleanupdir${localedir} rm -rf $cleanupdir${datadir}/locale + rmdir --ignore-fail-on-non-empty $cleanupdir${datadir} + if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then if [ -d "$cleanupdir${exec_prefix}/lib" ]; then if [ -z "${ARCH_DYNAMIC_LOADER}" -o \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:48 +0000 Subject: [oe-commits] [openembedded-core] 09/25: autoconf-archive: Add missing texinfo inherit In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.BAB8623293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bfcef54ee8db0a255d31d025a966856ddf6387ed Author: Richard Purdie AuthorDate: Tue Jan 28 19:15:51 2020 +0000 autoconf-archive: Add missing texinfo inherit Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb index 985a254..13593d7 100644 --- a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb @@ -9,7 +9,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "d46413c8b00a125b1529bae385bbec55" SRC_URI[sha256sum] = "17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f" -inherit autotools allarch +inherit autotools allarch texinfo PACKAGES = "${PN} ${PN}-doc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:45 +0000 Subject: [oe-commits] [openembedded-core] 06/25: iw: upgrade 5.3 -> 5.4 In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.8A835232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa443e20d698e92058778cdda96fe59004dc77ba Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:26 2020 +0100 iw: upgrade 5.3 -> 5.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iw/iw/separate-objdir.patch | 24 ++++++++++++++-------- .../iw/{iw_5.3.bb => iw_5.4.bb} | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index eb01a5a..179fd90 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch @@ -1,3 +1,6 @@ +From ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae +Date: Mon, 27 Jan 2020 22:48:03 +0100 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -11,12 +14,12 @@ Signed-off-by: Maxin B. John 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 33aaf6a..9030796 100644 +index 90f2251..714cdb9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ MAKEFLAGS += --no-print-directory - + +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) @@ -24,19 +27,24 @@ index 33aaf6a..9030796 100644 PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -@@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) +@@ -92,7 +96,7 @@ all: $(ALL) version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ - $(Q)./version.sh $@ + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ - - %.o: %.c iw.h nl80211.h + + nl80211-commands.inc: nl80211.h + @$(NQ) ' GEN ' $@ +@@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h + + %.o: %.c iw.h nl80211.h nl80211-commands.inc @$(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - + ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) --- -2.20.1 (Apple Git-117) +-- +2.23.0 + diff --git a/meta/recipes-connectivity/iw/iw_5.3.bb b/meta/recipes-connectivity/iw/iw_5.4.bb similarity index 85% rename from meta/recipes-connectivity/iw/iw_5.3.bb rename to meta/recipes-connectivity/iw/iw_5.4.bb index f7f13f5..9f58e49 100644 --- a/meta/recipes-connectivity/iw/iw_5.3.bb +++ b/meta/recipes-connectivity/iw/iw_5.4.bb @@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://separate-objdir.patch \ " -SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31" -SRC_URI[sha256sum] = "175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a" +SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6" +SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c" inherit pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:49 +0000 Subject: [oe-commits] [openembedded-core] 10/25: texinfo-dummy-native: Allow to coexist with texinfo-native In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.C9F8E23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5cc224368e4ce1e97ac22654820d81c9c3fe27ee Author: Richard Purdie AuthorDate: Wed Jan 29 11:38:07 2020 +0000 texinfo-dummy-native: Allow to coexist with texinfo-native Signed-off-by: Richard Purdie --- .../recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 1254bc8..3732d4f 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -13,15 +13,19 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" inherit native +# +# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir +# which is later in PATH than bindir where texinfo-native installs +# do_install_name() { - FILENAME="${D}${bindir}/$1" + FILENAME="${D}${base_bindir}/$1" # Using ln causes problems with rm_work cp -T "${S}/template.py" "$FILENAME" chmod +x $FILENAME } do_install() { - mkdir -p "${D}${bindir}" + mkdir -p "${D}${base_bindir}" for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \ txixml2texi texi2any install-info ginstall-info \ update-info-dir; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:50 +0000 Subject: [oe-commits] [openembedded-core] 11/25: gcc-cross-canadian: A missing space in an append caused an invalid option In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.DAAF0232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f28d83c5af16b713572828ae56be8add3086e93a Author: Mark Hatle AuthorDate: Tue Jan 28 12:12:28 2020 -0600 gcc-cross-canadian: A missing space in an append caused an invalid option When configuring the cross-candian toolchain for a non-linux target system, the resulting gcc configuration included: --enable-initfini-array--without-headers these should have been two separate options. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index f14cbf7..4aac345 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -158,7 +158,7 @@ SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = "--without-headers --with-newlib" -EXTRA_OECONF_append_eabi = "--without-headers --with-newlib" +EXTRA_OECONF_append_elf = " --without-headers --with-newlib" +EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:51 +0000 Subject: [oe-commits] [openembedded-core] 12/25: devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110240.E732423292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b3e769fa419e30619ed83b1f26a4886a2ba2c423 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:44 2019 +0000 devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 52efeae..bab644b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:52 +0000 Subject: [oe-commits] [openembedded-core] 13/25: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.0194A232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e53bb9cb06ecd14d7a194734ab204cd48def3bf0 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:51 2019 +0000 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ec77762..648298d 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -85,6 +85,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:53 +0000 Subject: [oe-commits] [openembedded-core] 14/25: toaster.bbclass: Fix error when toaster is used to monitor a build In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.0E07D23292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b569dbb9e18f451ed55678699a11f799499792b8 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:01 2020 -0600 toaster.bbclass: Fix error when toaster is used to monitor a build The error being corrected looks like: File: '/home/jenkins/workspace/OEBuild/build-32/oe-core/meta/classes/toaster.bbclass', lineno: 130, function: toaster_package_dumpdata 0126: lpkgdata = {} 0127: datadir = os.path.join(pkgdatadir, 'runtime') 0128: 0129: # scan and send data for each generated package *** 0130: for datafile in os.listdir(datadir): 0131: if not datafile.endswith('.packaged'): 0132: lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) 0133: # Fire an event containing the pkg data 0134: bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/jenkins/workspace/OEBuild/builds/build-32/tmp-glibc/work/core2-64-oe-linux/puzzles/2_0.0+gitAUTOINC+c6e0161dd4-r0/pkgdata/runtime' There must be a small window before the data is available, but while the monitoring is on-going. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 6a65ecb..9518ddf 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -126,11 +126,12 @@ def _toaster_dumpdata(pkgdatadir, d): datadir = os.path.join(pkgdatadir, 'runtime') # scan and send data for each generated package - for datafile in os.listdir(datadir): - if not datafile.endswith('.packaged'): - lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) - # Fire an event containing the pkg data - bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) + if os.path.exists(datadir): + for datafile in os.listdir(datadir): + if not datafile.endswith('.packaged'): + lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) + # Fire an event containing the pkg data + bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) python toaster_package_dumpdata() { _toaster_dumpdata(d.getVar('PKGDESTWORK'), d) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:54 +0000 Subject: [oe-commits] [openembedded-core] 15/25: libgcc.inc: Fix an issue w/ a recursive symlink In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.1855F23293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cb2c03f21891ce61b1e453df45e7d29f1b413550 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:02 2020 -0600 libgcc.inc: Fix an issue w/ a recursive symlink If the OS is not Linux, the code could end up generating a recursive symlink. This can happen because the same symlink can be created twice in a row. If this happenes, the second symlink becomes a link to itself within the directory pointed to by the original link. In order to prevent this, verify that the destination does not already exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index e008d14..6d48ec9 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -9,14 +9,18 @@ do_install_append_class-target () { "linux-musleabi") extra_target_os="linux-gnueabi";; *) extra_target_os="linux";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then case "${TARGET_OS}" in "linux-musleabi") extra_target_os="linux-musleabihf";; "linux-gnueabi") extra_target_os="linux-gnueabihf";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:57 +0000 Subject: [oe-commits] [openembedded-core] 18/25: icu: update SRC_URI In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.3873B232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 46ff333b0536f2beaa6c3476385a0c2397c1281c Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:03:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:03:00 +0000 Subject: [oe-commits] [openembedded-core] 21/25: busybox: sort the .config file used by ptests In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.58609232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 29572ba2a969b906852a22396442713674c82d43 Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:56 +0000 Subject: [oe-commits] [openembedded-core] 17/25: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.2BFCB232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c22b42c34ca556b1821c3ad3cb5c4ec76478d453 Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:03:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:03:02 +0000 Subject: [oe-commits] [openembedded-core] 23/25: fixup In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.6E138232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 22a9619acb5dd6ff7525a06a489a9862077508cc Author: Richard Purdie AuthorDate: Sun Feb 2 10:48:07 2020 +0000 fixup Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 41950f1..42e47ac 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -195,7 +195,7 @@ def get_source_date_epoch_value(d): d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) return str(source_date_epoch) -export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" +SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:03:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:03:01 +0000 Subject: [oe-commits] [openembedded-core] 22/25: gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.6294F232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2d044ceb81f473e596c69ab1d3869cc5d1a1cd5b Author: Andrey Zhizhikin AuthorDate: Mon Jan 27 10:44:44 2020 +0000 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build When opencv is picked in PACKAGECONFIG, plugin fails to locate data dirs. This is due to meson.build file uses 'test' utility to verify that the data dirs path is present and not taking sysroot into prefix. Introduce additional patch, which picks up PKG_CONFIG_SYSROOT_DIR as prefix for 'test' utility to verify the data dir is actually present. Signed-off-by: Andrey Zhizhikin Signed-off-by: Richard Purdie --- ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch new file mode 100644 index 0000000..4b6591c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -0,0 +1,49 @@ +From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin +Date: Mon, 27 Jan 2020 10:22:35 +0000 +Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build + +When Yocto build is performed, opencv searches for data dir using simple +'test' command, this fails because pkg-config provides an absolute +path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR +in order for the 'test' utility to pick up the absolute path. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin +--- + ext/opencv/meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55dfe..a26403482 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -78,20 +78,21 @@ else + endif + + if opencv_found ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation +- r = run_command('test', '-d', opencv_prefix + '/share/opencv') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' + else +-- +2.17.1 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb index 56ae7a1..024277e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb @@ -6,6 +6,7 @@ SRC_URI = " \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:58 +0000 Subject: [oe-commits] [openembedded-core] 19/25: uninative: Recognise ppc64 host ldso In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.44715232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 934d2734ee49398811cf84679b453c72dfcf3cf8 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:59 +0000 Subject: [oe-commits] [openembedded-core] 20/25: glibc: Update to final 2.31 release In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.4F4B7232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 33912162d118c74968ae480b69165f38078cbbd3 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:03:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:03:04 +0000 Subject: [oe-commits] [openembedded-core] 25/25: reproducible: Allow configuration of saved debug output In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.835C823292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 039c5433a1e8f03cb0129ec9a439fd083faaa661 Author: Richard Purdie AuthorDate: Sun Feb 2 11:01:33 2020 +0000 reproducible: Allow configuration of saved debug output Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9d1bcf3..f3eecac 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -79,7 +79,10 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = True + save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +171,7 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-', dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +207,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:02:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:02:55 +0000 Subject: [oe-commits] [openembedded-core] 16/25: classes/reproducible_build: Read SDE file later In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.2183023293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ccb6427071f7df71cd217aa601e81f1781ac7623 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 43 ++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..41950f1 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,35 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + if d.getVar('BUILD_REPRODUCIBLE_BINARIES') != '1': + return '' + + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:03:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:03:03 +0000 Subject: [oe-commits] [openembedded-core] 24/25: opensbi: Remove dependency on FDT In-Reply-To: <158064135961.7758.1818318539401173448@git.openembedded.org> References: <158064135961.7758.1818318539401173448@git.openembedded.org> Message-ID: <20200202110241.7986F23292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2e51f98555251f2070257a13bfc151a6b382ec89 Author: Alistair Francis AuthorDate: Thu Jan 30 15:04:23 2020 -0800 opensbi: Remove dependency on FDT U-Boot no longer requires OpenSBI to include a FDT for the HiFive Unleashed, so remove the support from OpenSBI. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +------------------- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +--- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7..2e32943 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload -def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): if 'linux' in sbi_payload or 'Image' in sbi_payload: return "virtual/kernel:do_deploy" if 'u-boot.bin' in sbi_payload: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.5.bb index 6a90262..71d64fa 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb @@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" -DEPENDS += "dtc-native" require opensbi-payloads.inc @@ -21,7 +20,7 @@ SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" +EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" # Required if specifying a custom payload do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" @@ -47,7 +46,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - COMPATIBLE_HOST = "(riscv64|riscv32).*" INHIBIT_PACKAGE_STRIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:24:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:24:50 +0000 Subject: [oe-commits] [openembedded-core] 01/01: reproducible: Allow configuration of saved debug output In-Reply-To: <158064268991.11571.11499064436764436657@git.openembedded.org> References: <158064268991.11571.11499064436764436657@git.openembedded.org> Message-ID: <20200202112450.1309F23292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 25b832d7fcef08d7b08ee234404af07c682dcaca Author: Richard Purdie AuthorDate: Sun Feb 2 11:01:33 2020 +0000 reproducible: Allow configuration of saved debug output Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9d1bcf3..c261076 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -15,6 +15,7 @@ import tempfile import shutil import stat import os +import datetime MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -79,7 +80,10 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = True + save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + os.makedirs(self.save_results, exist_ok=True) + datestr = datetime.datetime.now().strftime('%Y%m%d') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' % datestr, dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 11:24:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 11:24:49 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (039c543 -> 25b832d) Message-ID: <158064268991.11571.11499064436764436657@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 039c543 reproducible: Allow configuration of saved debug output new 25b832d reproducible: Allow configuration of saved debug output This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (039c543) \ N -- N -- N refs/heads/master-next (25b832d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/selftest/cases/reproducible.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:43 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (25b832d -> 055bf1c) Message-ID: <158065564352.674.17841873703066026242@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 25b832d reproducible: Allow configuration of saved debug output discard 2e51f98 opensbi: Remove dependency on FDT discard 22a9619 fixup discard 2d044ce gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build discard 29572ba busybox: sort the .config file used by ptests discard 3391216 glibc: Update to final 2.31 release discard 934d273 uninative: Recognise ppc64 host ldso discard 46ff333 icu: update SRC_URI discard c22b42c glibc: merge libc-common.bbclass into glibc.bb discard ccb6427 classes/reproducible_build: Read SDE file later new ef6d71a classes/reproducible_build: Read SDE file later new 963dd70 glibc: merge libc-common.bbclass into glibc.bb new 9852c35 icu: update SRC_URI new f089cde uninative: Recognise ppc64 host ldso new a365d83 glibc: Update to final 2.31 release new b4b3b4a busybox: sort the .config file used by ptests new 59bb93d gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build new deb7a9c opensbi: Remove dependency on FDT new 055bf1c reproducible: Allow configuration of saved debug output This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (25b832d) \ N -- N -- N refs/heads/master-next (055bf1c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/reproducible_build.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:46 +0000 Subject: [oe-commits] [openembedded-core] 03/09: icu: update SRC_URI In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150043.C627F232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9852c356caf939b8893d5e765659c72914a009d6 Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:45 +0000 Subject: [oe-commits] [openembedded-core] 02/09: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150043.B69DB23292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 963dd7080a18a6614e336720c9f82c79c45bd49f Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:44 +0000 Subject: [oe-commits] [openembedded-core] 01/09: classes/reproducible_build: Read SDE file later In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150043.AB13723292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ef6d71aa28d489db57c0b7eb9ebbe586acb42203 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..56efa11 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +exoprt SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:47 +0000 Subject: [oe-commits] [openembedded-core] 04/09: uninative: Recognise ppc64 host ldso In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150043.D9FD9232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f089cdeddb22caacfaa8e23a0721b411eb7e88c0 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:48 +0000 Subject: [oe-commits] [openembedded-core] 05/09: glibc: Update to final 2.31 release In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150043.EBA1B232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a365d83330eec50dc51c7a86d22ad01e9fbb59d2 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:49 +0000 Subject: [oe-commits] [openembedded-core] 06/09: busybox: sort the .config file used by ptests In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150044.0B6AE232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b4b3b4a247cc80bad1d50a7906a0a276b44ca317 Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:52 +0000 Subject: [oe-commits] [openembedded-core] 09/09: reproducible: Allow configuration of saved debug output In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150044.4154323292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 055bf1cbb2d54f496bf246ae87aeb385406f6f04 Author: Richard Purdie AuthorDate: Sun Feb 2 11:01:33 2020 +0000 reproducible: Allow configuration of saved debug output Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9d1bcf3..c261076 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -15,6 +15,7 @@ import tempfile import shutil import stat import os +import datetime MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -79,7 +80,10 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = True + save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + os.makedirs(self.save_results, exist_ok=True) + datestr = datetime.datetime.now().strftime('%Y%m%d') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' % datestr, dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:50 +0000 Subject: [oe-commits] [openembedded-core] 07/09: gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150044.19DB9232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59bb93da7a8381215c3b894fe03f0dfb22c806d5 Author: Andrey Zhizhikin AuthorDate: Mon Jan 27 10:44:44 2020 +0000 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build When opencv is picked in PACKAGECONFIG, plugin fails to locate data dirs. This is due to meson.build file uses 'test' utility to verify that the data dirs path is present and not taking sysroot into prefix. Introduce additional patch, which picks up PKG_CONFIG_SYSROOT_DIR as prefix for 'test' utility to verify the data dir is actually present. Signed-off-by: Andrey Zhizhikin Signed-off-by: Richard Purdie --- ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch new file mode 100644 index 0000000..4b6591c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -0,0 +1,49 @@ +From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin +Date: Mon, 27 Jan 2020 10:22:35 +0000 +Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build + +When Yocto build is performed, opencv searches for data dir using simple +'test' command, this fails because pkg-config provides an absolute +path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR +in order for the 'test' utility to pick up the absolute path. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin +--- + ext/opencv/meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55dfe..a26403482 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -78,20 +78,21 @@ else + endif + + if opencv_found ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation +- r = run_command('test', '-d', opencv_prefix + '/share/opencv') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' + else +-- +2.17.1 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb index 56ae7a1..024277e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb @@ -6,6 +6,7 @@ SRC_URI = " \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:00:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:00:51 +0000 Subject: [oe-commits] [openembedded-core] 08/09: opensbi: Remove dependency on FDT In-Reply-To: <158065564352.674.17841873703066026242@git.openembedded.org> References: <158065564352.674.17841873703066026242@git.openembedded.org> Message-ID: <20200202150044.318DE23293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit deb7a9cb2684d27d5f7b33d0b566e8bf3e717bd6 Author: Alistair Francis AuthorDate: Thu Jan 30 15:04:23 2020 -0800 opensbi: Remove dependency on FDT U-Boot no longer requires OpenSBI to include a FDT for the HiFive Unleashed, so remove the support from OpenSBI. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +------------------- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +--- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7..2e32943 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload -def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): if 'linux' in sbi_payload or 'Image' in sbi_payload: return "virtual/kernel:do_deploy" if 'u-boot.bin' in sbi_payload: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.5.bb index 6a90262..71d64fa 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb @@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" -DEPENDS += "dtc-native" require opensbi-payloads.inc @@ -21,7 +20,7 @@ SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" +EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" # Required if specifying a custom payload do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" @@ -47,7 +46,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - COMPATIBLE_HOST = "(riscv64|riscv32).*" INHIBIT_PACKAGE_STRIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (055bf1c -> 0563aee) Message-ID: <158065584562.2907.16809084592096341519@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 055bf1c reproducible: Allow configuration of saved debug output discard deb7a9c opensbi: Remove dependency on FDT discard 59bb93d gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build discard b4b3b4a busybox: sort the .config file used by ptests discard a365d83 glibc: Update to final 2.31 release discard f089cde uninative: Recognise ppc64 host ldso discard 9852c35 icu: update SRC_URI discard 963dd70 glibc: merge libc-common.bbclass into glibc.bb discard ef6d71a classes/reproducible_build: Read SDE file later new 757ebef classes/reproducible_build: Read SDE file later new f7808db glibc: merge libc-common.bbclass into glibc.bb new 4097430 icu: update SRC_URI new 8ad70d6 uninative: Recognise ppc64 host ldso new 3a012a1 glibc: Update to final 2.31 release new 33536f8 busybox: sort the .config file used by ptests new 8b8966e gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build new a7b7107 opensbi: Remove dependency on FDT new d3f55d6 reproducible: Allow configuration of saved debug output new 0563aee bitbake.conf: drop pod2man from hosttools This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (055bf1c) \ N -- N -- N refs/heads/master-next (0563aee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/reproducible_build.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:08 +0000 Subject: [oe-commits] [openembedded-core] 03/10: icu: update SRC_URI In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150405.F035F232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4097430da118a26a78aae86e4c900dc307bceac4 Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:07 +0000 Subject: [oe-commits] [openembedded-core] 02/10: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150405.E1297232937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f7808db15c86bbd8aced66e2f079a290756d7dde Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:06 +0000 Subject: [oe-commits] [openembedded-core] 01/10: classes/reproducible_build: Read SDE file later In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150405.CE0B4232936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 757ebef530062d9a48de92c430b902d579289861 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..750eb95 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:09 +0000 Subject: [oe-commits] [openembedded-core] 04/10: uninative: Recognise ppc64 host ldso In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.0A61F232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ad70d663bf6b8a9358923aaf3604539d316609f Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:10 +0000 Subject: [oe-commits] [openembedded-core] 05/10: glibc: Update to final 2.31 release In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.2623923293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a012a14f2846687845b521a91070e148265e4e7 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:11 +0000 Subject: [oe-commits] [openembedded-core] 06/10: busybox: sort the .config file used by ptests In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.3609823293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 33536f8247bf805d968c878b612025190dc3d1b0 Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:14 +0000 Subject: [oe-commits] [openembedded-core] 09/10: reproducible: Allow configuration of saved debug output In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.66387232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d3f55d6620cdd2a059b8c17c548a7d3e3539a093 Author: Richard Purdie AuthorDate: Sun Feb 2 11:01:33 2020 +0000 reproducible: Allow configuration of saved debug output Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9d1bcf3..c261076 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -15,6 +15,7 @@ import tempfile import shutil import stat import os +import datetime MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -79,7 +80,10 @@ def compare_file(reference, test, diffutils_sysroot): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] - save_results = True + save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + os.makedirs(self.save_results, exist_ok=True) + datestr = datetime.datetime.now().strftime('%Y%m%d') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' % datestr, dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:15 +0000 Subject: [oe-commits] [openembedded-core] 10/10: bitbake.conf: drop pod2man from hosttools In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.7800F232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0563aee3043d341a3e3c5ea7080f1ea1180efb2f Author: Alexander Kanavin AuthorDate: Fri Jan 31 19:49:35 2020 +0100 bitbake.conf: drop pod2man from hosttools pod2man writes the current date into manpages, and while later versions of it respect SOURCE_DATE_EPOCH and use that instead, earlier versions do not. This was found to cause reproducibility issues. This patch replaces host version of pod2man with one from perl-native. [YOCTO #13755] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b6aa9f3..f7544b3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -488,7 +488,7 @@ HOSTTOOLS += " \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ + mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726..8e7ef00 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -18,6 +18,8 @@ TARGET_CC_ARCH += "${LDFLAGS}" RDEPENDS_${PN} += "bash" +inherit perlnative + # For native builds we use the host Python PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" PYTHONRDEPS_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:12 +0000 Subject: [oe-commits] [openembedded-core] 07/10: gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.468FF23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8b8966efc292417fc1a55c90878b1f13e660cb2e Author: Andrey Zhizhikin AuthorDate: Mon Jan 27 10:44:44 2020 +0000 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build When opencv is picked in PACKAGECONFIG, plugin fails to locate data dirs. This is due to meson.build file uses 'test' utility to verify that the data dirs path is present and not taking sysroot into prefix. Introduce additional patch, which picks up PKG_CONFIG_SYSROOT_DIR as prefix for 'test' utility to verify the data dir is actually present. Signed-off-by: Andrey Zhizhikin Signed-off-by: Richard Purdie --- ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch new file mode 100644 index 0000000..4b6591c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -0,0 +1,49 @@ +From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin +Date: Mon, 27 Jan 2020 10:22:35 +0000 +Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build + +When Yocto build is performed, opencv searches for data dir using simple +'test' command, this fails because pkg-config provides an absolute +path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR +in order for the 'test' utility to pick up the absolute path. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin +--- + ext/opencv/meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55dfe..a26403482 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -78,20 +78,21 @@ else + endif + + if opencv_found ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation +- r = run_command('test', '-d', opencv_prefix + '/share/opencv') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' + else +-- +2.17.1 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb index 56ae7a1..024277e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb @@ -6,6 +6,7 @@ SRC_URI = " \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 15:04:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 15:04:13 +0000 Subject: [oe-commits] [openembedded-core] 08/10: opensbi: Remove dependency on FDT In-Reply-To: <158065584562.2907.16809084592096341519@git.openembedded.org> References: <158065584562.2907.16809084592096341519@git.openembedded.org> Message-ID: <20200202150406.53B73232935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a7b7107a53f9c24120a7d8fa0b9a51fe18001e18 Author: Alistair Francis AuthorDate: Thu Jan 30 15:04:23 2020 -0800 opensbi: Remove dependency on FDT U-Boot no longer requires OpenSBI to include a FDT for the HiFive Unleashed, so remove the support from OpenSBI. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +------------------- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +--- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7..2e32943 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload -def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): if 'linux' in sbi_payload or 'Image' in sbi_payload: return "virtual/kernel:do_deploy" if 'u-boot.bin' in sbi_payload: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.5.bb index 6a90262..71d64fa 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb @@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" -DEPENDS += "dtc-native" require opensbi-payloads.inc @@ -21,7 +20,7 @@ SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" +EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" # Required if specifying a custom payload do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" @@ -47,7 +46,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - COMPATIBLE_HOST = "(riscv64|riscv32).*" INHIBIT_PACKAGE_STRIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:08 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (b42f4a2 -> 6aab1a8) Message-ID: <158065974876.16305.17030413512768319871@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard b42f4a2 gpsd: Only require and build for Python3 discard 1f64375 python3-pexpect: upgrade 4.7.0 -> 4.8.0 discard be297c7 poppler: upgrade 0.84.0 -> 0.85.0 discard 66a6d7c thunar: upgrade 1.8.10 -> 1.8.12 discard ecc6f7e xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 discard 1ce08d4 mozjs: port build to python3 discard 4ae9a3d kernel-selftest: Disable bpf tests on mips new 6e936c4 kernel-selftest: Disable bpf tests on mips new 23eb065 mozjs: port build to python3 new 6cdb73d xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 new a900299 thunar: upgrade 1.8.10 -> 1.8.12 new d7179a6 poppler: upgrade 0.84.0 -> 0.85.0 new 19d1fd1 python3-pexpect: upgrade 4.7.0 -> 4.8.0 new 2e6a5f3 gpsd: Only require and build for Python3 new 6aab1a8 openbox: use python 3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b42f4a2) \ N -- N -- N refs/heads/master-next (6aab1a8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...-openbox-xdg-autostart-convert-to-python3.patch | 138 +++++++++++++++++++++ meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 3 +- .../kernel-selftest/kernel-selftest.bb | 2 +- 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:09 +0000 Subject: [oe-commits] [meta-openembedded] 01/08: kernel-selftest: Disable bpf tests on mips In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.07D7C232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6e936c45d498825aacbac3d8945f7727cfa68061 Author: Khem Raj AuthorDate: Fri Jan 31 18:23:17 2020 -0800 kernel-selftest: Disable bpf tests on mips 5.4 kernel exposes a problem, where its using host includes to compile BPF tests and it fails for mips because ptrace.h is quite different so it can not find the needed pt_struct definitions during cross compile % clang -fno-stack-protector -I. -I./include/uapi -I../../../include/uapi -I/mnt/b/yoe/build/tmp/work/qemumips-yoe-linux/kernel-selft est/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf/../usr/include -D__TARGET_ARCH_mips -g -idirafter /mnt/b/yoe/build/tmp/wor k/qemumips-yoe-linux/kernel-selftest/1.0-r0/recipe-sysroot-native/usr/lib/clang/10.0.0/include -Wno-compare-distinct-pointer-types -O2 -target bpf -emit-llvm \ -c progs/loop1.c progs/loop1.c:21:9: error: no member named 'regs' in 'struct pt_regs' m = PT_REGS_RC(ctx); ^~~~~~~~~~~~~~~ ./bpf_helpers.h:466:29: note: expanded from macro 'PT_REGS_RC' ~~ ^ 1 error generated. Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 02c56be..299c1f2 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -21,6 +21,10 @@ SRC_URI += "file://run-ptest \ PACKAGECONFIG ??= "bpf vm" PACKAGECONFIG_remove_x86 = "bpf" PACKAGECONFIG_remove_arm = "bpf" +# host ptrace.h is used to compile BPF target but mips ptrace.h is needed +# progs/loop1.c:21:9: error: incomplete definition of type 'struct user_pt_regs' +# m = PT_REGS_RC(ctx); +PACKAGECONFIG_remove_qemumips = "bpf" PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," PACKAGECONFIG[vm] = ",,libcap,libgcc bash" @@ -40,7 +44,7 @@ EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ CC="${CC}" \ - CLANG="clang -fno-stack-protector" \ + CLANG="clang -fno-stack-protector -arch ${ARCH} ${TOOLCHAIN_OPTIONS}" \ AR="${AR}" \ LD="${LD}" \ DESTDIR="${D}" \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:11 +0000 Subject: [oe-commits] [meta-openembedded] 03/08: xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.49E4C23293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6cdb73d1a08c8f24d90e8437ffb7f2ba3b9d770f Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:02 2020 +0100 xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 Release notes for 2.3.5 ======================= - Fix saving unchanged plugin title. (bug #15403) - Fix sidebar scrollbar covering buttons. (bug #14730) - Fix categories remaining scrolled when hidden. - Fix incorrect alignment of commands next to search. - Fix incorrect fallback value for menu opacity. - Fix incorrect check when setting command. - Update documentation URL. (bug #16183) Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...-whiskermenu-plugin_2.3.4.bb => xfce4-whiskermenu-plugin_2.3.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb similarity index 66% rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb index 595e3c8..75b5a31 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "ee9e378fae78b230a23b241cf727c84b" -SRC_URI[sha256sum] = "84d3de35695a023aab181f7a9b75f59029eb3b07c3e47a5e11e8bd79db62570e" +SRC_URI[md5sum] = "b5242d7922fa4253cc99c253efcff7cf" +SRC_URI[sha256sum] = "8f7134f4c1b5ff5290048c5b96b130e1238a286002cbe35255c2cd7d5a1ab6b4" RRECOMMENDS_${PN} += "menulibre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:12 +0000 Subject: [oe-commits] [meta-openembedded] 04/08: thunar: upgrade 1.8.10 -> 1.8.12 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.5648D23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a900299a25b4224b509b8ae6195eb68c09dad5f1 Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:03 2020 +0100 thunar: upgrade 1.8.10 -> 1.8.12 Release notes for 1.8.12 ======================== - NULL is the proper sentinel for g_object_new() (Bug #16310) - Drop timer on finalize (Bug #15305) - Store column width setting asynchronously and only once (Bug #15305) - When move to trash fails, ask whether to delete files (Bug #15975) - Ctrl+Mousewheel does not enlarge/shrink entries (for detailed list view) (Bug #15936) - Extra padding for Eject button when scrollbar is visible (Bug #15312) - Use standard icon instead of custom - Translation Updates: Albanian, Chinese (China), Chinese (Taiwan), Croatian, Czech, Dutch, French, Galician, Greek, Hungarian, Italian, Japanese, Norwegian Bokm?l, Portuguese, Portuguese (Brazil), Russian, Serbian, Slovak, Spanish, Swedish, Ukrainian Could not find announcemant for 1.8.11 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-xfce/recipes-xfce/thunar/{thunar_1.8.10.bb => thunar_1.8.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.8.10.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.8.12.bb similarity index 84% rename from meta-xfce/recipes-xfce/thunar/thunar_1.8.10.bb rename to meta-xfce/recipes-xfce/thunar/thunar_1.8.12.bb index eb57dae..0d2befd 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_1.8.10.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_1.8.12.bb @@ -8,8 +8,8 @@ inherit xfce gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "85c7394d82542d5a023f1f5baef109d8" -SRC_URI[sha256sum] = "3d448d81c0e49efbaa5ae6bf34ac3c88a614178a1127afaee6b3a1b5ee12e709" +SRC_URI[md5sum] = "bebd2d83ad2ed111b906c99b65fb32ed" +SRC_URI[sha256sum] = "29295bee0b1f5bfd525e37405e5d32b497ae539b15183dd14e6ca49e252225f8" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:14 +0000 Subject: [oe-commits] [meta-openembedded] 06/08: python3-pexpect: upgrade 4.7.0 -> 4.8.0 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.73625232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 19d1fd1683c441c4c02c71377bb9d29d7a9cc221 Author: Trevor Gamblin AuthorDate: Sat Feb 1 15:20:02 2020 -0500 python3-pexpect: upgrade 4.7.0 -> 4.8.0 Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pexpect.inc | 4 ++-- .../python/{python3-pexpect_4.7.0.bb => python3-pexpect_4.8.0.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pexpect.inc b/meta-python/recipes-devtools/python/python-pexpect.inc index 6d78eb9..f02aa99 100644 --- a/meta-python/recipes-devtools/python/python-pexpect.inc +++ b/meta-python/recipes-devtools/python/python-pexpect.inc @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c7a725251880af8c6a148181665385b" -SRC_URI[md5sum] = "ed003242cbf308aee1b1eaecdef59e43" -SRC_URI[sha256sum] = "9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb" +SRC_URI[md5sum] = "153eb25184249d6a85fde9acf4804085" +SRC_URI[sha256sum] = "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect" diff --git a/meta-python/recipes-devtools/python/python3-pexpect_4.7.0.bb b/meta-python/recipes-devtools/python/python3-pexpect_4.8.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pexpect_4.7.0.bb rename to meta-python/recipes-devtools/python/python3-pexpect_4.8.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:15 +0000 Subject: [oe-commits] [meta-openembedded] 07/08: gpsd: Only require and build for Python3 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.8177C232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2e6a5f32f614aa186a580deb0366d9543c8caf4b Author: Alistair Francis AuthorDate: Sat Feb 1 18:17:38 2020 -0800 gpsd: Only require and build for Python3 Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index dbbc714..f74ebda 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -2,7 +2,7 @@ SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" -DEPENDS = "dbus ncurses python python3 pps-tools" +DEPENDS = "dbus ncurses python3 pps-tools" PROVIDES = "virtual/gpsd" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ @@ -84,7 +84,7 @@ do_install_append() { install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket } -PACKAGES =+ "libgps libgpsd python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" +PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" RPROVIDES_${PN}-dbg += "python-pygps-dbg" @@ -114,17 +114,17 @@ FILES_gpsd-gpsctl = "${bindir}/gpsctl" SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" # Python files are required for gps/fake, required for gpsfake. FILES_gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ +RDEPENDS_gps-utils = "python3-pygps" + +SUMMARY_python3-pygps = "Python bindings to gpsd" +FILES_python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" +RDEPENDS_python3-pygps = " \ + python3-core \ + python3-io \ + python3-threading \ + python3-terminal \ gpsd \ - python-json" + python3-json" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:13 +0000 Subject: [oe-commits] [meta-openembedded] 05/08: poppler: upgrade 0.84.0 -> 0.85.0 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.65386232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d7179a6f01ff454507eec30823e20fb745b269e3 Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:01 2020 +0100 poppler: upgrade 0.84.0 -> 0.85.0 Release 0.85.0: core: * Fix case unsensitive search for Deseret and Osage. Issue #853 * Fix crash in unicodeToAscii7 * CairoOutputDev: make initialisation thread-safe * Fix crash on broken files. Issues #869, #870 * Internal code improvements qt5: * Fix FormField::name encoding * Accept UTF-16 uiNames for form fields * Fix search for "complex" characters * Allow to load document from QIODevice utils: * pdftoppm/pdftocairo: Fix -e/-o printing the wrong pages. Issue #873 * pdftohtml: Fix issue with the font size sometimes being huge glib: * make the frontend initialization thread safe. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../recipes-support/poppler/{poppler_0.84.0.bb => poppler_0.85.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/poppler/poppler_0.84.0.bb b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb similarity index 93% rename from meta-oe/recipes-support/poppler/poppler_0.84.0.bb rename to meta-oe/recipes-support/poppler/poppler_0.85.0.bb index 5153868..857b67f 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.84.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb @@ -7,8 +7,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[md5sum] = "e14a8aca8809908ad4364c32c17bcb92" -SRC_URI[sha256sum] = "c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731" +SRC_URI[md5sum] = "5315084523a4d73e9514f51eef78a332" +SRC_URI[sha256sum] = "2bc875eb323002ae6b287e09980473518e2b2ed6b5b7d2e1089e36a6cd00d94b" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:16 +0000 Subject: [oe-commits] [meta-openembedded] 08/08: openbox: use python 3 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.8ED46232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6aab1a829e55fbd2444c93941371920091855785 Author: Max Krummenacher AuthorDate: Sun Feb 2 16:15:22 2020 +0100 openbox: use python 3 Signed-off-by: Max Krummenacher Signed-off-by: Khem Raj --- ...-openbox-xdg-autostart-convert-to-python3.patch | 138 +++++++++++++++++++++ meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 3 +- 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch b/meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch new file mode 100644 index 0000000..5ebeb01 --- /dev/null +++ b/meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch @@ -0,0 +1,138 @@ +From b7de9cff2a9578dd92d191241c28437cd6bbb595 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Sun, 2 Feb 2020 14:39:21 +0000 +Subject: [PATCH] openbox-xdg-autostart: convert to python3 + +Upstream-Status: Pending + +Signed-off-by: Max Krummenacher +--- + data/autostart/openbox-xdg-autostart | 72 ++++++++++++++-------------- + 1 file changed, 36 insertions(+), 36 deletions(-) + +diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart +index 04a17a1..52d763f 100755 +--- a/data/autostart/openbox-xdg-autostart ++++ b/data/autostart/openbox-xdg-autostart +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # openbox-xdg-autostart runs things based on the XDG autostart specification + # Copyright (C) 2008 Dana Jansens +@@ -28,9 +28,9 @@ try: + from xdg.DesktopEntry import DesktopEntry + from xdg.Exceptions import ParsingError + except ImportError: +- print +- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed" +- print ++ print() ++ print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr) ++ print() + sys.exit(1) + + def main(argv=sys.argv): +@@ -51,7 +51,7 @@ def main(argv=sys.argv): + try: + autofile = AutostartFile(path) + except ParsingError: +- print "Invalid .desktop file: " + path ++ print("Invalid .desktop file: " + path) + else: + if not autofile in files: + files.append(autofile) +@@ -99,9 +99,9 @@ class AutostartFile: + + def _alert(self, str, info=False): + if info: +- print "\t ", str ++ print("\t ", str) + else: +- print "\t*", str ++ print("\t*", str) + + def _showInEnvironment(self, envs, verbose=False): + default = not self.de.getOnlyShowIn() +@@ -146,14 +146,14 @@ class AutostartFile: + + def display(self, envs): + if self._shouldRun(envs): +- print "[*] " + self.de.getName() ++ print("[*] " + self.de.getName()) + else: +- print "[ ] " + self.de.getName() ++ print("[ ] " + self.de.getName()) + self._alert("File: " + self.path, info=True) + if self.de.getExec(): + self._alert("Executes: " + self.de.getExec(), info=True) + self._shouldRun(envs, True) +- print ++ print() + + def run(self, envs): + here = os.getcwd() +@@ -165,34 +165,34 @@ class AutostartFile: + os.chdir(here) + + def show_help(): +- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." +- print +- print "This tool will run xdg autostart .desktop files" +- print +- print "OPTIONS" +- print " --list Show a list of the files which would be run" +- print " Files which would be run are marked with an asterix" +- print " symbol [*]. For files which would not be run," +- print " information is given for why they are excluded" +- print " --help Show this help and exit" +- print " --version Show version and copyright information" +- print +- print "ENVIRONMENT specifies a list of environments for which to run autostart" +- print "applications. If none are specified, only applications which do not " +- print "limit themselves to certain environments will be run." +- print +- print "ENVIRONMENT can be one or more of:" +- print " GNOME Gnome Desktop" +- print " KDE KDE Desktop" +- print " ROX ROX Desktop" +- print " XFCE XFCE Desktop" +- print " Old Legacy systems" +- print ++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...") ++ print() ++ print("This tool will run xdg autostart .desktop files") ++ print() ++ print("OPTIONS") ++ print(" --list Show a list of the files which would be run") ++ print(" Files which would be run are marked with an asterix") ++ print(" symbol [*]. For files which would not be run,") ++ print(" information is given for why they are excluded") ++ print(" --help Show this help and exit") ++ print(" --version Show version and copyright information") ++ print() ++ print("ENVIRONMENT specifies a list of environments for which to run autostart") ++ print("applications. If none are specified, only applications which do not ") ++ print("limit themselves to certain environments will be run.") ++ print() ++ print("ENVIRONMENT can be one or more of:") ++ print(" GNOME Gnome Desktop") ++ print(" KDE KDE Desktop") ++ print(" ROX ROX Desktop") ++ print(" XFCE XFCE Desktop") ++ print(" Old Legacy systems") ++ print() + + def show_version(): +- print ME, VERSION +- print "Copyright (c) 2008 Dana Jansens" +- print ++ print(ME, VERSION) ++ print("Copyright (c) 2008 Dana Jansens") ++ print() + + if __name__ == "__main__": + sys.exit(main()) +-- +2.20.1 + diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 33f34e4..e269a26 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = " \ http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \ + file://0001-openbox-xdg-autostart-convert-to-python3.patch \ " SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" @@ -54,4 +55,4 @@ FILES_${PN}-gnome += " \ FILES_${PN}-config += "${sysconfdir}" -RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python python-shell pyxdg" +RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python3 python3-shell pyxdg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:09:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:09:10 +0000 Subject: [oe-commits] [meta-openembedded] 02/08: mozjs: port build to python3 In-Reply-To: <158065974876.16305.17030413512768319871@git.openembedded.org> References: <158065974876.16305.17030413512768319871@git.openembedded.org> Message-ID: <20200202160909.3AD4223293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 23eb06562dd82e6ee6d4dfcfb55cf41f5e4027ba Author: Andreas M?ller AuthorDate: Sat Feb 1 17:37:00 2020 +0100 mozjs: port build to python3 While at it: * cleanup our patches * remove useless sed in do_configure Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../mozjs/mozjs/0001-Port-build-to-python3.patch | 6888 ++++++++++++++++++++ ...not-include-RequiredDefines.h-for-depend.patch} | 0 ...03-fix-cross-compilation-on-i586-targets.patch} | 0 ...=> 0004-do-not-create-python-environment.patch} | 0 ...-link.patch => 0005-fix-cannot-find-link.patch} | 0 ...orkaround-autoconf-2.13-detection-failed.patch} | 0 ...ch => 0007-fix-do_compile-failed-on-mips.patch} | 0 ...-support.patch => 0008-add-riscv-support.patch} | 0 ...0009-mozjs-fix-coredump-caused-by-getenv.patch} | 0 ...t-overflow.patch => 0010-format-overflow.patch} | 0 ...ch => 0011-To-fix-build-error-on-arm32BE.patch} | 0 ...S_PUBLIC_API.patch => 0012-JS_PUBLIC_API.patch} | 0 ... => 0013-riscv-Disable-atomic-operations.patch} | 0 ...ch => 0014-fallback-to-2011-C++-standard.patch} | 0 ...1-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../0001-support-musl.patch} | 0 .../0002-js-Fix-build-with-musl.patch} | 0 meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 56 +- 18 files changed, 6917 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch new file mode 100644 index 0000000..695dd97 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch @@ -0,0 +1,6888 @@ +From 33a373ba41d978af60c2f0230bcba6ad27357ec8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 29 Jan 2020 16:25:11 +0100 +Subject: [PATCH] Port build to python3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* first tool of choice was 2to3 +* some parts were taken from [1] but during work it was found that this patch + introduces interesting effects - see hash functions. Working more on this + makes me guess that one has never worked... +* Few parts were taken from upstream mirror [2]. Since they use six for porting + to python3 it adds us a new dependency. +* To get a better overview what is going on or failing some additional messages + were added. The most verbose one is left disabled - see + python/mozbuild/mozbuild/configure/__init__.py / Line 310 onwards +* major changes upstream on build are not to expect so upgrading should cause + little trouble and changes can be tracked by [3] +* some solutions are workarounds/hacks so this patch will not be accepeted + upstream. This should not be a probelme for us: once mozjs >= 68 will arrive + we have to go to rust/cargo based build anyway. + +[1] https://code.foxkit.us/adelie/packages/blob/f2b5773da19ab397fbe64fd32dacc383cfe4cd77/user/mozjs/python3.patch +[2] https://github.com/mozilla/gecko-dev +[3] https://github.com/mozilla/gecko-dev/tree/esr60 + +Upstream-Status: Inaproppriate [Some Hacks] + +Signed-off-by: Andreas M?ller +--- + build/autoconf/config.status.m4 | 2 +- + build/moz.configure/android-ndk.configure | 4 +- + build/moz.configure/checks.configure | 4 +- + build/moz.configure/init.configure | 31 +- + build/moz.configure/keyfiles.configure | 4 +- + build/moz.configure/old.configure | 32 +- + build/moz.configure/toolchain.configure | 16 +- + build/moz.configure/util.configure | 9 +- + build/moz.configure/windows.configure | 10 +- + build/templates.mozbuild | 2 +- + config/MozZipFile.py | 12 +- + config/expandlibs.py | 6 +- + config/expandlibs_exec.py | 14 +- + config/expandlibs_gen.py | 4 +- + configure.py | 42 +- + js/src/build/moz.build | 8 +- + js/src/builtin/embedjs.py | 10 +- + js/src/configure | 2 +- + js/src/frontend/GenerateReservedWords.py | 6 +- + js/src/gc/GenerateStatsPhases.py | 4 +- + js/src/old-configure.in | 2 + + memory/build/moz.build | 8 +- + mozglue/build/moz.build | 22 +- + .../mozbuild/mozbuild/action/check_binary.py | 2 + + .../mozbuild/action/process_define_files.py | 4 +- + python/mozbuild/mozbuild/backend/base.py | 8 +- + python/mozbuild/mozbuild/backend/common.py | 8 +- + .../mozbuild/backend/configenvironment.py | 14 +- + .../mozbuild/mozbuild/backend/fastermake.py | 10 +- + .../mozbuild/backend/recursivemake.py | 181 +++---- + python/mozbuild/mozbuild/config_status.py | 7 +- + .../mozbuild/mozbuild/configure/__init__.py | 83 +++- + .../mozbuild/configure/check_debug_ranges.py | 6 +- + python/mozbuild/mozbuild/configure/options.py | 24 +- + python/mozbuild/mozbuild/configure/util.py | 12 +- + .../mozbuild/mozbuild/controller/building.py | 16 +- + python/mozbuild/mozbuild/frontend/context.py | 89 ++-- + python/mozbuild/mozbuild/frontend/data.py | 8 +- + python/mozbuild/mozbuild/frontend/emitter.py | 50 +- + python/mozbuild/mozbuild/frontend/reader.py | 49 +- + python/mozbuild/mozbuild/frontend/sandbox.py | 3 +- + python/mozbuild/mozbuild/jar.py | 12 +- + python/mozbuild/mozbuild/makeutil.py | 24 +- + python/mozbuild/mozbuild/mozinfo.py | 8 +- + python/mozbuild/mozbuild/preprocessor.py | 27 +- + python/mozbuild/mozbuild/shellutil.py | 6 +- + .../test/backend/test_recursivemake.py | 18 +- + .../mozbuild/test/configure/common.py | 8 +- + .../mozbuild/mozbuild/test/configure/lint.py | 8 +- + .../test/configure/test_checks_configure.py | 8 +- + .../test/configure/test_compile_checks.py | 4 +- + .../mozbuild/test/configure/test_configure.py | 244 +++++----- + .../mozbuild/test/configure/test_lint.py | 24 +- + .../test/configure/test_moz_configure.py | 32 +- + .../mozbuild/test/configure/test_options.py | 450 +++++++++--------- + .../configure/test_toolchain_configure.py | 22 +- + .../test/configure/test_toolchain_helpers.py | 62 +-- + .../configure/test_toolkit_moz_configure.py | 2 +- + .../mozbuild/test/configure/test_util.py | 8 +- + python/mozbuild/mozbuild/testing.py | 10 +- + python/mozbuild/mozbuild/util.py | 79 ++- + python/mozbuild/mozbuild/virtualenv.py | 6 +- + python/mozbuild/mozpack/chrome/manifest.py | 6 +- + python/mozbuild/mozpack/copier.py | 12 +- + python/mozbuild/mozpack/files.py | 22 +- + python/mozbuild/mozpack/manifests.py | 16 +- + python/mozbuild/mozpack/mozjar.py | 37 +- + .../manifestparser/manifestparser/ini.py | 13 +- + .../manifestparser/manifestparser.py | 24 +- + testing/mozbase/mozinfo/mozinfo/mozinfo.py | 26 +- + .../mozprocess/mozprocess/processhandler.py | 10 +- + third_party/python/which/which.py | 18 +- + 72 files changed, 1081 insertions(+), 993 deletions(-) + +diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4 +index c75575386..543c2d682 100644 +--- a/build/autoconf/config.status.m4 ++++ b/build/autoconf/config.status.m4 +@@ -122,7 +122,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + + dnl We're going to need [ ] for python syntax. + changequote(<<<, >>>)dnl +-echo creating $CONFIG_STATUS ++echo creating $CONFIG_STATUS in `pwd` + + cat > $CONFIG_STATUS <./config.log', '>>./config.log') ++ script = script.replace(b'>./config.log', b'>>./config.log') + + with open(old_configure, 'wb') as fh: + fh.write(script) +@@ -282,8 +282,8 @@ def old_configure_options(*options): + '--x-includes', + '--x-libraries', + ) +- at imports(_from='__builtin__', _import='compile') +- at imports(_from='__builtin__', _import='open') ++ at imports(_from='builtins', _import='compile') ++ at imports(_from='builtins', _import='open') + @imports('logging') + @imports('os') + @imports('subprocess') +@@ -326,7 +326,7 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options, + log.debug('Running %s', quote(*cmd)) + if extra_env: + log.debug('with extra environment: %s', +- ' '.join('%s=%s' % pair for pair in extra_env.iteritems())) ++ ' '.join('%s=%s' % pair for pair in extra_env.items())) + + # Our logging goes to config.log, the same file old.configure uses. + # We can't share the handle on the file, so close it. We assume nothing +@@ -359,7 +359,7 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options, + # Every variation of the exec() function I tried led to: + # SyntaxError: unqualified exec is not allowed in function 'main' it + # contains a nested function with free variables +- exec code in raw_config # noqa ++ exec(code, raw_config) # noqa + + # Ensure all the flags known to old-configure appear in the + # @old_configure_options above. +@@ -393,16 +393,24 @@ def set_old_configure_define(name, value): + @depends(old_configure) + @imports('types') + def post_old_configure(raw_config): ++ log.info('post_old_configure started') ++ + for k, v in raw_config['substs']: + set_old_configure_config( +- k[1:-1], v[1:-1] if isinstance(v, types.StringTypes) else v) ++ k[1:-1], v[1:-1] if isinstance(v, str) else v) ++ ++ log.info('post_old_configure 1 finished') + +- for k, v in dict(raw_config['defines']).iteritems(): ++ for k, v in dict(raw_config['defines']).items(): + set_old_configure_define(k[1:-1], v[1:-1]) + ++ log.info('post_old_configure 2 finished') ++ + set_old_configure_config('non_global_defines', + raw_config['non_global_defines']) + ++ log.info('post_old_configure 3 finished') ++ + + # Assuming no other option is declared after this function, handle the + # env options that were injected by mozconfig_options by creating dummy +@@ -414,6 +422,7 @@ def post_old_configure(raw_config): + @imports('__sandbox__') + @imports(_from='mozbuild.configure.options', _import='Option') + def remaining_mozconfig_options(_): ++ log.info('remaining_mozconfig_options started') + helper = __sandbox__._helper + for arg in helper: + if helper._origins[arg] != 'mozconfig': +@@ -422,5 +431,6 @@ def remaining_mozconfig_options(_): + if name.isupper() and name not in __sandbox__._options: + option = Option(env=name, nargs='*', help=name) + helper.handle(option) ++ log.info('remaining_mozconfig_options finished') + + # Please do not add anything after remaining_mozconfig_options() +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index fc640c75e..c5508dfb7 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -391,7 +391,7 @@ def get_compiler_info(compiler, language): + ('CPU', CPU_preprocessor_checks), + ('KERNEL', kernel_preprocessor_checks), + ): +- for n, (value, condition) in enumerate(preprocessor_checks.iteritems()): ++ for n, (value, condition) in enumerate(preprocessor_checks.items()): + check += dedent('''\ + #%(if)s %(condition)s + %%%(name)s "%(value)s" +@@ -425,9 +425,9 @@ def get_compiler_info(compiler, language): + data = {} + for line in result.splitlines(): + if line.startswith(b'%'): +- k, _, v = line.partition(' ') +- k = k.lstrip('%') +- data[k] = v.replace(' ', '').lstrip('"').rstrip('"') ++ k, _, v = line.partition(b' ') ++ k = k.lstrip(b'%').decode('utf-8') ++ data[k] = v.replace(b' ', b'').lstrip(b'"').rstrip(b'"').decode('utf-8') + log.debug('%s = %s', k, data[k]) + + try: +@@ -551,7 +551,7 @@ def check_compiler(compiler, language, target): + ) + + +- at imports(_from='__builtin__', _import='open') ++ at imports(_from='builtins', _import='open') + @imports('json') + @imports('subprocess') + @imports('sys') +@@ -606,7 +606,7 @@ def vs_major_version(value): + + + @depends(host, target, vs_major_version, check_build_environment, '--with-visual-studio-version') +- at imports(_from='__builtin__', _import='sorted') ++ at imports(_from='builtins', _import='sorted') + @imports(_from='operator', _import='itemgetter') + @imports('platform') + def vc_compiler_path(host, target, vs_major_version, env, vs_release_name): +@@ -807,7 +807,7 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None, + target.os != 'Android': + return namespace(**{ + k: [] if k == 'flags' else v +- for k, v in other_compiler.__dict__.iteritems() ++ for k, v in other_compiler.__dict__.items() + }) + + # Normally, we'd use `var` instead of `_var`, but the interaction with +@@ -1238,7 +1238,7 @@ set_config('VISIBILITY_FLAGS', visibility_flags) + + @depends(c_compiler) + @imports('multiprocessing') +- at imports(_from='__builtin__', _import='min') ++ at imports(_from='builtins', _import='min') + def pgo_flags(compiler): + if compiler.type in ('gcc', 'clang'): + return namespace( +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 3284fd8b5..218813e2d 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -25,7 +25,6 @@ def configure_error(message): + # does not. + + +- at imports(_from='__builtin__', _import='unicode') + @imports('subprocess') + @imports('sys') + @imports(_from='mozbuild.configure.util', _import='LineIO') +@@ -39,10 +38,10 @@ def check_cmd_output(*args, **kwargs): + if 'env' in kwargs: + normalized_env = {} + for k, v in kwargs['env'].items(): +- if isinstance(k, unicode): ++ if isinstance(k, str): + k = k.encode('utf-8', 'strict') + +- if isinstance(v, unicode): ++ if isinstance(v, str): + v = v.encode('utf-8', 'strict') + + normalized_env[k] = v +@@ -285,7 +284,7 @@ def unique_list(l): + # ('19.0', 'x64', r'C:\...\amd64\cl.exe') + # ('19.0', 'x86', r'C:\...\amd64_x86\cl.exe') + @imports(_import='_winreg', _as='winreg') +- at imports(_from='__builtin__', _import='WindowsError') ++ at imports(_from='builtins', _import='WindowsError') + @imports(_from='fnmatch', _import='fnmatch') + def get_registry_values(pattern, get_32_and_64_bit=False): + def enum_helper(func, key): +@@ -360,6 +359,8 @@ def get_registry_values(pattern, get_32_and_64_bit=False): + @imports(_from='mozbuild.configure.util', _import='Version', _as='_Version') + def Version(v): + 'A version number that can be compared usefully.' ++ if isinstance(v, bytes): ++ v = v.decode('utf-8') + return _Version(v) + + # Denotes a deprecated option. Combines option() and @depends: +diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure +index a5b790e3b..2b88fc447 100644 +--- a/build/moz.configure/windows.configure ++++ b/build/moz.configure/windows.configure +@@ -10,7 +10,7 @@ option('--with-windows-version', nargs=1, default='603', + + + @depends('--with-windows-version') +- at imports(_from='__builtin__', _import='ValueError') ++ at imports(_from='builtins', _import='ValueError') + def valid_windows_version(value): + if not value: + die('Cannot build with --without-windows-version') +@@ -50,8 +50,8 @@ def windows_sdk_dir(value, host): + + @imports('os') + @imports('re') +- at imports(_from='__builtin__', _import='sorted') +- at imports(_from='__builtin__', _import='WindowsError') ++ at imports(_from='builtins', _import='sorted') ++ at imports(_from='builtins', _import='WindowsError') + def get_sdk_dirs(sdk, subdir): + def get_dirs_containing(sdk, stem, subdir): + base = os.path.join(sdk, stem) +@@ -96,7 +96,7 @@ def valid_windows_sdk_dir_result(value): + + @depends(c_compiler, windows_sdk_dir, valid_windows_version, 'WINDOWSSDKDIR') + @checking('for Windows SDK', valid_windows_sdk_dir_result) +- at imports(_from='__builtin__', _import='sorted') ++ at imports(_from='builtins', _import='sorted') + @imports(_from='textwrap', _import='dedent') + def valid_windows_sdk_dir(compiler, windows_sdk_dir, target_version, + windows_sdk_dir_env): +@@ -174,7 +174,7 @@ def valid_ucrt_sdk_dir_result(value): + @depends(windows_sdk_dir, 'WINDOWSSDKDIR', c_compiler) + @checking('for Universal CRT SDK', valid_ucrt_sdk_dir_result) + @imports('os') +- at imports(_from='__builtin__', _import='sorted') ++ at imports(_from='builtins', _import='sorted') + @imports(_import='mozpack.path', _as='mozpath') + def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler): + if windows_sdk_dir_env: +diff --git a/build/templates.mozbuild b/build/templates.mozbuild +index 3da850ce5..ae5e410fe 100644 +--- a/build/templates.mozbuild ++++ b/build/templates.mozbuild +@@ -10,7 +10,7 @@ def Binary(): + templates.''' + + # Add -llog by default, since we use it all over the place. +- if CONFIG['OS_TARGET'] == 'Android': ++ if str(CONFIG['OS_TARGET']) == 'Android': + OS_LIBS += ['log'] + + +diff --git a/config/MozZipFile.py b/config/MozZipFile.py +index 337fe0521..dc7add4c3 100644 +--- a/config/MozZipFile.py ++++ b/config/MozZipFile.py +@@ -18,7 +18,7 @@ class ZipFile(zipfile.ZipFile): + def __init__(self, file, mode="r", compression=zipfile.ZIP_STORED, + lock = False): + if lock: +- assert isinstance(file, basestring) ++ assert isinstance(file, str) + self.lockfile = lock_file(file + '.lck') + else: + self.lockfile = None +@@ -46,7 +46,7 @@ class ZipFile(zipfile.ZipFile): + date_time=time.localtime(time.time())) + zinfo.compress_type = self.compression + # Add some standard UNIX file access permissions (-rw-r--r--). +- zinfo.external_attr = (0x81a4 & 0xFFFF) << 16L ++ zinfo.external_attr = (0x81a4 & 0xFFFF) << 16 + else: + zinfo = zinfo_or_arcname + +@@ -58,7 +58,7 @@ class ZipFile(zipfile.ZipFile): + # as the old, reuse the existing entry. + + doSeek = False # store if we need to seek to the eof after overwriting +- if self.NameToInfo.has_key(zinfo.filename): ++ if zinfo.filename in self.NameToInfo: + # Find the last ZipInfo with our name. + # Last, because that's catching multiple overwrites + i = len(self.filelist) +@@ -109,14 +109,14 @@ class ZipFile(zipfile.ZipFile): + # adjust file mode if we originally just wrote, now we rewrite + self.fp.close() + self.fp = open(self.filename, 'r+b') +- all = map(lambda zi: (zi, True), self.filelist) + \ +- map(lambda zi: (zi, False), self._remove) ++ all = [(zi, True) for zi in self.filelist] + \ ++ [(zi, False) for zi in self._remove] + all.sort(lambda l, r: cmp(l[0].header_offset, r[0].header_offset)) + # empty _remove for multiple closes + self._remove = [] + + lengths = [all[i+1][0].header_offset - all[i][0].header_offset +- for i in xrange(len(all)-1)] ++ for i in range(len(all)-1)] + lengths.append(self.end - all[-1][0].header_offset) + to_pos = 0 + for (zi, keep), length in zip(all, lengths): +diff --git a/config/expandlibs.py b/config/expandlibs.py +index ac06c432f..df1fed15d 100644 +--- a/config/expandlibs.py ++++ b/config/expandlibs.py +@@ -26,7 +26,7 @@ ${LIB_PREFIX}${ROOT}.${LIB_SUFFIX} following these rules: + descriptor contains. And for each of these LIBS, also apply the same + rules. + ''' +-from __future__ import with_statement ++ + import sys, os, errno + import expandlibs_config as conf + +@@ -36,7 +36,7 @@ def ensureParentDir(file): + if dir and not os.path.exists(dir): + try: + os.makedirs(dir) +- except OSError, error: ++ except OSError as error: + if error.errno != errno.EEXIST: + raise + +@@ -140,4 +140,4 @@ class ExpandArgs(list): + return [relativize(arg)] + + if __name__ == '__main__': +- print " ".join(ExpandArgs(sys.argv[1:])) ++ print(" ".join(ExpandArgs(sys.argv[1:]))) +diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py +index df656016c..fb786a6a8 100644 +--- a/config/expandlibs_exec.py ++++ b/config/expandlibs_exec.py +@@ -20,7 +20,7 @@ With the --symbol-order argument, followed by a file name, it will add the + relevant linker options to change the order in which the linker puts the + symbols appear in the resulting binary. Only works for ELF targets. + ''' +-from __future__ import with_statement ++ + import sys + import os + from expandlibs import ( +@@ -304,11 +304,11 @@ class SectionFinder(object): + return syms + + def print_command(out, args): +- print >>out, "Executing: " + " ".join(args) ++ print("Executing: " + " ".join(args), file=out) + for tmp in [f for f in args.tmp if os.path.isfile(f)]: +- print >>out, tmp + ":" ++ print(tmp + ":", file=out) + with open(tmp) as file: +- print >>out, "".join([" " + l for l in file.readlines()]) ++ print("".join([" " + l for l in file.readlines()]), file=out) + out.flush() + + def main(args, proc_callback=None): +@@ -338,13 +338,13 @@ def main(args, proc_callback=None): + proc = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT) + if proc_callback: + proc_callback(proc) +- except Exception, e: +- print >>sys.stderr, 'error: Launching', args, ':', e ++ except Exception as e: ++ print('error: Launching', args, ':', e, file=sys.stderr) + raise e + (stdout, stderr) = proc.communicate() + if proc.returncode and not options.verbose: + print_command(sys.stderr, args) +- sys.stderr.write(stdout) ++ sys.stderr.write(stdout.decode("utf-8")) + sys.stderr.flush() + if proc.returncode: + return proc.returncode +diff --git a/config/expandlibs_gen.py b/config/expandlibs_gen.py +index b1de63cd0..dc62bd184 100644 +--- a/config/expandlibs_gen.py ++++ b/config/expandlibs_gen.py +@@ -5,7 +5,7 @@ + '''Given a list of object files and library names, prints a library + descriptor to standard output''' + +-from __future__ import with_statement ++ + import sys + import os + import expandlibs_config as conf +@@ -38,4 +38,4 @@ if __name__ == '__main__': + + ensureParentDir(options.output) + with open(options.output, 'w') as outfile: +- print >>outfile, generate(args) ++ print(generate(args), file=outfile) +diff --git a/configure.py b/configure.py +index 771e34e38..bee329d7c 100644 +--- a/configure.py ++++ b/configure.py +@@ -2,10 +2,11 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import print_function, unicode_literals ++ + + import codecs + import itertools ++import logging + import os + import sys + import textwrap +@@ -34,7 +35,9 @@ from mozbuild.util import ( + def main(argv): + config = {} + sandbox = ConfigureSandbox(config, os.environ, argv) ++ print('sandbox.run started') + sandbox.run(os.path.join(os.path.dirname(__file__), 'moz.configure')) ++ print('sandbox.run finished') + + if sandbox._help: + return 0 +@@ -56,12 +59,21 @@ def config_status(config): + + sanitized_config = {} + sanitized_config['substs'] = { +- k: sanitized_bools(v) for k, v in config.iteritems() ++ k: sanitized_bools(v) for k, v in config.items() + if k not in ('DEFINES', 'non_global_defines', 'TOPSRCDIR', 'TOPOBJDIR', + 'ALL_CONFIGURE_PATHS') + } ++ ++ # Hack around OptionValue entries unknown during compile ++ for opt in ('BUILD_BACKENDS', 'MOZ_UI_LOCALE', 'RUSTFLAGS' ): ++ old = sanitized_config['substs'][opt] ++ new = [] ++ for setting in old: ++ new.append(setting) ++ sanitized_config['substs'][opt] = new ++ + sanitized_config['defines'] = { +- k: sanitized_bools(v) for k, v in config['DEFINES'].iteritems() ++ k: sanitized_bools(v) for k, v in config['DEFINES'].items() + } + sanitized_config['non_global_defines'] = config['non_global_defines'] + sanitized_config['topsrcdir'] = config['TOPSRCDIR'] +@@ -71,20 +83,17 @@ def config_status(config): + # Create config.status. Eventually, we'll want to just do the work it does + # here, when we're able to skip configure tests/use cached results/not rely + # on autoconf. +- print("Creating config.status", file=sys.stderr) +- encoding = 'mbcs' if sys.platform == 'win32' else 'utf-8' +- with codecs.open('config.status', 'w', encoding) as fh: ++ logging.getLogger('moz.configure').info('Creating config.status') ++ with codecs.open('config.status', 'w', 'utf-8') as fh: + fh.write(textwrap.dedent('''\ + #!%(python)s +- # coding=%(encoding)s +- from __future__ import unicode_literals +- from mozbuild.util import encode +- encoding = '%(encoding)s' +- ''') % {'python': config['PYTHON'], 'encoding': encoding}) ++ # coding=utf-8 ++ print("config.status started") ++ ''') % {'python': config['PYTHON']}) + # A lot of the build backend code is currently expecting byte + # strings and breaks in subtle ways with unicode strings. (bug 1296508) +- for k, v in sanitized_config.iteritems(): +- fh.write('%s = encode(%s, encoding)\n' % (k, indented_repr(v))) ++ for k, v in sanitized_config.items(): ++ fh.write('%s = %s\n' % (k, indented_repr(v))) + fh.write("__all__ = ['topobjdir', 'topsrcdir', 'defines', " + "'non_global_defines', 'substs', 'mozconfig']") + +@@ -97,6 +106,9 @@ def config_status(config): + args = dict([(name, globals()[name]) for name in __all__]) + config_status(**args) + ''')) ++ fh.write(textwrap.dedent(''' ++ print("config.status finished") ++ ''')) + + partial_config = PartialConfigEnvironment(config['TOPOBJDIR']) + partial_config.write_vars(sanitized_config) +@@ -116,7 +128,7 @@ def config_status(config): + # executable permissions. + os.chmod('config.status', 0o755) + if config.get('MOZ_BUILD_APP') != 'js' or config.get('JS_STANDALONE'): +- os.environ[b'WRITE_MOZINFO'] = b'1' ++ os.environ['WRITE_MOZINFO'] = '1' + from mozbuild.config_status import config_status + + # Some values in sanitized_config also have more complex types, such as +@@ -127,7 +139,7 @@ def config_status(config): + + # A lot of the build backend code is currently expecting byte strings + # and breaks in subtle ways with unicode strings. +- return config_status(args=[], **encode(sanitized_config, encoding)) ++ return config_status(args=[], **sanitized_config) + return 0 + + +diff --git a/js/src/build/moz.build b/js/src/build/moz.build +index a7f5fa4ce..856cae32d 100644 +--- a/js/src/build/moz.build ++++ b/js/src/build/moz.build +@@ -47,22 +47,22 @@ USE_LIBS += [ + 'zlib', + ] + +-if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'): ++if str(CONFIG['OS_ARCH']) not in ('WINNT', 'HP-UX'): + OS_LIBS += [ + 'm', + ] + +-if CONFIG['OS_ARCH'] == 'FreeBSD': ++if str(CONFIG['OS_ARCH']) == 'FreeBSD': + OS_LIBS += [ + '-pthread', + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if str(CONFIG['OS_ARCH']) == 'Linux': + OS_LIBS += [ + 'dl', + ] + +-if CONFIG['OS_ARCH'] == 'SunOS': ++if str(CONFIG['OS_ARCH']) == 'SunOS': + OS_LIBS += [ + 'posix4', + 'dl', +diff --git a/js/src/builtin/embedjs.py b/js/src/builtin/embedjs.py +index ba25e71c1..d4f2de122 100644 +--- a/js/src/builtin/embedjs.py ++++ b/js/src/builtin/embedjs.py +@@ -36,7 +36,7 @@ + # + # It uses the C preprocessor to process its inputs. + +-from __future__ import with_statement ++ + import re, sys, os, subprocess + import shlex + import which +@@ -52,8 +52,8 @@ def ToCAsciiArray(lines): + + def ToCArray(lines): + result = [] +- for chr in lines: +- result.append(str(ord(chr))) ++ for char in lines: ++ result.append("0x%0.2X" % char) + return ", ".join(result) + + HEADER_TEMPLATE = """\ +@@ -87,7 +87,7 @@ def embed(cxx, preprocessorOption, cppflags, msgs, sources, c_out, js_out, names + + js_out.write(processed) + import zlib +- compressed = zlib.compress(processed) ++ compressed = zlib.compress(processed.encode('utf-8')) + data = ToCArray(compressed) + c_out.write(HEADER_TEMPLATE % { + 'sources_type': 'unsigned char', +@@ -107,7 +107,7 @@ def preprocess(cxx, preprocessorOption, source, args = []): + tmpOut = 'self-hosting-preprocessed.pp'; + outputArg = shlex.split(preprocessorOption + tmpOut) + +- with open(tmpIn, 'wb') as input: ++ with open(tmpIn, 'w') as input: + input.write(source) + print(' '.join(cxx + outputArg + args + [tmpIn])) + result = subprocess.Popen(cxx + outputArg + args + [tmpIn]).wait() +diff --git a/js/src/configure b/js/src/configure +index 3b3a39af3..8f5ea41d0 100755 +--- a/js/src/configure ++++ b/js/src/configure +@@ -24,4 +24,4 @@ export OLD_CONFIGURE="$SRCDIR"/old-configure + + set -- "$@" --enable-project=js + +-which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" ++which python3 > /dev/null && exec python3 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" +diff --git a/js/src/frontend/GenerateReservedWords.py b/js/src/frontend/GenerateReservedWords.py +index 3aa2307b9..381c8e2b4 100644 +--- a/js/src/frontend/GenerateReservedWords.py ++++ b/js/src/frontend/GenerateReservedWords.py +@@ -80,14 +80,14 @@ def split_list_per_column(reserved_word_list, column): + per_column = column_dict.setdefault(word[column], []) + per_column.append(item) + +- return sorted(column_dict.items(), key=lambda (char, word): ord(char)) ++ return sorted(list(column_dict.items()), key=lambda char_word: ord(char_word[0])) + + def generate_letter_switch(opt, unprocessed_columns, reserved_word_list, + columns=None): + assert(len(reserved_word_list) != 0); + + if not columns: +- columns = range(0, unprocessed_columns) ++ columns = list(range(0, unprocessed_columns)) + + if len(reserved_word_list) == 1: + index, word = reserved_word_list[0] +@@ -161,7 +161,7 @@ def split_list_per_length(reserved_word_list): + per_length = length_dict.setdefault(len(word), []) + per_length.append(item) + +- return sorted(length_dict.items(), key=lambda (length, word): length) ++ return sorted(list(length_dict.items()), key=lambda length_word: length_word[0]) + + def generate_switch(opt, reserved_word_list): + assert(len(reserved_word_list) != 0); +diff --git a/js/src/gc/GenerateStatsPhases.py b/js/src/gc/GenerateStatsPhases.py +index 2daf83555..e39a26a4b 100644 +--- a/js/src/gc/GenerateStatsPhases.py ++++ b/js/src/gc/GenerateStatsPhases.py +@@ -267,7 +267,7 @@ def generateHeader(out): + # + # Generate PhaseKind enum. + # +- phaseKindNames = map(lambda phaseKind: phaseKind.name, AllPhaseKinds) ++ phaseKindNames = [phaseKind.name for phaseKind in AllPhaseKinds] + extraPhaseKinds = [ + "NONE = LIMIT", + "EXPLICIT_SUSPENSION = LIMIT", +@@ -279,7 +279,7 @@ def generateHeader(out): + # + # Generate Phase enum. + # +- phaseNames = map(lambda phase: phase.name, AllPhases) ++ phaseNames = [phase.name for phase in AllPhases] + extraPhases = [ + "NONE = LIMIT", + "EXPLICIT_SUSPENSION = LIMIT", +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 11c3d5a2e..389265404 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1884,3 +1884,5 @@ if test "$JS_STANDALONE"; then + fi + + rm -fr confdefs* $ac_clean_files ++echo confdefs* $ac_clean_files removed ++echo "old-configure done" +diff --git a/memory/build/moz.build b/memory/build/moz.build +index e2c715271..f09ce7935 100644 +--- a/memory/build/moz.build ++++ b/memory/build/moz.build +@@ -30,7 +30,7 @@ else: + 'fallback.cpp', + ] + +-if CONFIG['OS_TARGET'] == 'Darwin' and (CONFIG['MOZ_REPLACE_MALLOC'] or ++if str(CONFIG['OS_TARGET']) == 'Darwin' and (CONFIG['MOZ_REPLACE_MALLOC'] or + CONFIG['MOZ_MEMORY']): + SOURCES += [ + 'zone.c', +@@ -38,15 +38,15 @@ if CONFIG['OS_TARGET'] == 'Darwin' and (CONFIG['MOZ_REPLACE_MALLOC'] or + + Library('memory') + +-if CONFIG['OS_TARGET'] == 'Android' and CONFIG['CC_TYPE'] == 'clang': ++if str(CONFIG['OS_TARGET']) == 'Android' and str(CONFIG['CC_TYPE']) == 'clang': + CXXFLAGS += [ + '-Wno-tautological-pointer-compare', + ] + +-if CONFIG['MOZ_BUILD_APP'] != 'memory': ++if str(CONFIG['MOZ_BUILD_APP']) != 'memory': + FINAL_LIBRARY = 'mozglue' + +-if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'): ++if str(CONFIG['CC_TYPE']) in ('msvc', 'clang-cl'): + CXXFLAGS += ['-wd4273'] # inconsistent dll linkage (bug 558163) + + if CONFIG['MOZ_REPLACE_MALLOC_STATIC']: +diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build +index 53758485a..5e9308802 100644 +--- a/mozglue/build/moz.build ++++ b/mozglue/build/moz.build +@@ -9,12 +9,12 @@ + # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in + if CONFIG['JS_STANDALONE'] and not CONFIG['MOZ_MEMORY']: + Library('mozglue') +-elif CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): ++elif str(CONFIG['OS_TARGET']) in ('WINNT', 'Darwin', 'Android'): + SharedLibrary('mozglue') + else: + Library('mozglue') + +-if CONFIG['OS_TARGET'] == 'Android': ++if str(CONFIG['OS_TARGET']) == 'Android': + SOURCES += [ + 'BionicGlue.cpp', + ] +@@ -24,14 +24,14 @@ if CONFIG['MOZ_ASAN']: + 'AsanOptions.cpp', + ] + +-if CONFIG['OS_TARGET'] == 'WINNT': ++if str(CONFIG['OS_TARGET']) == 'WINNT': + DEFFILE = 'mozglue.def' + # We'll break the DLL blocklist if we immediately load user32.dll + DELAYLOAD_DLLS += [ + 'user32.dll', + ] + +- if CONFIG['CC_TYPE'] == "msvc": ++ if str(CONFIG['CC_TYPE']) == "msvc": + CFLAGS += ['-guard:cf'] + CXXFLAGS += ['-guard:cf'] + LDFLAGS += ['-guard:cf'] +@@ -48,12 +48,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT']: + 'dummy.cpp', + ] + +- if CONFIG['OS_TARGET'] == 'WINNT': ++ if str(CONFIG['OS_TARGET']) == 'WINNT': + LOCAL_INCLUDES += [ + '/memory/build', + ] + +- if CONFIG['CC_TYPE'] == "msvc": ++ if str(CONFIG['CC_TYPE']) == "msvc": + SOURCES += ['WindowsCFGStatus.cpp'] + SOURCES += [ + 'Authenticode.cpp', +@@ -85,17 +85,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT']: + 'WindowsDllBlocklist.h', + ] + +- if CONFIG['CPU_ARCH'].startswith('x86'): ++ if str(CONFIG['CPU_ARCH']).startswith('x86'): + SOURCES += [ + 'SSE.cpp', + ] + +- if CONFIG['CPU_ARCH'] == 'arm': ++ if str(CONFIG['CPU_ARCH']) == 'arm': + SOURCES += [ + 'arm.cpp', + ] + +- if CONFIG['CPU_ARCH'].startswith('mips'): ++ if str(CONFIG['CPU_ARCH']).startswith('mips'): + SOURCES += [ + 'mips.cpp', + ] +@@ -114,7 +114,7 @@ LIBRARY_DEFINES['MOZ_HAS_MOZGLUE'] = True + + LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS'] + +-if CONFIG['OS_TARGET'] == 'Darwin': ++if str(CONFIG['OS_TARGET']) == 'Darwin': + # On OSX 10.10.3, a dead lock happens in some cases involving dynamic + # symbol resolution for symbols that jemalloc itself uses. While it + # might be possible to find a way to avoid all such symbol resolutions, +@@ -124,7 +124,7 @@ if CONFIG['OS_TARGET'] == 'Darwin': + # for TLS. + LDFLAGS += ['-Wl,-bind_at_load'] + +-if CONFIG['MOZ_LINKER'] and CONFIG['TARGET_CPU'] == 'arm': ++if CONFIG['MOZ_LINKER'] and str(CONFIG['TARGET_CPU']) == 'arm': + LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR] + + DIST_INSTALL = True +diff --git a/python/mozbuild/mozbuild/action/check_binary.py b/python/mozbuild/mozbuild/action/check_binary.py +index 5665ef053..b696f73d6 100644 +--- a/python/mozbuild/mozbuild/action/check_binary.py ++++ b/python/mozbuild/mozbuild/action/check_binary.py +@@ -104,6 +104,8 @@ def iter_readelf_symbols(target, binary): + + def iter_readelf_dynamic(target, binary): + for line in get_output(target['readelf'], '-d', binary): ++ if isinstance(line, bytes): ++ line=line.decode('utf-8') + data = line.split(None, 2) + if data and len(data) == 3 and data[0].startswith('0x'): + yield data[1].rstrip(')').lstrip('('), data[2] +diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py +index 563fbb8fa..c3df2869b 100644 +--- a/python/mozbuild/mozbuild/action/process_define_files.py ++++ b/python/mozbuild/mozbuild/action/process_define_files.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import argparse + import os +@@ -53,7 +53,7 @@ def process_define_file(output, input): + 'CONFIGURE_DEFINE_FILE') + defines = '\n'.join(sorted( + '#define %s %s' % (name, val) +- for name, val in config.defines['ALLDEFINES'].iteritems())) ++ for name, val in config.defines['ALLDEFINES'].items())) + l = l[:m.start('cmd') - 1] \ + + defines + l[m.end('name'):] + elif cmd == 'define': +diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py +index a8d5c94e0..7cda63475 100644 +--- a/python/mozbuild/mozbuild/backend/base.py ++++ b/python/mozbuild/mozbuild/backend/base.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + from abc import ( + ABCMeta, +@@ -31,7 +31,7 @@ from .configenvironment import ConfigEnvironment + from mozbuild.base import ExecutionSummary + + +-class BuildBackend(LoggingMixin): ++class BuildBackend(LoggingMixin, metaclass=ABCMeta): + """Abstract base class for build backends. + + A build backend is merely a consumer of the build configuration (the output +@@ -39,8 +39,6 @@ class BuildBackend(LoggingMixin): + is the discretion of the specific implementation. + """ + +- __metaclass__ = ABCMeta +- + def __init__(self, environment): + assert isinstance(environment, (ConfigEnvironment, EmptyConfig)) + self.populate_logger() +@@ -311,7 +309,7 @@ class BuildBackend(LoggingMixin): + srcdir = mozpath.dirname(obj.input_path) + pp.context.update({ + k: ' '.join(v) if isinstance(v, list) else v +- for k, v in obj.config.substs.iteritems() ++ for k, v in obj.config.substs.items() + }) + pp.context.update( + top_srcdir=obj.topsrcdir, +diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py +index d00cbbcaf..f747df446 100644 +--- a/python/mozbuild/mozbuild/backend/common.py ++++ b/python/mozbuild/mozbuild/backend/common.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import json + import os +@@ -174,7 +174,7 @@ class CommonBackend(BuildBackend): + if len(self._idl_manager.idls): + self._write_rust_xpidl_summary(self._idl_manager) + self._handle_idl_manager(self._idl_manager) +- self._handle_generated_sources(mozpath.join(self.environment.topobjdir, 'dist/include/%s.h' % idl['root']) for idl in self._idl_manager.idls.values()) ++ self._handle_generated_sources(mozpath.join(self.environment.topobjdir, 'dist/include/%s.h' % idl['root']) for idl in list(self._idl_manager.idls.values())) + + + for config in self._configs: +@@ -372,14 +372,14 @@ class CommonBackend(BuildBackend): + + with self._write_file(mozpath.join(topobjdir, 'dist', 'xpcrs', 'rt', 'all.rs')) as fh: + fh.write("// THIS FILE IS GENERATED - DO NOT EDIT\n\n") +- for idl in manager.idls.values(): ++ for idl in list(manager.idls.values()): + fh.write(include_tmpl % ("rt", idl['root'])) + fh.write(";\n") + + with self._write_file(mozpath.join(topobjdir, 'dist', 'xpcrs', 'bt', 'all.rs')) as fh: + fh.write("// THIS FILE IS GENERATED - DO NOT EDIT\n\n") + fh.write("&[\n") +- for idl in manager.idls.values(): ++ for idl in list(manager.idls.values()): + fh.write(include_tmpl % ("bt", idl['root'])) + fh.write(",\n") + fh.write("]\n") +diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py +index 3676a7d18..f0896cea4 100644 +--- a/python/mozbuild/mozbuild/backend/configenvironment.py ++++ b/python/mozbuild/mozbuild/backend/configenvironment.py +@@ -2,14 +2,14 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import os + import sys + import json + + from collections import Iterable, OrderedDict +-from types import StringTypes, ModuleType ++from types import ModuleType + + import mozpack.path as mozpath + +@@ -22,7 +22,7 @@ from mozbuild.shellutil import quote as shell_quote + + + if sys.version_info.major == 2: +- text_type = unicode ++ text_type = str + else: + text_type = str + +@@ -151,7 +151,7 @@ class ConfigEnvironment(object): + shell_quote(self.defines[name]).replace('$', '$$')) + for name in sorted(global_defines)]) + def serialize(name, obj): +- if isinstance(obj, StringTypes): ++ if isinstance(obj, str): + return obj + if isinstance(obj, Iterable): + return ' '.join(obj) +@@ -185,8 +185,8 @@ class ConfigEnvironment(object): + except UnicodeDecodeError: + return v.decode('utf-8', 'replace') + +- for k, v in self.substs.items(): +- if not isinstance(v, StringTypes): ++ for k, v in list(self.substs.items()): ++ if not isinstance(v, str): + if isinstance(v, Iterable): + type(v)(decode(i) for i in v) + elif not isinstance(v, text_type): +@@ -255,7 +255,7 @@ class PartialConfigDict(object): + existing_files = self._load_config_track() + + new_files = set() +- for k, v in values.iteritems(): ++ for k, v in values.items(): + new_files.add(self._write_file(k, v)) + + for filename in existing_files - new_files: +diff --git a/python/mozbuild/mozbuild/backend/fastermake.py b/python/mozbuild/mozbuild/backend/fastermake.py +index b029aa10f..b66ade64f 100644 +--- a/python/mozbuild/mozbuild/backend/fastermake.py ++++ b/python/mozbuild/mozbuild/backend/fastermake.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals, print_function ++ + + from mozbuild.backend.base import PartialBackend + from mozbuild.backend.common import CommonBackend +@@ -140,7 +140,7 @@ class FasterMakeBackend(CommonBackend, PartialBackend): + # Add information for chrome manifest generation + manifest_targets = [] + +- for target, entries in self._manifest_entries.iteritems(): ++ for target, entries in self._manifest_entries.items(): + manifest_targets.append(target) + install_target = mozpath.basedir(target, install_manifests_bases) + self._install_manifests[install_target].add_content( +@@ -152,13 +152,13 @@ class FasterMakeBackend(CommonBackend, PartialBackend): + % ' '.join(self._install_manifests.keys())) + + # Add dependencies we infered: +- for target, deps in self._dependencies.iteritems(): ++ for target, deps in self._dependencies.items(): + mk.create_rule([target]).add_dependencies( + '$(TOPOBJDIR)/%s' % d for d in deps) + + mk.add_statement('include $(TOPSRCDIR)/config/faster/rules.mk') + +- for base, install_manifest in self._install_manifests.iteritems(): ++ for base, install_manifest in self._install_manifests.items(): + with self._write_file( + mozpath.join(self.environment.topobjdir, 'faster', + 'install_%s' % base.replace('/', '_'))) as fh: +@@ -167,7 +167,7 @@ class FasterMakeBackend(CommonBackend, PartialBackend): + # For artifact builds only, write a single unified manifest for consumption by |mach watch|. + if self.environment.is_artifact_build: + unified_manifest = InstallManifest() +- for base, install_manifest in self._install_manifests.iteritems(): ++ for base, install_manifest in self._install_manifests.items(): + # Expect 'dist/bin/**', which includes 'dist/bin' with no trailing slash. + assert base.startswith('dist/bin') + base = base[len('dist/bin'):] +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index dd9020d62..aa89cc297 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import logging + import os +@@ -12,7 +12,7 @@ from collections import ( + defaultdict, + namedtuple, + ) +-from StringIO import StringIO ++from io import StringIO + from itertools import chain + + from mozpack.manifests import ( +@@ -80,75 +80,76 @@ from ..util import ( + ) + from ..makeutil import Makefile + from mozbuild.shellutil import quote as shell_quote ++from functools import reduce + + MOZBUILD_VARIABLES = [ +- b'ASFLAGS', +- b'CMSRCS', +- b'CMMSRCS', +- b'CPP_UNIT_TESTS', +- b'DIRS', +- b'DIST_INSTALL', +- b'EXTRA_DSO_LDOPTS', +- b'EXTRA_JS_MODULES', +- b'EXTRA_PP_COMPONENTS', +- b'EXTRA_PP_JS_MODULES', +- b'FORCE_SHARED_LIB', +- b'FORCE_STATIC_LIB', +- b'FINAL_LIBRARY', +- b'HOST_CFLAGS', +- b'HOST_CSRCS', +- b'HOST_CMMSRCS', +- b'HOST_CXXFLAGS', +- b'HOST_EXTRA_LIBS', +- b'HOST_LIBRARY_NAME', +- b'HOST_PROGRAM', +- b'HOST_SIMPLE_PROGRAMS', +- b'JAR_MANIFEST', +- b'JAVA_JAR_TARGETS', +- b'LIBRARY_NAME', +- b'LIBS', +- b'MAKE_FRAMEWORK', +- b'MODULE', +- b'NO_DIST_INSTALL', +- b'NO_EXPAND_LIBS', +- b'NO_INTERFACES_MANIFEST', +- b'NO_JS_MANIFEST', +- b'OS_LIBS', +- b'PARALLEL_DIRS', +- b'PREF_JS_EXPORTS', +- b'PROGRAM', +- b'RESOURCE_FILES', +- b'SHARED_LIBRARY_LIBS', +- b'SHARED_LIBRARY_NAME', +- b'SIMPLE_PROGRAMS', +- b'SONAME', +- b'STATIC_LIBRARY_NAME', +- b'TEST_DIRS', +- b'TOOL_DIRS', ++ 'ASFLAGS', ++ 'CMSRCS', ++ 'CMMSRCS', ++ 'CPP_UNIT_TESTS', ++ 'DIRS', ++ 'DIST_INSTALL', ++ 'EXTRA_DSO_LDOPTS', ++ 'EXTRA_JS_MODULES', ++ 'EXTRA_PP_COMPONENTS', ++ 'EXTRA_PP_JS_MODULES', ++ 'FORCE_SHARED_LIB', ++ 'FORCE_STATIC_LIB', ++ 'FINAL_LIBRARY', ++ 'HOST_CFLAGS', ++ 'HOST_CSRCS', ++ 'HOST_CMMSRCS', ++ 'HOST_CXXFLAGS', ++ 'HOST_EXTRA_LIBS', ++ 'HOST_LIBRARY_NAME', ++ 'HOST_PROGRAM', ++ 'HOST_SIMPLE_PROGRAMS', ++ 'JAR_MANIFEST', ++ 'JAVA_JAR_TARGETS', ++ 'LIBRARY_NAME', ++ 'LIBS', ++ 'MAKE_FRAMEWORK', ++ 'MODULE', ++ 'NO_DIST_INSTALL', ++ 'NO_EXPAND_LIBS', ++ 'NO_INTERFACES_MANIFEST', ++ 'NO_JS_MANIFEST', ++ 'OS_LIBS', ++ 'PARALLEL_DIRS', ++ 'PREF_JS_EXPORTS', ++ 'PROGRAM', ++ 'RESOURCE_FILES', ++ 'SHARED_LIBRARY_LIBS', ++ 'SHARED_LIBRARY_NAME', ++ 'SIMPLE_PROGRAMS', ++ 'SONAME', ++ 'STATIC_LIBRARY_NAME', ++ 'TEST_DIRS', ++ 'TOOL_DIRS', + # XXX config/Makefile.in specifies this in a make invocation + #'USE_EXTENSION_MANIFEST', +- b'XPCSHELL_TESTS', +- b'XPIDL_MODULE', ++ 'XPCSHELL_TESTS', ++ 'XPIDL_MODULE', + ] + + DEPRECATED_VARIABLES = [ +- b'EXPORT_LIBRARY', +- b'EXTRA_LIBS', +- b'HOST_LIBS', +- b'LIBXUL_LIBRARY', +- b'MOCHITEST_A11Y_FILES', +- b'MOCHITEST_BROWSER_FILES', +- b'MOCHITEST_BROWSER_FILES_PARTS', +- b'MOCHITEST_CHROME_FILES', +- b'MOCHITEST_FILES', +- b'MOCHITEST_FILES_PARTS', +- b'MOCHITEST_METRO_FILES', +- b'MOCHITEST_ROBOCOP_FILES', +- b'MODULE_OPTIMIZE_FLAGS', +- b'MOZ_CHROME_FILE_FORMAT', +- b'SHORT_LIBNAME', +- b'TESTING_JS_MODULES', +- b'TESTING_JS_MODULE_DIR', ++ 'EXPORT_LIBRARY', ++ 'EXTRA_LIBS', ++ 'HOST_LIBS', ++ 'LIBXUL_LIBRARY', ++ 'MOCHITEST_A11Y_FILES', ++ 'MOCHITEST_BROWSER_FILES', ++ 'MOCHITEST_BROWSER_FILES_PARTS', ++ 'MOCHITEST_CHROME_FILES', ++ 'MOCHITEST_FILES', ++ 'MOCHITEST_FILES_PARTS', ++ 'MOCHITEST_METRO_FILES', ++ 'MOCHITEST_ROBOCOP_FILES', ++ 'MODULE_OPTIMIZE_FLAGS', ++ 'MOZ_CHROME_FILE_FORMAT', ++ 'SHORT_LIBNAME', ++ 'TESTING_JS_MODULES', ++ 'TESTING_JS_MODULE_DIR', + ] + + MOZBUILD_VARIABLES_MESSAGE = 'It should only be defined in moz.build files.' +@@ -207,7 +208,7 @@ class BackendMakeFile(object): + self.fh.write(buf) + + def write_once(self, buf): +- if isinstance(buf, unicode): ++ if isinstance(buf, str): + buf = buf.encode('utf-8') + if b'\n' + buf not in self.fh.getvalue(): + self.write(buf) +@@ -280,7 +281,7 @@ class RecursiveMakeTraversal(object): + Helper function to call a filter from compute_dependencies and + traverse. + """ +- return filter(current, self.get_subdirs(current)) ++ return list(filter(current, self.get_subdirs(current))) + + def compute_dependencies(self, filter=None): + """ +@@ -710,7 +711,7 @@ class RecursiveMakeBackend(CommonBackend): + convenience variables, and the other dependency definitions for a + hopefully proper directory traversal. + """ +- for tier, no_skip in self._no_skip.items(): ++ for tier, no_skip in list(self._no_skip.items()): + self.log(logging.DEBUG, 'fill_root_mk', { + 'number': len(no_skip), 'tier': tier + }, 'Using {number} directories during {tier}') +@@ -757,7 +758,7 @@ class RecursiveMakeBackend(CommonBackend): + for tier, filter in filters: + main, all_deps = \ + self._traversal.compute_dependencies(filter) +- for dir, deps in all_deps.items(): ++ for dir, deps in list(all_deps.items()): + if deps is not None or (dir in self._idl_dirs \ + and tier == 'export'): + rule = root_deps_mk.create_rule(['%s/%s' % (dir, tier)]) +@@ -770,7 +771,7 @@ class RecursiveMakeBackend(CommonBackend): + rule.add_dependencies('%s/%s' % (d, tier) for d in main) + + all_compile_deps = reduce(lambda x,y: x|y, +- self._compile_graph.values()) if self._compile_graph else set() ++ list(self._compile_graph.values())) if self._compile_graph else set() + # Include the following as dependencies of the top recursion target for + # compilation: + # - nodes that are not dependended upon by anything. Typically, this +@@ -783,7 +784,7 @@ class RecursiveMakeBackend(CommonBackend): + # as direct dependencies of the top recursion target, to somehow + # prioritize them. + # 1. See bug 1262241 comment 5. +- compile_roots = [t for t, deps in self._compile_graph.iteritems() ++ compile_roots = [t for t, deps in list(self._compile_graph.items()) + if not deps or t not in all_compile_deps] + + rule = root_deps_mk.create_rule(['recurse_compile']) +@@ -845,14 +846,14 @@ class RecursiveMakeBackend(CommonBackend): + rule.add_dependencies(['$(CURDIR)/%: %']) + + def _check_blacklisted_variables(self, makefile_in, makefile_content): +- if b'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content: ++ if 'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content: + # Bypass the variable restrictions for externally managed makefiles. + return + + for l in makefile_content.splitlines(): + l = l.strip() + # Don't check comments +- if l.startswith(b'#'): ++ if l.startswith('#'): + continue + for x in chain(MOZBUILD_VARIABLES, DEPRECATED_VARIABLES): + if x not in l: +@@ -909,11 +910,11 @@ class RecursiveMakeBackend(CommonBackend): + # Directories with a Makefile containing a tools target, or + # XPI_PKGNAME or INSTALL_EXTENSION_ID can't be skipped and + # must run during the 'tools' tier. +- for t in (b'XPI_PKGNAME', b'INSTALL_EXTENSION_ID', +- b'tools'): ++ for t in ('XPI_PKGNAME', 'INSTALL_EXTENSION_ID', ++ 'tools'): + if t not in content: + continue +- if t == b'tools' and not re.search('(?:^|\s)tools.*::', content, re.M): ++ if t == 'tools' and not re.search('(?:^|\s)tools.*::', content, re.M): + continue + if objdir == self.environment.topobjdir: + continue +@@ -933,7 +934,7 @@ class RecursiveMakeBackend(CommonBackend): + self._fill_root_mk() + + # Make the master test manifest files. +- for flavor, t in self._test_manifests.items(): ++ for flavor, t in list(self._test_manifests.items()): + install_prefix, manifests = t + manifest_stem = mozpath.join(install_prefix, '%s.ini' % flavor) + self._write_master_test_manifest(mozpath.join( +@@ -1039,7 +1040,7 @@ class RecursiveMakeBackend(CommonBackend): + for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done'): + build_files.add_optional_exists(p) + +- for idl in manager.idls.values(): ++ for idl in list(manager.idls.values()): + self._install_manifests['dist_idl'].add_link(idl['source'], + idl['basename']) + self._install_manifests['dist_include'].add_optional_exists('%s.h' +@@ -1086,7 +1087,7 @@ class RecursiveMakeBackend(CommonBackend): + + interfaces_manifests = [] + dist_dir = mozpath.join(self.environment.topobjdir, 'dist') +- for manifest, entries in manager.interface_manifests.items(): ++ for manifest, entries in list(manager.interface_manifests.items()): + interfaces_manifests.append(mozpath.join('$(DEPTH)', manifest)) + for xpt in sorted(entries): + registered_xpt_files.add(mozpath.join( +@@ -1194,7 +1195,7 @@ class RecursiveMakeBackend(CommonBackend): + # Don't allow files to be defined multiple times unless it is allowed. + # We currently allow duplicates for non-test files or test files if + # the manifest is listed as a duplicate. +- for source, (dest, is_test) in obj.installs.items(): ++ for source, (dest, is_test) in list(obj.installs.items()): + try: + self._install_manifests['_test_files'].add_link(source, dest) + except ValueError: +@@ -1558,7 +1559,7 @@ class RecursiveMakeBackend(CommonBackend): + man_dir = mozpath.join(self.environment.topobjdir, '_build_manifests', + dest) + +- for k, manifest in manifests.items(): ++ for k, manifest in list(manifests.items()): + with self._write_file(mozpath.join(man_dir, k)) as fh: + manifest.write(fileobj=fh) + +@@ -1593,20 +1594,20 @@ class RecursiveMakeBackend(CommonBackend): + pp.context.update(extra) + if not pp.context.get('autoconfmk', ''): + pp.context['autoconfmk'] = 'autoconf.mk' +- pp.handleLine(b'# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n'); +- pp.handleLine(b'DEPTH := @DEPTH@\n') +- pp.handleLine(b'topobjdir := @topobjdir@\n') +- pp.handleLine(b'topsrcdir := @top_srcdir@\n') +- pp.handleLine(b'srcdir := @srcdir@\n') +- pp.handleLine(b'VPATH := @srcdir@\n') +- pp.handleLine(b'relativesrcdir := @relativesrcdir@\n') +- pp.handleLine(b'include $(DEPTH)/config/@autoconfmk@\n') ++ pp.handleLine('# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n'); ++ pp.handleLine('DEPTH := @DEPTH@\n') ++ pp.handleLine('topobjdir := @topobjdir@\n') ++ pp.handleLine('topsrcdir := @top_srcdir@\n') ++ pp.handleLine('srcdir := @srcdir@\n') ++ pp.handleLine('VPATH := @srcdir@\n') ++ pp.handleLine('relativesrcdir := @relativesrcdir@\n') ++ pp.handleLine('include $(DEPTH)/config/@autoconfmk@\n') + if not stub: + pp.do_include(obj.input_path) + # Empty line to avoid failures when last line in Makefile.in ends + # with a backslash. +- pp.handleLine(b'\n') +- pp.handleLine(b'include $(topsrcdir)/config/recurse.mk\n') ++ pp.handleLine('\n') ++ pp.handleLine('include $(topsrcdir)/config/recurse.mk\n') + if not stub: + # Adding the Makefile.in here has the desired side-effect + # that if the Makefile.in disappears, this will force +diff --git a/python/mozbuild/mozbuild/config_status.py b/python/mozbuild/mozbuild/config_status.py +index d46f1332d..a9a27a699 100644 +--- a/python/mozbuild/mozbuild/config_status.py ++++ b/python/mozbuild/mozbuild/config_status.py +@@ -77,6 +77,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + See build/autoconf/config.status.m4. + ''' + ++ print("config_status started") + if 'CONFIG_FILES' in os.environ: + raise Exception('Using the CONFIG_FILES environment variable is not ' + 'supported.') +@@ -119,7 +120,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + if 'WRITE_MOZINFO' in os.environ: + write_mozinfo(os.path.join(topobjdir, 'mozinfo.json'), env, os.environ) + +- cpu_start = time.clock() ++ cpu_start = time.perf_counter() + time_start = time.time() + + # Make appropriate backend instances, defaulting to RecursiveMakeBackend, +@@ -155,7 +156,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + summary = obj.gyp_summary() + print(summary, file=sys.stderr) + +- cpu_time = time.clock() - cpu_start ++ cpu_time = time.perf_counter() - cpu_start + wall_time = time.time() - time_start + efficiency = cpu_time / wall_time if wall_time else 100 + untracked = wall_time - execution_time +@@ -179,3 +180,5 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None, + # Advertise Android Studio if it is appropriate. + if MachCommandConditions.is_android(env): + print(ANDROID_IDE_ADVERTISEMENT) ++ ++ print("config_status finished") +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index d03615707..13d623d4f 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -2,9 +2,9 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals + +-import __builtin__ ++ ++import builtins + import inspect + import logging + import os +@@ -38,6 +38,8 @@ from mozbuild.util import ( + + import mozpack.path as mozpath + ++import traceback ++ + + class ConfigureError(Exception): + pass +@@ -69,7 +71,7 @@ class SandboxDependsFunction(object): + def __getattr__(self, key): + return self._getattr(key).sandboxed + +- def __nonzero__(self): ++ def __bool__(self): + raise ConfigureError( + 'Cannot do boolean operations on @depends functions.') + +@@ -96,6 +98,7 @@ class DependsFunction(object): + sandbox._value_for(self) + elif not sandbox._help: + sandbox._execution_queue.append((sandbox._value_for, (self,))) ++ sandbox.tasks_debug_out("DependsFunction.__init %s" % func.__name__) + + @property + def name(self): +@@ -206,6 +209,15 @@ class CombinedDependsFunction(DependsFunction): + def __ne__(self, other): + return not self == other + ++ def __hash__(self): ++ # This was one was taken from [1] initially. Should not have done that: ++ # it causes explosion of ConfigureSandbox._execution_queue with 100% ++ # CPU load and eating all avaliable memory... ++ # ++ # [1] https://code.foxkit.us/adelie/packages/blob/f2b5773da19ab397fbe64fd32dacc383cfe4cd77/user/mozjs/python3.patch#L8068 ++ return hash((self._name, tuple(self.dependencies))) ++ ++ + class SandboxedGlobal(dict): + '''Identifiable dict type for use as function global''' + +@@ -253,11 +265,12 @@ class ConfigureSandbox(dict): + # The default set of builtins. We expose unicode as str to make sandboxed + # files more python3-ready. + BUILTINS = ReadOnlyDict({ +- b: getattr(__builtin__, b) ++ b: getattr(builtins, b) + for b in ('None', 'False', 'True', 'int', 'bool', 'any', 'all', 'len', + 'list', 'tuple', 'set', 'dict', 'isinstance', 'getattr', +- 'hasattr', 'enumerate', 'range', 'zip') +- }, __import__=forbidden_import, str=unicode) ++ 'hasattr', 'enumerate', 'range', 'zip', '__build_class__', ++ 'bytes', 'exec') ++ }, __import__=forbidden_import, str=str) + + # Expose a limited set of functions from os.path + OS = ReadOnlyNamespace(path=ReadOnlyNamespace(**{ +@@ -294,6 +307,11 @@ class ConfigureSandbox(dict): + # Queue of functions to execute, with their arguments + self._execution_queue = [] + ++ # For debugging: Show number of tasks started in run() / added elsewhere ++ # and some additional info ++ self.task_debug = False # set True to enable ++ self.tasks_started = 0 ++ + # Store the `when`s associated to some options. + self._conditions = {} + +@@ -331,7 +349,7 @@ class ConfigureSandbox(dict): + return method + def wrapped(*args, **kwargs): + out_args = [ +- arg.decode(encoding) if isinstance(arg, str) else arg ++ arg.decode(encoding) if isinstance(arg, bytes) else arg + for arg in args + ] + return method(*out_args, **kwargs) +@@ -360,6 +378,14 @@ class ConfigureSandbox(dict): + handler.setFormatter(formatter) + logger.addHandler(handler) + ++ def tasks_debug_out(self, text): ++ if self.task_debug: ++ print("%s / queued %i / done %i" %(text, len(self._execution_queue), self.tasks_started)) ++ #if len(self._execution_queue) > 5000: ++ # traceback.print_stack(file=sys.stdout) ++ #if len(self._execution_queue) > 5010: ++ # raise Exception("Too many tasks") ++ + def include_file(self, path): + '''Include one file in the sandbox. Users of this class probably want + to use `run` instead. +@@ -380,6 +406,9 @@ class ConfigureSandbox(dict): + if path in self._all_paths: + raise ConfigureError( + 'Cannot include `%s` because it was included already.' % path) ++ ++ if self.task_debug: ++ print("include_file", path) + self._paths.append(path) + self._all_paths.add(path) + +@@ -398,7 +427,7 @@ class ConfigureSandbox(dict): + if path: + self.include_file(path) + +- for option in self._options.itervalues(): ++ for option in self._options.values(): + # All options must be referenced by some @depends function + if option not in self._seen: + raise ConfigureError( +@@ -425,6 +454,8 @@ class ConfigureSandbox(dict): + + # Run the execution queue + for func, args in self._execution_queue: ++ self.tasks_started += 1 ++ self.tasks_debug_out("ConfigureSandbox.run(%s)" % func.__name__) + func(*args) + + if self._help: +@@ -504,7 +535,7 @@ class ConfigureSandbox(dict): + value = PositiveOptionValue() + elif value is False or value == (): + value = NegativeOptionValue() +- elif isinstance(value, types.StringTypes): ++ elif isinstance(value, (str,)): + value = PositiveOptionValue((value,)) + elif isinstance(value, tuple): + value = PositiveOptionValue(value) +@@ -544,7 +575,7 @@ class ConfigureSandbox(dict): + return value + + def _dependency(self, arg, callee_name, arg_name=None): +- if isinstance(arg, types.StringTypes): ++ if isinstance(arg, (str,)): + prefix, name, values = Option.split_option(arg) + if values != (): + raise ConfigureError("Option must not contain an '='") +@@ -608,7 +639,7 @@ class ConfigureSandbox(dict): + ''' + when = self._normalize_when(kwargs.get('when'), 'option') + args = [self._resolve(arg) for arg in args] +- kwargs = {k: self._resolve(v) for k, v in kwargs.iteritems() ++ kwargs = {k: self._resolve(v) for k, v in kwargs.items() + if k != 'when'} + option = Option(*args, **kwargs) + if when: +@@ -689,7 +720,7 @@ class ConfigureSandbox(dict): + with self.only_when_impl(when): + what = self._resolve(what) + if what: +- if not isinstance(what, types.StringTypes): ++ if not isinstance(what, (str,)): + raise TypeError("Unexpected type: '%s'" % type(what).__name__) + self.include_file(what) + +@@ -707,7 +738,7 @@ class ConfigureSandbox(dict): + (k[:-len('_impl')], getattr(self, k)) + for k in dir(self) if k.endswith('_impl') and k != 'template_impl' + ) +- glob.update((k, v) for k, v in self.iteritems() if k not in glob) ++ glob.update((k, v) for k, v in self.items() if k not in glob) + + # Any function argument to the template must be prepared to be sandboxed. + # If the template itself returns a function (in which case, it's very +@@ -731,7 +762,7 @@ class ConfigureSandbox(dict): + def wrapper(*args, **kwargs): + args = [maybe_prepare_function(arg) for arg in args] + kwargs = {k: maybe_prepare_function(v) +- for k, v in kwargs.iteritems()} ++ for k, v in kwargs.items()} + ret = template(*args, **kwargs) + if isfunction(ret): + # We can't expect the sandboxed code to think about all the +@@ -766,7 +797,7 @@ class ConfigureSandbox(dict): + for value, required in ( + (_import, True), (_from, False), (_as, False)): + +- if not isinstance(value, types.StringTypes) and ( ++ if not isinstance(value, (str,)) and ( + required or value is not None): + raise TypeError("Unexpected type: '%s'" % type(value).__name__) + if value is not None and not self.RE_MODULE.match(value): +@@ -807,7 +838,7 @@ class ConfigureSandbox(dict): + # Special case for the open() builtin, because otherwise, using it + # fails with "IOError: file() constructor not accessible in + # restricted mode" +- if what == '__builtin__.open': ++ if what == 'builtins.open': + return lambda *args, **kwargs: open(*args, **kwargs) + # Until this proves to be a performance problem, just construct an + # import statement and execute it. +@@ -829,7 +860,7 @@ class ConfigureSandbox(dict): + name = self._resolve(name, need_help_dependency=False) + if name is None: + return +- if not isinstance(name, types.StringTypes): ++ if not isinstance(name, (str,)): + raise TypeError("Unexpected type: '%s'" % type(name).__name__) + if name in data: + raise ConfigureError( +@@ -850,6 +881,7 @@ class ConfigureSandbox(dict): + + self._execution_queue.append(( + self._resolve_and_set, (self._config, name, value, when))) ++ self.tasks_debug_out("ConfigureSandbox.set_config_impl / %s(%s" % (name, value)) + + def set_define_impl(self, name, value, when=None): + '''Implementation of set_define(). +@@ -864,6 +896,7 @@ class ConfigureSandbox(dict): + defines = self._config.setdefault('DEFINES', {}) + self._execution_queue.append(( + self._resolve_and_set, (defines, name, value, when))) ++ self.tasks_debug_out("ConfigureSandbox.set_define_impl / %s(%s)" % (name, value)) + + def imply_option_impl(self, option, value, reason=None, when=None): + '''Implementation of imply_option(). +@@ -922,7 +955,7 @@ class ConfigureSandbox(dict): + if isinstance(possible_reasons[0], Option): + reason = possible_reasons[0] + if not reason and (isinstance(value, (bool, tuple)) or +- isinstance(value, types.StringTypes)): ++ isinstance(value, (str,))): + # A reason can be provided automatically when imply_option + # is called with an immediate value. + _, filename, line, _, _, _ = inspect.stack()[1] +@@ -955,10 +988,10 @@ class ConfigureSandbox(dict): + if not inspect.isfunction(func): + raise TypeError("Unexpected type: '%s'" % type(func).__name__) + if func in self._prepared_functions: +- return func, func.func_globals ++ return func, func.__globals__ + + glob = SandboxedGlobal( +- (k, v) for k, v in func.func_globals.iteritems() ++ (k, v) for k, v in func.__globals__.items() + if (inspect.isfunction(v) and v not in self._templates) or ( + inspect.isclass(v) and issubclass(v, Exception)) + ) +@@ -979,20 +1012,20 @@ class ConfigureSandbox(dict): + # Note this is not entirely bullet proof (if the value is e.g. a list, + # the list contents could have changed), but covers the bases. + closure = None +- if func.func_closure: ++ if func.__closure__: + def makecell(content): + def f(): + content +- return f.func_closure[0] ++ return f.__closure__[0] + + closure = tuple(makecell(cell.cell_contents) +- for cell in func.func_closure) ++ for cell in func.__closure__) + + new_func = self.wraps(func)(types.FunctionType( +- func.func_code, ++ func.__code__, + glob, + func.__name__, +- func.func_defaults, ++ func.__defaults__, + closure + )) + @self.wraps(new_func) +diff --git a/python/mozbuild/mozbuild/configure/check_debug_ranges.py b/python/mozbuild/mozbuild/configure/check_debug_ranges.py +index c0caa9cc5..a3e1f37e1 100644 +--- a/python/mozbuild/mozbuild/configure/check_debug_ranges.py ++++ b/python/mozbuild/mozbuild/configure/check_debug_ranges.py +@@ -6,7 +6,7 @@ + # to a given compilation unit. This is used as a helper to find a bug in some + # versions of GNU ld. + +-from __future__ import absolute_import ++ + + import subprocess + import sys +@@ -45,6 +45,8 @@ def get_range_length(range, debug_ranges): + def main(bin, compilation_unit): + p = subprocess.Popen(['objdump', '-W', bin], stdout = subprocess.PIPE, stderr = subprocess.PIPE) + (out, err) = p.communicate() ++ if isinstance(out, bytes): ++ out = out.decode('utf-8') + sections = re.split('\n(Contents of the|The section) ', out) + debug_info = [s for s in sections if s.startswith('.debug_info')] + debug_ranges = [s for s in sections if s.startswith('.debug_ranges')] +@@ -59,4 +61,4 @@ def main(bin, compilation_unit): + + + if __name__ == '__main__': +- print(main(*sys.argv[1:])) ++ print((main(*sys.argv[1:]))) +diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py +index 53ae2ae6d..4d80cad86 100644 +--- a/python/mozbuild/mozbuild/configure/options.py ++++ b/python/mozbuild/mozbuild/configure/options.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import os + import sys +@@ -12,7 +12,7 @@ from collections import OrderedDict + + def istupleofstrings(obj): + return isinstance(obj, tuple) and len(obj) and all( +- isinstance(o, types.StringTypes) for o in obj) ++ isinstance(o, (str,)) for o in obj) + + + class OptionValue(tuple): +@@ -88,7 +88,7 @@ class PositiveOptionValue(OptionValue): + in the form of a tuple for when values are given to the option (in the form + --option=value[,value2...]. + ''' +- def __nonzero__(self): ++ def __bool__(self): + return True + + +@@ -113,7 +113,7 @@ class ConflictingOptionError(InvalidOptionError): + if format_data: + message = message.format(**format_data) + super(ConflictingOptionError, self).__init__(message) +- for k, v in format_data.iteritems(): ++ for k, v in format_data.items(): + setattr(self, k, v) + + +@@ -149,7 +149,7 @@ class Option(object): + 'At least an option name or an environment variable name must ' + 'be given') + if name: +- if not isinstance(name, types.StringTypes): ++ if not isinstance(name, (str,)): + raise InvalidOptionError('Option must be a string') + if not name.startswith('--'): + raise InvalidOptionError('Option must start with `--`') +@@ -158,7 +158,7 @@ class Option(object): + if not name.islower(): + raise InvalidOptionError('Option must be all lowercase') + if env: +- if not isinstance(env, types.StringTypes): ++ if not isinstance(env, (str,)): + raise InvalidOptionError( + 'Environment variable name must be a string') + if not env.isupper(): +@@ -168,8 +168,8 @@ class Option(object): + isinstance(nargs, int) and nargs >= 0): + raise InvalidOptionError( + "nargs must be a positive integer, '?', '*' or '+'") +- if (not isinstance(default, types.StringTypes) and +- not isinstance(default, (bool, types.NoneType)) and ++ if (not isinstance(default, (str,)) and ++ not isinstance(default, (bool, type(None))) and + not istupleofstrings(default)): + raise InvalidOptionError( + 'default must be a bool, a string or a tuple of strings') +@@ -241,7 +241,7 @@ class Option(object): + ', '.join("'%s'" % c for c in choices)) + elif has_choices: + maxargs = self.maxargs +- if len(choices) < maxargs and maxargs != sys.maxint: ++ if len(choices) < maxargs and maxargs != sys.maxsize: + raise InvalidOptionError('Not enough `choices` for `nargs`') + self.choices = choices + self.help = help +@@ -255,7 +255,7 @@ class Option(object): + where prefix is one of 'with', 'without', 'enable' or 'disable'. + The '=values' part is optional. Values are separated with commas. + ''' +- if not isinstance(option, types.StringTypes): ++ if not isinstance(option, (str,)): + raise InvalidOptionError('Option must be a string') + + elements = option.split('=', 1) +@@ -308,7 +308,7 @@ class Option(object): + def maxargs(self): + if isinstance(self.nargs, int): + return self.nargs +- return 1 if self.nargs == '?' else sys.maxint ++ return 1 if self.nargs == '?' else sys.maxsize + + def _validate_nargs(self, num): + minargs, maxargs = self.minargs, self.maxargs +@@ -499,5 +499,5 @@ class CommandLineHelper(object): + + def __iter__(self): + for d in (self._args, self._extra_args): +- for arg, pos in d.itervalues(): ++ for arg, pos in d.values(): + yield arg +diff --git a/python/mozbuild/mozbuild/configure/util.py b/python/mozbuild/mozbuild/configure/util.py +index 9d8b2eb0e..a12986e48 100644 +--- a/python/mozbuild/mozbuild/configure/util.py ++++ b/python/mozbuild/mozbuild/configure/util.py +@@ -77,15 +77,7 @@ class ConfigureOutputHandler(logging.Handler): + # Python has this feature where it sets the encoding of pipes to + # ascii, which blatantly fails when trying to print out non-ascii. + def fix_encoding(fh): +- try: +- isatty = fh.isatty() +- except AttributeError: +- isatty = True +- +- if not isatty: +- encoding = getpreferredencoding() +- if encoding: +- return codecs.getwriter(encoding)(fh) ++ # no magic on oe / python3 + return fh + + self._stdout = fix_encoding(stdout) +@@ -200,7 +192,7 @@ class LineIO(object): + self._errors = errors + + def write(self, buf): +- if self._encoding and isinstance(buf, str): ++ if self._encoding and isinstance(buf, bytes): + buf = buf.decode(self._encoding, self._errors) + lines = buf.splitlines() + if not lines: +diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py +index d5af532f7..e9810fe58 100644 +--- a/python/mozbuild/mozbuild/controller/building.py ++++ b/python/mozbuild/mozbuild/controller/building.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import errno + import getpass +@@ -146,7 +146,7 @@ class TierStatus(object): + """ + o = [] + +- for tier, state in self.tiers.items(): ++ for tier, state in list(self.tiers.items()): + t_entry = dict( + name=tier, + start=state['begin_time'], +@@ -574,7 +574,7 @@ class BuildProgressFooter(Footer): + + def __init__(self, terminal, monitor): + Footer.__init__(self, terminal) +- self.tiers = monitor.tiers.tier_status.viewitems() ++ self.tiers = monitor.tiers.tier_status.items() + + def draw(self): + """Draws this footer in the terminal.""" +@@ -911,8 +911,8 @@ class CCacheStats(object): + + return '\n'.join(lines) + +- def __nonzero__(self): +- relative_values = [v for k, v in self._values.items() ++ def __bool__(self): ++ relative_values = [v for k, v in list(self._values.items()) + if k not in self.ABSOLUTE_KEYS] + return (all(v >= 0 for v in relative_values) and + any(v > 0 for v in relative_values)) +@@ -1156,7 +1156,7 @@ class BuildDriver(MozbuildObject): + + high_finder, finder_percent = monitor.have_high_finder_usage() + if high_finder: +- print(FINDER_SLOW_MESSAGE % finder_percent) ++ print((FINDER_SLOW_MESSAGE % finder_percent)) + + ccache_end = monitor.ccache_stats() + +@@ -1276,8 +1276,8 @@ class BuildDriver(MozbuildObject): + """Install test files.""" + + if self.is_clobber_needed(): +- print(INSTALL_TESTS_CLOBBER.format( +- clobber_file=os.path.join(self.topobjdir, 'CLOBBER'))) ++ print((INSTALL_TESTS_CLOBBER.format( ++ clobber_file=os.path.join(self.topobjdir, 'CLOBBER')))) + sys.exit(1) + + if not test_objs: +diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py +index fbdbefc1d..1aef6a65a 100644 +--- a/python/mozbuild/mozbuild/frontend/context.py ++++ b/python/mozbuild/mozbuild/frontend/context.py +@@ -14,7 +14,7 @@ If you are looking for the absolute authority on what moz.build files can + contain, you've come to the right place. + """ + +-from __future__ import absolute_import, unicode_literals ++ + + import os + +@@ -237,15 +237,15 @@ class Context(KeyedDefaultDict): + This function is transactional: if setitem fails for one of the values, + the context is not updated at all.""" + if isinstance(iterable, dict): +- iterable = iterable.items() ++ iterable = list(iterable.items()) + + update = {} +- for key, value in itertools.chain(iterable, kwargs.items()): ++ for key, value in itertools.chain(iterable, list(kwargs.items())): + stored_type = self._validate(key, value) + # Don't create an instance of stored_type if coercion is needed, + # until all values are validated. + update[key] = (value, stored_type) +- for key, (value, stored_type) in update.items(): ++ for key, (value, stored_type) in list(update.items()): + if not isinstance(value, stored_type): + update[key] = stored_type(value) + else: +@@ -311,7 +311,7 @@ class BaseCompileFlags(ContextDerivedValue, dict): + # a template were set and which were provided as defaults. + template_name = getattr(context, 'template', None) + if template_name in (None, 'Gyp'): +- dict.__init__(self, ((k, v if v is None else TypedList(unicode)(v)) ++ dict.__init__(self, ((k, v if v is None else TypedList(str)(v)) + for k, v, _ in self.flag_variables)) + else: + dict.__init__(self) +@@ -520,13 +520,13 @@ class CompileFlags(BaseCompileFlags): + if key in self and self[key] is None: + raise ValueError('`%s` may not be set in COMPILE_FLAGS from moz.build, this ' + 'value is resolved from the emitter.' % key) +- if not (isinstance(value, list) and all(isinstance(v, basestring) for v in value)): ++ if not (isinstance(value, list) and all(isinstance(v, str) for v in value)): + raise ValueError('A list of strings must be provided as a value for a ' + 'compile flags category.') + dict.__setitem__(self, key, value) + + +-class FinalTargetValue(ContextDerivedValue, unicode): ++class FinalTargetValue(ContextDerivedValue, str): + def __new__(cls, context, value=""): + if not value: + value = 'dist/' +@@ -536,7 +536,7 @@ class FinalTargetValue(ContextDerivedValue, unicode): + value += 'bin' + if context['DIST_SUBDIR']: + value += '/' + context['DIST_SUBDIR'] +- return unicode.__new__(cls, value) ++ return str.__new__(cls, value) + + + def Enum(*values): +@@ -584,7 +584,7 @@ class PathMeta(type): + cls = SourcePath + return super(PathMeta, cls).__call__(context, value) + +-class Path(ContextDerivedValue, unicode): ++class Path(ContextDerivedValue, str, metaclass=PathMeta): + """Stores and resolves a source path relative to a given context + + This class is used as a backing type for some of the sandbox variables. +@@ -595,7 +595,6 @@ class Path(ContextDerivedValue, unicode): + - '!objdir/relative/paths' + - '%/filesystem/absolute/paths' + """ +- __metaclass__ = PathMeta + + def __new__(cls, context, value=None): + return super(Path, cls).__new__(cls, value) +@@ -612,10 +611,14 @@ class Path(ContextDerivedValue, unicode): + """ + return Path(self.context, mozpath.join(self, *p)) + ++ @staticmethod ++ def cmp(a, b): ++ return (a > b) - (a < b) ++ + def __cmp__(self, other): + if isinstance(other, Path) and self.srcdir != other.srcdir: +- return cmp(self.full_path, other.full_path) +- return cmp(unicode(self), other) ++ return self.cmp(self.full_path, other.full_path) ++ return self.cmp(str(self), other) + + # __cmp__ is not enough because unicode has __eq__, __ne__, etc. defined + # and __cmp__ is only used for those when they don't exist. +@@ -773,7 +776,7 @@ def ContextDerivedTypedRecord(*fields): + __slots__ = tuple([name for name, _ in fields]) + + def __init__(self, context): +- for fname, ftype in self._fields.items(): ++ for fname, ftype in list(self._fields.items()): + if issubclass(ftype, ContextDerivedValue): + setattr(self, fname, self._fields[fname](context)) + else: +@@ -909,8 +912,8 @@ def TypedListWithAction(typ, action): + return _TypedListWithAction + + WebPlatformTestManifest = TypedNamedTuple("WebPlatformTestManifest", +- [("manifest_path", unicode), +- ("test_root", unicode)]) ++ [("manifest_path", str), ++ ("test_root", str)]) + ManifestparserManifestList = OrderedPathListWithAction(read_manifestparser_manifest) + ReftestManifestList = OrderedPathListWithAction(read_reftest_manifest) + WptManifestList = TypedListWithAction(WebPlatformTestManifest, read_wpt_manifest) +@@ -918,18 +921,18 @@ WptManifestList = TypedListWithAction(WebPlatformTestManifest, read_wpt_manifest + OrderedSourceList = ContextDerivedTypedList(SourcePath, StrictOrderingOnAppendList) + OrderedTestFlavorList = TypedList(Enum(*all_test_flavors()), + StrictOrderingOnAppendList) +-OrderedStringList = TypedList(unicode, StrictOrderingOnAppendList) ++OrderedStringList = TypedList(str, StrictOrderingOnAppendList) + DependentTestsEntry = ContextDerivedTypedRecord(('files', OrderedSourceList), + ('tags', OrderedStringList), + ('flavors', OrderedTestFlavorList)) + BugzillaComponent = TypedNamedTuple('BugzillaComponent', +- [('product', unicode), ('component', unicode)]) ++ [('product', str), ('component', str)]) + SchedulingComponents = ContextDerivedTypedRecord( +- ('inclusive', TypedList(unicode, StrictOrderingOnAppendList)), +- ('exclusive', TypedList(unicode, StrictOrderingOnAppendList))) ++ ('inclusive', TypedList(str, StrictOrderingOnAppendList)), ++ ('exclusive', TypedList(str, StrictOrderingOnAppendList))) + + GeneratedFilesList = StrictOrderingOnAppendListWithFlagsFactory({ +- 'script': unicode, ++ 'script': str, + 'inputs': list, + 'flags': list, }) + +@@ -1096,7 +1099,7 @@ class Files(SubContext): + self.test_tags |= other.test_tags + self.test_flavors |= other.test_flavors + +- for k, v in other.items(): ++ for k, v in list(other.items()): + if k == 'IMPACTED_TESTS': + self.test_files |= set(mozpath.relpath(e.full_path, e.context.config.topsrcdir) + for e in v.files) +@@ -1154,7 +1157,7 @@ class Files(SubContext): + + bug_components = Counter() + +- for f in files.values(): ++ for f in list(files.values()): + bug_component = f.get('BUG_COMPONENT') + if bug_component: + bug_components[bug_component] += 1 +@@ -1232,7 +1235,7 @@ VARIABLES = { + RustLibrary template instead. + """), + +- 'RUST_LIBRARY_TARGET_DIR': (unicode, unicode, ++ 'RUST_LIBRARY_TARGET_DIR': (str, str, + """Where CARGO_TARGET_DIR should point when compiling this library. If + not set, it defaults to the current objdir. It should be a relative path + to the current objdir; absolute paths should not be used. +@@ -1248,7 +1251,7 @@ VARIABLES = { + HostRustLibrary template instead. + """), + +- 'RUST_TEST': (unicode, unicode, ++ 'RUST_TEST': (str, str, + """Name of a Rust test to build and run via `cargo test`. + + This variable should not be used directly; you should be using the +@@ -1487,7 +1490,7 @@ VARIABLES = { + """Like ``OBJDIR_FILES``, with preprocessing. Use sparingly. + """), + +- 'FINAL_LIBRARY': (unicode, unicode, ++ 'FINAL_LIBRARY': (str, str, + """Library in which the objects of the current directory will be linked. + + This variable contains the name of a library, defined elsewhere with +@@ -1528,7 +1531,7 @@ VARIABLES = { + with the host compiler. + """), + +- 'HOST_LIBRARY_NAME': (unicode, unicode, ++ 'HOST_LIBRARY_NAME': (str, str, + """Name of target library generated when cross compiling. + """), + +@@ -1546,7 +1549,7 @@ VARIABLES = { + libraries that link into this library via FINAL_LIBRARY. + """), + +- 'LIBRARY_NAME': (unicode, unicode, ++ 'LIBRARY_NAME': (str, str, + """The code name of the library generated for a directory. + + By default STATIC_LIBRARY_NAME and SHARED_LIBRARY_NAME take this name. +@@ -1558,7 +1561,7 @@ VARIABLES = { + ``example/components/xpcomsample.lib`` on Windows. + """), + +- 'SHARED_LIBRARY_NAME': (unicode, unicode, ++ 'SHARED_LIBRARY_NAME': (str, str, + """The name of the static library generated for a directory, if it needs to + differ from the library code name. + +@@ -1572,7 +1575,7 @@ VARIABLES = { + Implies FORCE_SHARED_LIB. + """), + +- 'STATIC_LIBRARY_NAME': (unicode, unicode, ++ 'STATIC_LIBRARY_NAME': (str, str, + """The name of the static library generated for a directory, if it needs to + differ from the library code name. + +@@ -1604,31 +1607,31 @@ VARIABLES = { + + This variable contains a list of system libaries to link against. + """), +- 'RCFILE': (unicode, unicode, ++ 'RCFILE': (str, str, + """The program .rc file. + + This variable can only be used on Windows. + """), + +- 'RESFILE': (unicode, unicode, ++ 'RESFILE': (str, str, + """The program .res file. + + This variable can only be used on Windows. + """), + +- 'RCINCLUDE': (unicode, unicode, ++ 'RCINCLUDE': (str, str, + """The resource script file to be included in the default .res file. + + This variable can only be used on Windows. + """), + +- 'DEFFILE': (unicode, unicode, ++ 'DEFFILE': (str, str, + """The program .def (module definition) file. + + This variable can only be used on Windows. + """), + +- 'SYMBOLS_FILE': (Path, unicode, ++ 'SYMBOLS_FILE': (Path, str, + """A file containing a list of symbols to export from a shared library. + + The given file contains a list of symbols to be exported, and is +@@ -1649,7 +1652,7 @@ VARIABLES = { + ``BIN_SUFFIX``, the name will remain unchanged. + """), + +- 'SONAME': (unicode, unicode, ++ 'SONAME': (str, str, + """The soname of the shared object currently being linked + + soname is the "logical name" of a shared object, often used to provide +@@ -1719,7 +1722,7 @@ VARIABLES = { + ``GENERATED_FILES``. + """), + +- 'PROGRAM' : (unicode, unicode, ++ 'PROGRAM' : (str, str, + """Compiled executable name. + + If the configuration token ``BIN_SUFFIX`` is set, its value will be +@@ -1727,7 +1730,7 @@ VARIABLES = { + ``BIN_SUFFIX``, ``PROGRAM`` will remain unchanged. + """), + +- 'HOST_PROGRAM' : (unicode, unicode, ++ 'HOST_PROGRAM' : (str, str, + """Compiled host executable name. + + If the configuration token ``HOST_BIN_SUFFIX`` is set, its value will be +@@ -1765,7 +1768,7 @@ VARIABLES = { + files. + """), + +- 'XPIDL_MODULE': (unicode, unicode, ++ 'XPIDL_MODULE': (str, str, + """XPCOM Interface Definition Module Name. + + This is the name of the ``.xpt`` file that is created by linking +@@ -1924,14 +1927,14 @@ VARIABLES = { + + + # The following variables are used to control the target of installed files. +- 'XPI_NAME': (unicode, unicode, ++ 'XPI_NAME': (str, str, + """The name of an extension XPI to generate. + + When this variable is present, the results of this directory will end up + being packaged into an extension instead of the main dist/bin results. + """), + +- 'DIST_SUBDIR': (unicode, unicode, ++ 'DIST_SUBDIR': (str, str, + """The name of an alternate directory to install files to. + + When this variable is present, the results of this directory will end up +@@ -1939,7 +1942,7 @@ VARIABLES = { + otherwise be placed. + """), + +- 'FINAL_TARGET': (FinalTargetValue, unicode, ++ 'FINAL_TARGET': (FinalTargetValue, str, + """The name of the directory to install targets to. + + The directory is relative to the top of the object directory. The +@@ -1970,7 +1973,7 @@ VARIABLES = { + + 'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({ + 'variables': dict, +- 'input': unicode, ++ 'input': str, + 'sandbox_vars': dict, + 'no_chromium': bool, + 'no_unified': bool, +@@ -2194,7 +2197,7 @@ VARIABLES = { + } + + # Sanity check: we don't want any variable above to have a list as storage type. +-for name, (storage_type, input_types, docs) in VARIABLES.items(): ++for name, (storage_type, input_types, docs) in list(VARIABLES.items()): + if storage_type == list: + raise RuntimeError('%s has a "list" storage type. Use "List" instead.' + % name) +diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py +index 442fc9e0a..837453a9f 100644 +--- a/python/mozbuild/mozbuild/frontend/data.py ++++ b/python/mozbuild/mozbuild/frontend/data.py +@@ -15,7 +15,7 @@ contains the code for converting executed mozbuild files into these data + structures. + """ + +-from __future__ import absolute_import, unicode_literals ++ + + from mozbuild.util import StrictOrderingOnAppendList + from mozpack.chrome.manifest import ManifestEntry +@@ -182,7 +182,7 @@ class ComputedFlags(ContextDerived): + if value: + for dest_var in dest_vars: + flags[dest_var].extend(value) +- return flags.items() ++ return list(flags.items()) + + class XPIDLFile(ContextDerived): + """Describes an XPIDL file to be compiled.""" +@@ -213,7 +213,7 @@ class BaseDefines(ContextDerived): + self.defines = defines + + def get_defines(self): +- for define, value in self.defines.iteritems(): ++ for define, value in self.defines.items(): + if value is True: + yield('-D%s' % define) + elif value is False: +@@ -494,7 +494,7 @@ class SimpleProgram(BaseProgram): + KIND = 'target' + + def source_files(self): +- for srcs in self.sources.values(): ++ for srcs in list(self.sources.values()): + for f in srcs: + if mozpath.basename(mozpath.splitext(f)[0]) == mozpath.splitext(self.program)[0]: + return [f] +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 642b381c0..c28344a75 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals ++ + + import itertools + import logging +@@ -116,8 +116,8 @@ class TreeMetadataEmitter(LoggingMixin): + # arguments. This gross hack works around the problem until we + # rid ourselves of 2.6. + self.info = {} +- for k, v in mozinfo.info.items(): +- if isinstance(k, unicode): ++ for k, v in list(mozinfo.info.items()): ++ if isinstance(k, str): + k = k.encode('ascii') + self.info[k] = v + +@@ -234,7 +234,7 @@ class TreeMetadataEmitter(LoggingMixin): + + + # Next do FINAL_LIBRARY linkage. +- for lib in (l for libs in self._libs.values() for l in libs): ++ for lib in (l for libs in list(self._libs.values()) for l in libs): + if not isinstance(lib, (StaticLibrary, RustLibrary)) or not lib.link_into: + continue + if lib.link_into not in self._libs: +@@ -294,13 +294,13 @@ class TreeMetadataEmitter(LoggingMixin): + lib.link_into == outerlib.basename): + propagate_defines(lib, defines) + +- for lib in (l for libs in self._libs.values() for l in libs): ++ for lib in (l for libs in list(self._libs.values()) for l in libs): + if isinstance(lib, Library): + propagate_defines(lib, lib.lib_defines) + yield lib + + +- for lib in (l for libs in self._libs.values() for l in libs): ++ for lib in (l for libs in list(self._libs.values()) for l in libs): + lib_defines = list(lib.lib_defines.get_defines()) + if lib_defines: + objdir_flags = self._compile_flags[lib.objdir] +@@ -310,13 +310,13 @@ class TreeMetadataEmitter(LoggingMixin): + if objdir_flags: + objdir_flags.resolve_flags('LIBRARY_DEFINES', lib_defines) + +- for flags_obj in self._compile_flags.values(): ++ for flags_obj in list(self._compile_flags.values()): + yield flags_obj + +- for flags_obj in self._compile_as_flags.values(): ++ for flags_obj in list(self._compile_as_flags.values()): + yield flags_obj + +- for obj in self._binaries.values(): ++ for obj in list(self._binaries.values()): + yield obj + + +@@ -409,7 +409,7 @@ class TreeMetadataEmitter(LoggingMixin): + libs[key] = l + if key not in libs: + libs[key] = l +- candidates = libs.values() ++ candidates = list(libs.values()) + if force_static and not candidates: + if dir: + raise SandboxValidationError( +@@ -473,9 +473,9 @@ class TreeMetadataEmitter(LoggingMixin): + + def _verify_deps(self, context, crate_dir, crate_name, dependencies, description='Dependency'): + """Verify that a crate's dependencies all specify local paths.""" +- for dep_crate_name, values in dependencies.iteritems(): ++ for dep_crate_name, values in dependencies.items(): + # A simple version number. +- if isinstance(values, (str, unicode)): ++ if isinstance(values, str): + raise SandboxValidationError( + '%s %s of crate %s does not list a path' % (description, dep_crate_name, crate_name), + context) +@@ -529,7 +529,7 @@ class TreeMetadataEmitter(LoggingMixin): + + cargo_target_dir = context.get('RUST_LIBRARY_TARGET_DIR', '.') + +- dependencies = set(config.get('dependencies', {}).iterkeys()) ++ dependencies = set(config.get('dependencies', {}).keys()) + + features = context.get(cls.FEATURES_VAR, []) + unique_features = set(features) +@@ -863,7 +863,7 @@ class TreeMetadataEmitter(LoggingMixin): + assert not gen_sources['UNIFIED_SOURCES'] + + no_pgo = context.get('NO_PGO') +- no_pgo_sources = [f for f, flags in all_flags.iteritems() ++ no_pgo_sources = [f for f, flags in all_flags.items() + if flags.no_pgo] + if no_pgo: + if no_pgo_sources: +@@ -890,7 +890,7 @@ class TreeMetadataEmitter(LoggingMixin): + + # The inverse of the above, mapping suffixes to their canonical suffix. + canonicalized_suffix_map = {} +- for suffix, alternatives in suffix_map.iteritems(): ++ for suffix, alternatives in suffix_map.items(): + alternatives.add(suffix) + for a in alternatives: + canonicalized_suffix_map[a] = suffix +@@ -914,7 +914,7 @@ class TreeMetadataEmitter(LoggingMixin): + # Source files to track for linkables associated with this context. + ctxt_sources = defaultdict(lambda: defaultdict(list)) + +- for variable, (klass, gen_klass, suffixes) in varmap.items(): ++ for variable, (klass, gen_klass, suffixes) in list(varmap.items()): + allowed_suffixes = set().union(*[suffix_map[s] for s in suffixes]) + + # First ensure that we haven't been given filetypes that we don't +@@ -941,20 +941,20 @@ class TreeMetadataEmitter(LoggingMixin): + obj = cls(*arglist) + srcs = obj.files + if isinstance(obj, UnifiedSources) and obj.have_unified_mapping: +- srcs = dict(obj.unified_source_mapping).keys() ++ srcs = list(dict(obj.unified_source_mapping).keys()) + ctxt_sources[variable][canonical_suffix] += sorted(srcs) + yield obj + + if ctxt_sources: + for linkable in linkables: + for target_var in ('SOURCES', 'UNIFIED_SOURCES'): +- for suffix, srcs in ctxt_sources[target_var].items(): ++ for suffix, srcs in list(ctxt_sources[target_var].items()): + linkable.sources[suffix] += srcs + for host_linkable in host_linkables: +- for suffix, srcs in ctxt_sources['HOST_SOURCES'].items(): ++ for suffix, srcs in list(ctxt_sources['HOST_SOURCES'].items()): + host_linkable.sources[suffix] += srcs + +- for f, flags in all_flags.iteritems(): ++ for f, flags in all_flags.items(): + if flags.flags: + ext = mozpath.splitext(f)[1] + yield PerSourceFlag(context, f, flags.flags) +@@ -1143,7 +1143,7 @@ class TreeMetadataEmitter(LoggingMixin): + for obj in self._handle_linkables(context, passthru, generated_files): + yield obj + +- generated_files.update(['%s%s' % (k, self.config.substs.get('BIN_SUFFIX', '')) for k in self._binaries.keys()]) ++ generated_files.update(['%s%s' % (k, self.config.substs.get('BIN_SUFFIX', '')) for k in list(self._binaries.keys())]) + + components = [] + for var, cls in ( +@@ -1277,7 +1277,7 @@ class TreeMetadataEmitter(LoggingMixin): + for obj in self._process_jar_manifests(context): + yield obj + +- for name, jar in context.get('JAVA_JAR_TARGETS', {}).items(): ++ for name, jar in list(context.get('JAVA_JAR_TARGETS', {}).items()): + yield ContextWrapped(context, jar) + + computed_as_flags.resolve_flags('MOZBUILD', +@@ -1346,7 +1346,7 @@ class TreeMetadataEmitter(LoggingMixin): + script = mozpath.join(mozpath.dirname(mozpath.dirname(__file__)), + 'action', 'process_define_files.py') + yield GeneratedFile(context, script, 'process_define_file', +- unicode(path), ++ str(path), + [Path(context, path + '.in')]) + + generated_files = context.get('GENERATED_FILES') or [] +@@ -1393,7 +1393,7 @@ class TreeMetadataEmitter(LoggingMixin): + flags.flags, localized=localized) + + def _process_test_manifests(self, context): +- for prefix, info in TEST_MANIFESTS.items(): ++ for prefix, info in list(TEST_MANIFESTS.items()): + for path, manifest in context.get('%s_MANIFESTS' % prefix, []): + for obj in self._process_test_manifest(context, info, path, manifest): + yield obj +@@ -1479,7 +1479,7 @@ class TreeMetadataEmitter(LoggingMixin): + + process_support_files(test) + +- for path, m_defaults in mpmanifest.manifest_defaults.items(): ++ for path, m_defaults in list(mpmanifest.manifest_defaults.items()): + process_support_files(m_defaults) + + # We also copy manifests into the output directory, +diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py +index c1efc1c3d..0cdf8b8db 100644 +--- a/python/mozbuild/mozbuild/frontend/reader.py ++++ b/python/mozbuild/mozbuild/frontend/reader.py +@@ -16,7 +16,7 @@ The BuildReader contains basic logic for traversing a tree of mozbuild files. + It does this by examining specific variables populated during execution. + """ + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import ast + import inspect +@@ -81,12 +81,13 @@ from .context import ( + + from mozbuild.base import ExecutionSummary + from concurrent.futures.process import ProcessPoolExecutor ++from functools import reduce + + + + if sys.version_info.major == 2: +- text_type = unicode +- type_type = types.TypeType ++ text_type = str ++ type_type = type + else: + text_type = str + type_type = type +@@ -127,7 +128,7 @@ class EmptyConfig(object): + + self.substs = self.PopulateOnGetDict(EmptyValue, substs or self.default_substs) + udict = {} +- for k, v in self.substs.items(): ++ for k, v in list(self.substs.items()): + if isinstance(v, str): + udict[k.decode('utf-8')] = v.decode('utf-8') + else: +@@ -311,7 +312,7 @@ class MozbuildSandbox(Sandbox): + raise Exception('`template` is a function decorator. You must ' + 'use it as `@template` preceding a function declaration.') + +- name = func.func_name ++ name = func.__name__ + + if name in self.templates: + raise KeyError( +@@ -390,7 +391,7 @@ class MozbuildSandbox(Sandbox): + klass = self._context.__class__ + self._context.__class__ = TemplateContext + # The sandbox will do all the necessary checks for these merges. +- for key, value in context.items(): ++ for key, value in list(context.items()): + if isinstance(value, dict): + self[key].update(value) + elif isinstance(value, (list, HierarchicalStringList)): +@@ -407,12 +408,14 @@ class MozbuildSandbox(Sandbox): + + class TemplateFunction(object): + def __init__(self, func, sandbox): +- self.path = func.func_code.co_filename +- self.name = func.func_name ++ self.path = func.__code__.co_filename ++ self.name = func.__name__ + +- code = func.func_code ++ code = func.__code__ + firstlineno = code.co_firstlineno + lines = sandbox._current_source.splitlines(True) ++ if len(lines) and isinstance(lines[0], bytes): ++ lines = [l.decode('utf-8') for l in lines] + lines = inspect.getblock(lines[firstlineno - 1:]) + + # The code lines we get out of inspect.getsourcelines look like +@@ -430,7 +433,7 @@ class TemplateFunction(object): + # actually never calls __getitem__ and __setitem__, so we need to + # modify the AST so that accesses to globals are properly directed + # to a dict. +- self._global_name = b'_data' # AST wants str for this, not unicode ++ self._global_name = '_data' + # In case '_data' is a name used for a variable in the function code, + # prepend more underscores until we find an unused name. + while (self._global_name in code.co_names or +@@ -449,8 +452,8 @@ class TemplateFunction(object): + compile(func_ast, self.path, 'exec'), + glob, + self.name, +- func.func_defaults, +- func.func_closure, ++ func.__defaults__, ++ func.__closure__, + ) + func() + +@@ -464,11 +467,11 @@ class TemplateFunction(object): + '__builtins__': sandbox._builtins + } + func = types.FunctionType( +- self._func.func_code, ++ self._func.__code__, + glob, + self.name, +- self._func.func_defaults, +- self._func.func_closure ++ self._func.__defaults__, ++ self._func.__closure__ + ) + sandbox.exec_function(func, args, kwargs, self.path, + becomes_current_path=False) +@@ -484,7 +487,7 @@ class TemplateFunction(object): + def visit_Str(self, node): + # String nodes we got from the AST parser are str, but we want + # unicode literals everywhere, so transform them. +- node.s = unicode(node.s) ++ node.s = str(node.s) + return node + + def visit_Name(self, node): +@@ -617,7 +620,7 @@ class BuildReaderError(Exception): + + for l in traceback.format_exception(type(self.other), self.other, + self.trace): +- s.write(unicode(l)) ++ s.write(str(l)) + + return s.getvalue() + +@@ -767,7 +770,7 @@ class BuildReaderError(Exception): + s.write(' %s\n' % inner.args[2]) + s.write('\n') + close_matches = difflib.get_close_matches(inner.args[2], +- VARIABLES.keys(), 2) ++ list(VARIABLES.keys()), 2) + if close_matches: + s.write('Maybe you meant %s?\n' % ' or '.join(close_matches)) + s.write('\n') +@@ -1152,7 +1155,7 @@ class BuildReader(object): + context) + non_unified_sources.add(source) + action_overrides = {} +- for action, script in gyp_dir.action_overrides.iteritems(): ++ for action, script in gyp_dir.action_overrides.items(): + action_overrides[action] = SourcePath(context, script) + + gyp_processor = GypProcessor(context.config, +@@ -1188,7 +1191,7 @@ class BuildReader(object): + + recurse_info[d][key] = dict(sandbox.metadata[key]) + +- for path, child_metadata in recurse_info.items(): ++ for path, child_metadata in list(recurse_info.items()): + child_path = path.join('moz.build').full_path + + # Ensure we don't break out of the topsrcdir. We don't do realpath +@@ -1279,7 +1282,7 @@ class BuildReader(object): + # There is room to improve this code (and the code in + # _find_relevant_mozbuilds) to better handle multiple files in the same + # directory. Bug 1136966 tracks. +- for path, mbpaths in relevants.items(): ++ for path, mbpaths in list(relevants.items()): + path_mozbuilds[path] = [mozpath.join(topsrcdir, p) for p in mbpaths] + + for i, mbpath in enumerate(mbpaths[0:-1]): +@@ -1316,7 +1319,7 @@ class BuildReader(object): + all_contexts.append(context) + + result = {} +- for path, paths in path_mozbuilds.items(): ++ for path, paths in list(path_mozbuilds.items()): + result[path] = reduce(lambda x, y: x + y, (contexts[p] for p in paths), []) + + return result, all_contexts +@@ -1356,7 +1359,7 @@ class BuildReader(object): + + r = {} + +- for path, ctxs in paths.items(): ++ for path, ctxs in list(paths.items()): + # Should be normalized by read_relevant_mozbuilds. + assert '\\' not in path + +diff --git a/python/mozbuild/mozbuild/frontend/sandbox.py b/python/mozbuild/mozbuild/frontend/sandbox.py +index b2090802e..6d94291ea 100644 +--- a/python/mozbuild/mozbuild/frontend/sandbox.py ++++ b/python/mozbuild/mozbuild/frontend/sandbox.py +@@ -17,7 +17,7 @@ KeyError are machine parseable. This machine-friendly data is used to present + user-friendly error messages in the case of errors. + """ + +-from __future__ import absolute_import, unicode_literals ++ + + import os + import sys +@@ -112,6 +112,7 @@ class Sandbox(dict): + 'int': int, + 'set': set, + 'tuple': tuple, ++ 'str': str, + }) + + def __init__(self, context, finder=default_finder): +diff --git a/python/mozbuild/mozbuild/jar.py b/python/mozbuild/mozbuild/jar.py +index 47a2eff63..96aea63ce 100644 +--- a/python/mozbuild/mozbuild/jar.py ++++ b/python/mozbuild/mozbuild/jar.py +@@ -8,7 +8,7 @@ processing jar.mn files. + See the documentation for jar.mn on MDC for further details on the format. + ''' + +-from __future__ import absolute_import ++ + + import sys + import os +@@ -17,7 +17,7 @@ import re + import logging + from time import localtime + from MozZipFile import ZipFile +-from cStringIO import StringIO ++from io import StringIO + from collections import defaultdict + + from mozbuild.preprocessor import Preprocessor +@@ -302,9 +302,9 @@ class JarMaker(object): + '''updateManifest replaces the % in the chrome registration entries + with the given chrome base path, and updates the given manifest file. + ''' +- myregister = dict.fromkeys(map(lambda s: s.replace('%', +- chromebasepath), register)) +- addEntriesToListFile(manifestPath, myregister.iterkeys()) ++ myregister = dict.fromkeys([s.replace('%', ++ chromebasepath) for s in register]) ++ addEntriesToListFile(manifestPath, iter(myregister.keys())) + + def makeJar(self, infile, jardir): + '''makeJar is the main entry point to JarMaker. +@@ -322,7 +322,7 @@ class JarMaker(object): + elif self.relativesrcdir: + self.localedirs = \ + self.generateLocaleDirs(self.relativesrcdir) +- if isinstance(infile, basestring): ++ if isinstance(infile, str): + logging.info('processing ' + infile) + self.sourcedirs.append(_normpath(os.path.dirname(infile))) + pp = self.pp.clone() +diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py +index fcd45bed2..f77c5d2c3 100644 +--- a/python/mozbuild/mozbuild/makeutil.py ++++ b/python/mozbuild/mozbuild/makeutil.py +@@ -2,11 +2,10 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import os + import re +-from types import StringTypes + from collections import Iterable + + +@@ -66,7 +65,7 @@ class _SimpleOrderedSet(object): + self._list = [] + self._set = set() + +- def __nonzero__(self): ++ def __bool__(self): + return bool(self._set) + + def __iter__(self): +@@ -103,19 +102,19 @@ class Rule(object): + + def add_targets(self, targets): + '''Add additional targets to the rule.''' +- assert isinstance(targets, Iterable) and not isinstance(targets, StringTypes) ++ assert isinstance(targets, Iterable) and not isinstance(targets, str) + self._targets.update(targets) + return self + + def add_dependencies(self, deps): + '''Add dependencies to the rule.''' +- assert isinstance(deps, Iterable) and not isinstance(deps, StringTypes) ++ assert isinstance(deps, Iterable) and not isinstance(deps, str) + self._dependencies.update(deps) + return self + + def add_commands(self, commands): + '''Add commands to the rule.''' +- assert isinstance(commands, Iterable) and not isinstance(commands, StringTypes) ++ assert isinstance(commands, Iterable) and not isinstance(commands, str) + self._commands.extend(commands) + return self + +@@ -139,13 +138,16 @@ class Rule(object): + ''' + if not self._targets: + return +- fh.write('%s:' % ' '.join(self._targets)) ++ wstring = '%s:' % ' '.join(self._targets) + if self._dependencies: +- fh.write(' %s' % ' '.join(self.dependencies())) +- fh.write('\n') ++ wstring += ' %s' % ' '.join(self.dependencies()) ++ wstring += '\n' + for cmd in self._commands: +- fh.write('\t%s\n' % cmd) +- ++ wstring += '\t%s\n' % cmd ++ try: ++ fh.write(wstring.encode('utf-8')) ++ except TypeError: ++ fh.write(wstring) + + # colon followed by anything except a slash (Windows path detection) + _depfilesplitter = re.compile(r':(?![\\/])') +diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py +index 7e7ad1b2a..f03f20ba3 100755 +--- a/python/mozbuild/mozbuild/mozinfo.py ++++ b/python/mozbuild/mozbuild/mozinfo.py +@@ -5,7 +5,7 @@ + # This module produces a JSON file that provides basic build info and + # configuration metadata. + +-from __future__ import absolute_import ++ + + import os + import re +@@ -33,7 +33,7 @@ def build_dict(config, env=os.environ): + d['mozconfig'] = config.mozconfig + + # os +- o = substs["OS_TARGET"] ++ o = str(substs["OS_TARGET"]) + known_os = {"Linux": "linux", + "WINNT": "win", + "Darwin": "mac", +@@ -148,7 +148,7 @@ def write_mozinfo(file, config, env=os.environ): + and what keys are produced. + """ + build_conf = build_dict(config, env) +- if isinstance(file, basestring): +- file = open(file, 'wb') ++ if isinstance(file, str): ++ file = open(file, 'w') + + json.dump(build_conf, file, sort_keys=True, indent=4) +diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py +index 6780b8b72..19e59884e 100644 +--- a/python/mozbuild/mozbuild/preprocessor.py ++++ b/python/mozbuild/mozbuild/preprocessor.py +@@ -27,7 +27,8 @@ import os + import re + from optparse import OptionParser + import errno +-from makeutil import Makefile ++from .makeutil import Makefile ++from functools import reduce + + # hack around win32 mangling our line endings + # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65443 +@@ -230,7 +231,7 @@ class Expression: + def __repr__(self): + return self.value.__repr__() + +- class ParseError(StandardError): ++ class ParseError(Exception): + """ + Error raised when parsing fails. + It has two members, offset and content, which give the offset of the +@@ -278,7 +279,7 @@ class Preprocessor: + self.context = Context() + for k,v in {'FILE': '', + 'LINE': 0, +- 'DIRECTORY': os.path.abspath('.')}.iteritems(): ++ 'DIRECTORY': os.path.abspath('.')}.items(): + self.context[k] = v + self.actionLevel = 0 + self.disableLevel = 0 +@@ -292,21 +293,21 @@ class Preprocessor: + self.cmds = {} + for cmd, level in {'define': 0, + 'undef': 0, +- 'if': sys.maxint, +- 'ifdef': sys.maxint, +- 'ifndef': sys.maxint, ++ 'if': sys.maxsize, ++ 'ifdef': sys.maxsize, ++ 'ifndef': sys.maxsize, + 'else': 1, + 'elif': 1, + 'elifdef': 1, + 'elifndef': 1, +- 'endif': sys.maxint, ++ 'endif': sys.maxsize, + 'expand': 0, + 'literal': 0, + 'filter': 0, + 'unfilter': 0, + 'include': 0, + 'includesubst': 0, +- 'error': 0}.iteritems(): ++ 'error': 0}.items(): + self.cmds[cmd] = (level, getattr(self, 'do_' + cmd)) + self.out = sys.stdout + self.setMarker(marker) +@@ -434,7 +435,7 @@ class Preprocessor: + filteredLine = self.applyFilters(aLine) + if filteredLine != aLine: + self.actionLevel = 2 +- self.out.write(filteredLine) ++ self.out.write(filteredLine.encode('utf-8')) + + def handleCommandLine(self, args, defaultToStdin = False): + """ +@@ -468,7 +469,7 @@ class Preprocessor: + raise Preprocessor.Error(self, "--depend doesn't work with stdout", + None) + try: +- from makeutil import Makefile ++ from .makeutil import Makefile + except: + raise Preprocessor.Error(self, "--depend requires the " + "mozbuild.makeutil module", None) +@@ -683,7 +684,7 @@ class Preprocessor: + current = dict(self.filters) + for f in filters: + current[f] = getattr(self, 'filter_' + f) +- filterNames = current.keys() ++ filterNames = list(current.keys()) + filterNames.sort() + self.filters = [(fn, current[fn]) for fn in filterNames] + return +@@ -693,7 +694,7 @@ class Preprocessor: + for f in filters: + if f in current: + del current[f] +- filterNames = current.keys() ++ filterNames = list(current.keys()) + filterNames.sort() + self.filters = [(fn, current[fn]) for fn in filterNames] + return +@@ -738,7 +739,7 @@ class Preprocessor: + args can either be a file name, or a file-like object. + Files should be opened, and will be closed after processing. + """ +- isName = type(args) == str or type(args) == unicode ++ isName = type(args) == str or type(args) == str + oldCheckLineNumbers = self.checkLineNumbers + self.checkLineNumbers = False + if isName: +diff --git a/python/mozbuild/mozbuild/shellutil.py b/python/mozbuild/mozbuild/shellutil.py +index 185a970ee..c0c15f8f2 100644 +--- a/python/mozbuild/mozbuild/shellutil.py ++++ b/python/mozbuild/mozbuild/shellutil.py +@@ -15,7 +15,7 @@ def _tokens2re(**tokens): + # which matches the pattern and captures it in a named match group. + # The group names and patterns are given as arguments. + all_tokens = '|'.join('(?P<%s>%s)' % (name, value) +- for name, value in tokens.iteritems()) ++ for name, value in tokens.items()) + nonescaped = r'(?` is unused." + % mozpath.join(test_data_path, 'moz.configure')) + +@@ -257,7 +257,7 @@ class TestLint(unittest.TestCase): + '''): + self.lint_test() + +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "%s:9: The dependency on `qux` is unused." + % mozpath.join(test_data_path, 'moz.configure')) + +diff --git a/python/mozbuild/mozbuild/test/configure/test_moz_configure.py b/python/mozbuild/mozbuild/test/configure/test_moz_configure.py +index b3342e268..7a26e9e09 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_moz_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_moz_configure.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + from mozunit import main + from mozpack import path as mozpath +@@ -27,10 +27,10 @@ class TestMozConfigure(BaseConfigureTest): + shell = mozpath.abspath('/bin/sh') + return result.replace('CONFIG_SHELL=%s ' % shell, '') + +- self.assertEquals('--enable-application=browser', ++ self.assertEqual('--enable-application=browser', + get_value_for(['--enable-application=browser'])) + +- self.assertEquals('--enable-application=browser ' ++ self.assertEqual('--enable-application=browser ' + 'MOZ_VTUNE=1', + get_value_for(['--enable-application=browser', + 'MOZ_VTUNE=1'])) +@@ -39,25 +39,25 @@ class TestMozConfigure(BaseConfigureTest): + environ={'MOZ_VTUNE': '1'}, + mozconfig='ac_add_options --enable-project=js') + +- self.assertEquals('--enable-project=js MOZ_VTUNE=1', ++ self.assertEqual('--enable-project=js MOZ_VTUNE=1', + value) + + # --disable-js-shell is the default, so it's filtered out. +- self.assertEquals('--enable-application=browser', ++ self.assertEqual('--enable-application=browser', + get_value_for(['--enable-application=browser', + '--disable-js-shell'])) + + # Normally, --without-foo would be filtered out because that's the + # default, but since it is a (fake) old-configure option, it always + # appears. +- self.assertEquals('--enable-application=browser --without-foo', ++ self.assertEqual('--enable-application=browser --without-foo', + get_value_for(['--enable-application=browser', + '--without-foo'])) +- self.assertEquals('--enable-application=browser --with-foo', ++ self.assertEqual('--enable-application=browser --with-foo', + get_value_for(['--enable-application=browser', + '--with-foo'])) + +- self.assertEquals("--enable-application=browser '--with-foo=foo bar'", ++ self.assertEqual("--enable-application=browser '--with-foo=foo bar'", + get_value_for(['--enable-application=browser', + '--with-foo=foo bar'])) + +@@ -69,7 +69,7 @@ class TestMozConfigure(BaseConfigureTest): + self.version = version + + def __call__(self, stdin, args): +- this.assertEquals(args, ('-version',)) ++ this.assertEqual(args, ('-version',)) + return 0, self.version, '' + + def check_nsis_version(version): +@@ -84,13 +84,13 @@ class TestMozConfigure(BaseConfigureTest): + with self.assertRaises(SystemExit) as e: + check_nsis_version('v3.0a2') + +- self.assertEquals(check_nsis_version('v3.0b1'), '3.0b1') +- self.assertEquals(check_nsis_version('v3.0b2'), '3.0b2') +- self.assertEquals(check_nsis_version('v3.0rc1'), '3.0rc1') +- self.assertEquals(check_nsis_version('v3.0'), '3.0') +- self.assertEquals(check_nsis_version('v3.0-2'), '3.0') +- self.assertEquals(check_nsis_version('v3.0.1'), '3.0') +- self.assertEquals(check_nsis_version('v3.1'), '3.1') ++ self.assertEqual(check_nsis_version('v3.0b1'), '3.0b1') ++ self.assertEqual(check_nsis_version('v3.0b2'), '3.0b2') ++ self.assertEqual(check_nsis_version('v3.0rc1'), '3.0rc1') ++ self.assertEqual(check_nsis_version('v3.0'), '3.0') ++ self.assertEqual(check_nsis_version('v3.0-2'), '3.0') ++ self.assertEqual(check_nsis_version('v3.0.1'), '3.0') ++ self.assertEqual(check_nsis_version('v3.1'), '3.1') + + + if __name__ == '__main__': +diff --git a/python/mozbuild/mozbuild/test/configure/test_options.py b/python/mozbuild/mozbuild/test/configure/test_options.py +index 9defccb2c..330ce3b1f 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_options.py ++++ b/python/mozbuild/mozbuild/test/configure/test_options.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import unittest + +@@ -28,139 +28,139 @@ class Option(Option): + class TestOption(unittest.TestCase): + def test_option(self): + option = Option('--option') +- self.assertEquals(option.prefix, '') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, '') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertFalse(option.default) + + option = Option('--enable-option') +- self.assertEquals(option.prefix, 'enable') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'enable') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertFalse(option.default) + + option = Option('--disable-option') +- self.assertEquals(option.prefix, 'disable') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'disable') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertTrue(option.default) + + option = Option('--with-option') +- self.assertEquals(option.prefix, 'with') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'with') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertFalse(option.default) + + option = Option('--without-option') +- self.assertEquals(option.prefix, 'without') +- self.assertEquals(option.name, 'option') +- self.assertEquals(option.env, None) ++ self.assertEqual(option.prefix, 'without') ++ self.assertEqual(option.name, 'option') ++ self.assertEqual(option.env, None) + self.assertTrue(option.default) + + option = Option('--without-option-foo', env='MOZ_OPTION') +- self.assertEquals(option.env, 'MOZ_OPTION') ++ self.assertEqual(option.env, 'MOZ_OPTION') + + option = Option(env='MOZ_OPTION') +- self.assertEquals(option.prefix, '') +- self.assertEquals(option.name, None) +- self.assertEquals(option.env, 'MOZ_OPTION') ++ self.assertEqual(option.prefix, '') ++ self.assertEqual(option.name, None) ++ self.assertEqual(option.env, 'MOZ_OPTION') + self.assertFalse(option.default) + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=0, default=('a',)) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=1, default=()) +- self.assertEquals( ++ self.assertEqual( + e.exception.message, + 'default must be a bool, a string or a tuple of strings') + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=1, default=True) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=1, default=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=2, default=()) +- self.assertEquals( ++ self.assertEqual( + e.exception.message, + 'default must be a bool, a string or a tuple of strings') + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=2, default=True) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=2, default=('a',)) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='?', default=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='+', default=()) +- self.assertEquals( ++ self.assertEqual( + e.exception.message, + 'default must be a bool, a string or a tuple of strings') + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='+', default=True) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + # --disable options with a nargs value that requires at least one + # argument need to be given a default. + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs=1) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs='+') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + # Test nargs inference from default value + option = Option('--with-foo', default=True) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option('--with-foo', default=False) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option('--with-foo', default='a') +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option('--with-foo', default=('a',)) +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option('--with-foo', default=('a', 'b')) +- self.assertEquals(option.nargs, '*') ++ self.assertEqual(option.nargs, '*') + + option = Option(env='FOO', default=True) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option(env='FOO', default=False) +- self.assertEquals(option.nargs, 0) ++ self.assertEqual(option.nargs, 0) + + option = Option(env='FOO', default='a') +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option(env='FOO', default=('a',)) +- self.assertEquals(option.nargs, '?') ++ self.assertEqual(option.nargs, '?') + + option = Option(env='FOO', default=('a', 'b')) +- self.assertEquals(option.nargs, '*') ++ self.assertEqual(option.nargs, '*') + + def test_option_option(self): + for option in ( +@@ -170,70 +170,70 @@ class TestOption(unittest.TestCase): + '--with-option', + '--without-option', + ): +- self.assertEquals(Option(option).option, option) +- self.assertEquals(Option(option, env='FOO').option, option) ++ self.assertEqual(Option(option).option, option) ++ self.assertEqual(Option(option, env='FOO').option, option) + + opt = Option(option, default=False) +- self.assertEquals(opt.option, ++ self.assertEqual(opt.option, + option.replace('-disable-', '-enable-') + .replace('-without-', '-with-')) + + opt = Option(option, default=True) +- self.assertEquals(opt.option, ++ self.assertEqual(opt.option, + option.replace('-enable-', '-disable-') + .replace('-with-', '-without-')) + +- self.assertEquals(Option(env='FOO').option, 'FOO') ++ self.assertEqual(Option(env='FOO').option, 'FOO') + + def test_option_choices(self): + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=3, choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Not enough `choices` for `nargs`') + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', nargs=1, choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'A `default` must be given along with `choices`') + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', nargs='+', choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'A `default` must be given along with `choices`') + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', default='c', choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The `default` value must be one of 'a', 'b'") + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', default=('a', 'c',), choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The `default` value must be one of 'a', 'b'") + + with self.assertRaises(InvalidOptionError) as e: + Option('--without-option', default=('c',), choices=('a', 'b')) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The `default` value must be one of 'a', 'b'") + + option = Option('--with-option', nargs='+', choices=('a', 'b')) + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=c') +- self.assertEquals(e.exception.message, "'c' is not one of 'a', 'b'") ++ self.assertEqual(e.exception.message, "'c' is not one of 'a', 'b'") + + value = option.get_value('--with-option=b,a') + self.assertTrue(value) +- self.assertEquals(PositiveOptionValue(('b', 'a')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'a')), value) + + option = Option('--without-option', nargs='*', default='a', + choices=('a', 'b')) + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=c') +- self.assertEquals(e.exception.message, "'c' is not one of 'a', 'b'") ++ self.assertEqual(e.exception.message, "'c' is not one of 'a', 'b'") + + value = option.get_value('--with-option=b,a') + self.assertTrue(value) +- self.assertEquals(PositiveOptionValue(('b', 'a')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'a')), value) + + # Test nargs inference from choices + option = Option('--with-option', choices=('a', 'b')) +@@ -244,37 +244,37 @@ class TestOption(unittest.TestCase): + choices=('a', 'b', 'c', 'd')) + + value = option.get_value('--with-option=+d') +- self.assertEquals(PositiveOptionValue(('b', 'c', 'd')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'c', 'd')), value) + + value = option.get_value('--with-option=-b') +- self.assertEquals(PositiveOptionValue(('c',)), value) ++ self.assertEqual(PositiveOptionValue(('c',)), value) + + value = option.get_value('--with-option=-b,+d') +- self.assertEquals(PositiveOptionValue(('c','d')), value) ++ self.assertEqual(PositiveOptionValue(('c','d')), value) + + # Adding something that is in the default is fine + value = option.get_value('--with-option=+b') +- self.assertEquals(PositiveOptionValue(('b', 'c')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'c')), value) + + # Removing something that is not in the default is fine, as long as it + # is one of the choices + value = option.get_value('--with-option=-a') +- self.assertEquals(PositiveOptionValue(('b', 'c')), value) ++ self.assertEqual(PositiveOptionValue(('b', 'c')), value) + + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=-e') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "'e' is not one of 'a', 'b', 'c', 'd'") + + # Other "not a choice" errors. + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=+e') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "'e' is not one of 'a', 'b', 'c', 'd'") + + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--with-option=e') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "'e' is not one of 'a', 'b', 'c', 'd'") + + def test_option_value_compare(self): +@@ -294,7 +294,7 @@ class TestOption(unittest.TestCase): + + # For usability reasons, we raise TypeError when attempting to compare + # against a non-tuple. +- with self.assertRaisesRegexp(TypeError, 'cannot compare a'): ++ with self.assertRaisesRegex(TypeError, 'cannot compare a'): + val == 'foo' + + # But we allow empty option values to compare otherwise we can't +@@ -313,36 +313,36 @@ class TestOption(unittest.TestCase): + + def test_option_value_format(self): + val = PositiveOptionValue() +- self.assertEquals('--with-value', val.format('--with-value')) +- self.assertEquals('--with-value', val.format('--without-value')) +- self.assertEquals('--enable-value', val.format('--enable-value')) +- self.assertEquals('--enable-value', val.format('--disable-value')) +- self.assertEquals('--value', val.format('--value')) +- self.assertEquals('VALUE=1', val.format('VALUE')) ++ self.assertEqual('--with-value', val.format('--with-value')) ++ self.assertEqual('--with-value', val.format('--without-value')) ++ self.assertEqual('--enable-value', val.format('--enable-value')) ++ self.assertEqual('--enable-value', val.format('--disable-value')) ++ self.assertEqual('--value', val.format('--value')) ++ self.assertEqual('VALUE=1', val.format('VALUE')) + + val = PositiveOptionValue(('a',)) +- self.assertEquals('--with-value=a', val.format('--with-value')) +- self.assertEquals('--with-value=a', val.format('--without-value')) +- self.assertEquals('--enable-value=a', val.format('--enable-value')) +- self.assertEquals('--enable-value=a', val.format('--disable-value')) +- self.assertEquals('--value=a', val.format('--value')) +- self.assertEquals('VALUE=a', val.format('VALUE')) ++ self.assertEqual('--with-value=a', val.format('--with-value')) ++ self.assertEqual('--with-value=a', val.format('--without-value')) ++ self.assertEqual('--enable-value=a', val.format('--enable-value')) ++ self.assertEqual('--enable-value=a', val.format('--disable-value')) ++ self.assertEqual('--value=a', val.format('--value')) ++ self.assertEqual('VALUE=a', val.format('VALUE')) + + val = PositiveOptionValue(('a', 'b')) +- self.assertEquals('--with-value=a,b', val.format('--with-value')) +- self.assertEquals('--with-value=a,b', val.format('--without-value')) +- self.assertEquals('--enable-value=a,b', val.format('--enable-value')) +- self.assertEquals('--enable-value=a,b', val.format('--disable-value')) +- self.assertEquals('--value=a,b', val.format('--value')) +- self.assertEquals('VALUE=a,b', val.format('VALUE')) ++ self.assertEqual('--with-value=a,b', val.format('--with-value')) ++ self.assertEqual('--with-value=a,b', val.format('--without-value')) ++ self.assertEqual('--enable-value=a,b', val.format('--enable-value')) ++ self.assertEqual('--enable-value=a,b', val.format('--disable-value')) ++ self.assertEqual('--value=a,b', val.format('--value')) ++ self.assertEqual('VALUE=a,b', val.format('VALUE')) + + val = NegativeOptionValue() +- self.assertEquals('--without-value', val.format('--with-value')) +- self.assertEquals('--without-value', val.format('--without-value')) +- self.assertEquals('--disable-value', val.format('--enable-value')) +- self.assertEquals('--disable-value', val.format('--disable-value')) +- self.assertEquals('', val.format('--value')) +- self.assertEquals('VALUE=', val.format('VALUE')) ++ self.assertEqual('--without-value', val.format('--with-value')) ++ self.assertEqual('--without-value', val.format('--without-value')) ++ self.assertEqual('--disable-value', val.format('--enable-value')) ++ self.assertEqual('--disable-value', val.format('--disable-value')) ++ self.assertEqual('', val.format('--value')) ++ self.assertEqual('VALUE=', val.format('VALUE')) + + def test_option_value(self, name='option', nargs=0, default=None): + disabled = name.startswith(('disable-', 'without-')) +@@ -359,28 +359,28 @@ class TestOption(unittest.TestCase): + + if nargs in (0, '?', '*') or disabled: + value = option.get_value('--%s' % name, 'option') +- self.assertEquals(value, posOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, posOptionValue()) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s' % name) + if nargs == 1: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 1 value' % name) + elif nargs == '+': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 1 or more values' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 2 values' % name) + + value = option.get_value('') +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = option.get_value(None) +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + with self.assertRaises(AssertionError): + value = option.get_value('MOZ_OPTION=', 'environment') +@@ -393,47 +393,47 @@ class TestOption(unittest.TestCase): + + if nargs in (1, '?', '*', '+') and not disabled: + value = option.get_value('--%s=' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('',))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('',))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=' % name) + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d values' % (name, nargs)) + + if nargs in (1, '?', '*', '+') and not disabled: + value = option.get_value('--%s=foo' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('foo',))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('foo',))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=foo' % name) + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d values' % (name, nargs)) + + if nargs in (2, '*', '+') and not disabled: + value = option.get_value('--%s=foo,bar' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('foo', 'bar'))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('foo', 'bar'))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=foo,bar' % name, 'option') + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + elif nargs == '?': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 0 or 1 values' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d value%s' + % (name, nargs, 's' if nargs != 1 else '')) + +@@ -441,59 +441,59 @@ class TestOption(unittest.TestCase): + default=default) + if nargs in (0, '?', '*') or disabled: + value = option.get_value('--%s' % name, 'option') +- self.assertEquals(value, posOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, posOptionValue()) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s' % name) + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + elif nargs == '+': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes 1 or more values' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d value%s' + % (name, nargs, 's' if nargs != 1 else '')) + + value = option.get_value('') +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = option.get_value(None) +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = option.get_value('MOZ_OPTION=', 'environment') +- self.assertEquals(value, NegativeOptionValue()) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, NegativeOptionValue()) ++ self.assertEqual(value.origin, 'environment') + + if nargs in (0, '?', '*'): + value = option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, PositiveOptionValue()) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue()) ++ self.assertEqual(value.origin, 'environment') + elif nargs in (1, '+'): + value = option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, PositiveOptionValue(('1',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('1',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(e.exception.message, 'MOZ_OPTION takes 2 values') ++ self.assertEqual(e.exception.message, 'MOZ_OPTION takes 2 values') + + if nargs in (1, '?', '*', '+') and not disabled: + value = option.get_value('--%s=' % name, 'option') +- self.assertEquals(value, PositiveOptionValue(('',))) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue(('',))) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s=' % name, 'option') + if disabled: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'Cannot pass a value to --%s' % name) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s takes %d values' % (name, nargs)) + + with self.assertRaises(AssertionError): +@@ -501,26 +501,26 @@ class TestOption(unittest.TestCase): + + if nargs in (1, '?', '*', '+'): + value = option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d values' % nargs) + + if nargs in (2, '*', '+'): + value = option.get_value('MOZ_OPTION=foo,bar', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo', 'bar'))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo', 'bar'))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('MOZ_OPTION=foo,bar', 'environment') + if nargs == '?': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes 0 or 1 values') + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d value%s' + % (nargs, 's' if nargs != 1 else '')) + +@@ -532,26 +532,26 @@ class TestOption(unittest.TestCase): + env_option.get_value('--%s' % name) + + value = env_option.get_value('') +- self.assertEquals(value, defaultValue) +- self.assertEquals(value.origin, 'default') ++ self.assertEqual(value, defaultValue) ++ self.assertEqual(value.origin, 'default') + + value = env_option.get_value('MOZ_OPTION=', 'environment') +- self.assertEquals(value, negOptionValue()) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, negOptionValue()) ++ self.assertEqual(value.origin, 'environment') + + if nargs in (0, '?', '*'): + value = env_option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, posOptionValue()) ++ self.assertEqual(value, posOptionValue()) + self.assertTrue(value) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value.origin, 'environment') + elif nargs in (1, '+'): + value = env_option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(value, PositiveOptionValue(('1',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('1',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + env_option.get_value('MOZ_OPTION=1', 'environment') +- self.assertEquals(e.exception.message, 'MOZ_OPTION takes 2 values') ++ self.assertEqual(e.exception.message, 'MOZ_OPTION takes 2 values') + + with self.assertRaises(AssertionError) as e: + env_option.get_value('--%s' % name) +@@ -561,26 +561,26 @@ class TestOption(unittest.TestCase): + + if nargs in (1, '?', '*', '+'): + value = env_option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo',))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo',))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + env_option.get_value('MOZ_OPTION=foo', 'environment') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d values' % nargs) + + if nargs in (2, '*', '+'): + value = env_option.get_value('MOZ_OPTION=foo,bar', 'environment') +- self.assertEquals(value, PositiveOptionValue(('foo', 'bar'))) +- self.assertEquals(value.origin, 'environment') ++ self.assertEqual(value, PositiveOptionValue(('foo', 'bar'))) ++ self.assertEqual(value.origin, 'environment') + else: + with self.assertRaises(InvalidOptionError) as e: + env_option.get_value('MOZ_OPTION=foo,bar', 'environment') + if nargs == '?': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes 0 or 1 values') + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + 'MOZ_OPTION takes %d value%s' + % (nargs, 's' if nargs != 1 else '')) + +@@ -592,28 +592,28 @@ class TestOption(unittest.TestCase): + default=default) + + value = option.get_value('--%s-option' % disable, 'option') +- self.assertEquals(value, NegativeOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, NegativeOptionValue()) ++ self.assertEqual(value.origin, 'option') + + option = self.test_option_value('%s-option' % disable, nargs=nargs, + default=default) + + if nargs in (0, '?', '*'): + value = option.get_value('--%s-option' % enable, 'option') +- self.assertEquals(value, PositiveOptionValue()) +- self.assertEquals(value.origin, 'option') ++ self.assertEqual(value, PositiveOptionValue()) ++ self.assertEqual(value.origin, 'option') + else: + with self.assertRaises(InvalidOptionError) as e: + option.get_value('--%s-option' % enable, 'option') + if nargs == 1: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s-option takes 1 value' % enable) + elif nargs == '+': +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s-option takes 1 or more values' + % enable) + else: +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + '--%s-option takes 2 values' % enable) + + def test_option_value_with(self): +@@ -622,12 +622,12 @@ class TestOption(unittest.TestCase): + def test_option_value_invalid_nargs(self): + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs='foo') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "nargs must be a positive integer, '?', '*' or '+'") + + with self.assertRaises(InvalidOptionError) as e: + Option('--option', nargs=-2) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "nargs must be a positive integer, '?', '*' or '+'") + + def test_option_value_nargs_1(self): +@@ -638,7 +638,7 @@ class TestOption(unittest.TestCase): + # A default is required + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs=1) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + def test_option_value_nargs_2(self): +@@ -649,7 +649,7 @@ class TestOption(unittest.TestCase): + # A default is required + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs=2) +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + def test_option_value_nargs_0_or_1(self): +@@ -676,7 +676,7 @@ class TestOption(unittest.TestCase): + # A default is required + with self.assertRaises(InvalidOptionError) as e: + Option('--disable-option', nargs='+') +- self.assertEquals(e.exception.message, ++ self.assertEqual(e.exception.message, + "The given `default` doesn't satisfy `nargs`") + + +@@ -684,21 +684,21 @@ class TestCommandLineHelper(unittest.TestCase): + def test_basic(self): + helper = CommandLineHelper({}, ['cmd', '--foo', '--bar']) + +- self.assertEquals(['--foo', '--bar'], list(helper)) ++ self.assertEqual(['--foo', '--bar'], list(helper)) + + helper.add('--enable-qux') + +- self.assertEquals(['--foo', '--bar', '--enable-qux'], list(helper)) ++ self.assertEqual(['--foo', '--bar', '--enable-qux'], list(helper)) + + value, option = helper.handle(Option('--bar')) +- self.assertEquals(['--foo', '--enable-qux'], list(helper)) +- self.assertEquals(PositiveOptionValue(), value) +- self.assertEquals('--bar', option) ++ self.assertEqual(['--foo', '--enable-qux'], list(helper)) ++ self.assertEqual(PositiveOptionValue(), value) ++ self.assertEqual('--bar', option) + + value, option = helper.handle(Option('--baz')) +- self.assertEquals(['--foo', '--enable-qux'], list(helper)) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals(None, option) ++ self.assertEqual(['--foo', '--enable-qux'], list(helper)) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual(None, option) + + with self.assertRaises(AssertionError): + CommandLineHelper({}, ['--foo', '--bar']) +@@ -707,89 +707,89 @@ class TestCommandLineHelper(unittest.TestCase): + foo = Option('--with-foo', nargs='*') + helper = CommandLineHelper({}, ['cmd', '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + helper = CommandLineHelper({}, ['cmd', '--with-foo=a,b', + '--without-foo']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--without-foo', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--without-foo', option) + + helper = CommandLineHelper({}, ['cmd', '--without-foo', + '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + foo = Option('--with-foo', env='FOO', nargs='*') + helper = CommandLineHelper({'FOO': ''}, ['cmd', '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + helper = CommandLineHelper({'FOO': 'a,b'}, ['cmd', '--without-foo']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--without-foo', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--without-foo', option) + + helper = CommandLineHelper({'FOO': ''}, ['cmd', '--with-bar=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('environment', value.origin) +- self.assertEquals('FOO=', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('environment', value.origin) ++ self.assertEqual('FOO=', option) + + helper = CommandLineHelper({'FOO': 'a,b'}, ['cmd', '--without-bar']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('environment', value.origin) +- self.assertEquals('FOO=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('environment', value.origin) ++ self.assertEqual('FOO=a,b', option) + + helper = CommandLineHelper({}, ['cmd', '--with-foo=a,b', 'FOO=']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('FOO=', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('FOO=', option) + + helper = CommandLineHelper({}, ['cmd', '--without-foo', 'FOO=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('FOO=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('FOO=a,b', option) + + helper = CommandLineHelper({}, ['cmd', 'FOO=', '--with-foo=a,b']) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b')), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--with-foo=a,b', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b')), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--with-foo=a,b', option) + + helper = CommandLineHelper({}, ['cmd', 'FOO=a,b', '--without-foo']) + value, option = helper.handle(foo) +- self.assertEquals(NegativeOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--without-foo', option) ++ self.assertEqual(NegativeOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--without-foo', option) + + def test_extra_args(self): + foo = Option('--with-foo', env='FOO', nargs='*') + helper = CommandLineHelper({}, ['cmd']) + helper.add('FOO=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('FOO=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('FOO=a,b,c', option) + + helper = CommandLineHelper({}, ['cmd']) + helper.add('FOO=a,b,c', 'other-origin') + helper.add('--with-foo=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('--with-foo=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('--with-foo=a,b,c', option) + + # Adding conflicting options is not allowed. + helper = CommandLineHelper({}, ['cmd']) +@@ -809,9 +809,9 @@ class TestCommandLineHelper(unittest.TestCase): + # But adding the same is allowed. + helper.add('FOO=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('FOO=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('FOO=a,b,c', option) + + # The same rule as above applies when using the option form vs. the + # variable form. But we can't detect it when .add is called. +@@ -837,9 +837,9 @@ class TestCommandLineHelper(unittest.TestCase): + helper.add('FOO=a,b,c', 'other-origin') + helper.add('--with-foo=a,b,c', 'other-origin') + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(('a', 'b', 'c')), value) +- self.assertEquals('other-origin', value.origin) +- self.assertEquals('--with-foo=a,b,c', option) ++ self.assertEqual(PositiveOptionValue(('a', 'b', 'c')), value) ++ self.assertEqual('other-origin', value.origin) ++ self.assertEqual('--with-foo=a,b,c', option) + + # Conflicts are also not allowed against what is in the + # environment/on the command line. +@@ -869,19 +869,19 @@ class TestCommandLineHelper(unittest.TestCase): + foo = Option('--foo', + possible_origins=('command-line',)) + value, option = helper.handle(foo) +- self.assertEquals(PositiveOptionValue(), value) +- self.assertEquals('command-line', value.origin) +- self.assertEquals('--foo', option) ++ self.assertEqual(PositiveOptionValue(), value) ++ self.assertEqual('command-line', value.origin) ++ self.assertEqual('--foo', option) + + bar = Option('--bar', + possible_origins=('mozconfig',)) +- with self.assertRaisesRegexp(InvalidOptionError, ++ with self.assertRaisesRegex(InvalidOptionError, + "--bar can not be set by command-line. Values are accepted from: mozconfig"): + helper.handle(bar) + + baz = Option(env='BAZ', + possible_origins=('implied',)) +- with self.assertRaisesRegexp(InvalidOptionError, ++ with self.assertRaisesRegex(InvalidOptionError, + "BAZ=1 can not be set by environment. Values are accepted from: implied"): + helper.handle(baz) + +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +index cb7ff709e..c339a32bf 100755 +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +@@ -2,12 +2,12 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import logging + import os + +-from StringIO import StringIO ++from io import StringIO + + from mozunit import main + +@@ -366,9 +366,9 @@ class BaseToolchainTest(BaseConfigureTest): + compiler = sandbox._value_for(sandbox[var]) + # Add var on both ends to make it clear which of the + # variables is failing the test when that happens. +- self.assertEquals((var, compiler), (var, result)) ++ self.assertEqual((var, compiler), (var, result)) + except SystemExit: +- self.assertEquals((var, result), ++ self.assertEqual((var, result), + (var, self.out.getvalue().strip())) + return + +@@ -407,7 +407,7 @@ class BaseToolchainTest(BaseConfigureTest): + 'RUST_LIB_SUFFIX', + 'OBJ_SUFFIX', + ): +- self.assertEquals('%s=%s' % (k, sandbox.get_config(k)), ++ self.assertEqual('%s=%s' % (k, sandbox.get_config(k)), + '%s=%s' % (k, library_name_info[k])) + + +@@ -584,7 +584,7 @@ class LinuxToolchainTest(BaseToolchainTest): + # We'll try gcc and clang, but since there is no gcc (gcc-x.y doesn't + # count), find clang. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('gcc', 'g++') + } + self.do_toolchain_test(paths, { +@@ -619,7 +619,7 @@ class LinuxToolchainTest(BaseToolchainTest): + # Even if there are gcc-x.y or clang-x.y compilers available, we + # don't try them. This could be considered something to improve. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('gcc', 'g++', 'clang', 'clang++') + } + self.do_toolchain_test(paths, { +@@ -800,7 +800,7 @@ class OSXToolchainTest(BaseToolchainTest): + def test_not_gcc(self): + # We won't pick GCC if it's the only thing available. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('clang', 'clang++') + } + self.do_toolchain_test(paths, { +@@ -976,7 +976,7 @@ class WindowsToolchainTest(BaseToolchainTest): + def test_clang_cl(self): + # We'll pick clang-cl if msvc can't be found. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) != 'cl' + } + self.do_toolchain_test(paths, { +@@ -987,7 +987,7 @@ class WindowsToolchainTest(BaseToolchainTest): + def test_gcc(self): + # We'll pick GCC if msvc and clang-cl can't be found. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('cl', 'clang-cl') + } + self.do_toolchain_test(paths, { +@@ -1006,7 +1006,7 @@ class WindowsToolchainTest(BaseToolchainTest): + def test_clang(self): + # We'll pick clang if nothing else is found. + paths = { +- k: v for k, v in self.PATHS.iteritems() ++ k: v for k, v in self.PATHS.items() + if os.path.basename(k) not in ('cl', 'clang-cl', 'gcc') + } + self.do_toolchain_test(paths, { +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py +index 8ec33a8b7..ba046ed12 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import copy + import re +@@ -10,7 +10,7 @@ import types + import unittest + + from fnmatch import fnmatch +-from StringIO import StringIO ++from io import StringIO + from textwrap import dedent + + from mozunit import ( +@@ -43,7 +43,7 @@ class CompilerPreprocessor(Preprocessor): + # Hack around it enough that the configure tests work properly. + context = self.context + def normalize_numbers(value): +- if isinstance(value, types.StringTypes): ++ if isinstance(value, (str,)): + if value[-1:] == 'L' and value[:-1].isdigit(): + value = int(value[:-1]) + return value +@@ -53,7 +53,7 @@ class CompilerPreprocessor(Preprocessor): + return self.HAS_FEATURE.sub(r'\1\2', expr) + self.context = self.Context( + (normalize_has_feature(k), normalize_numbers(v)) +- for k, v in context.iteritems() ++ for k, v in context.items() + ) + try: + return Preprocessor.do_if(self, normalize_has_feature(expression), +@@ -95,7 +95,7 @@ class TestCompilerPreprocessor(unittest.TestCase): + input.name = 'foo' + pp.do_include(input) + +- self.assertEquals(pp.out.getvalue(), '1 . 2 . c "D"') ++ self.assertEqual(pp.out.getvalue(), '1 . 2 . c "D"') + + def test_condition(self): + pp = CompilerPreprocessor({ +@@ -125,7 +125,7 @@ class TestCompilerPreprocessor(unittest.TestCase): + input.name = 'foo' + pp.do_include(input) + +- self.assertEquals('IFDEF_A\nIF_A\nIF_B\nIF_NOT_C\n', pp.out.getvalue()) ++ self.assertEqual('IFDEF_A\nIF_A\nIF_B\nIF_NOT_C\n', pp.out.getvalue()) + + + class FakeCompiler(dict): +@@ -164,9 +164,9 @@ class FakeCompiler(dict): + ''' + def __init__(self, *definitions): + for definition in definitions: +- if all(not isinstance(d, dict) for d in definition.itervalues()): ++ if all(not isinstance(d, dict) for d in definition.values()): + definition = {None: definition} +- for key, value in definition.iteritems(): ++ for key, value in definition.items(): + self.setdefault(key, {}).update(value) + + def __call__(self, stdin, args): +@@ -178,14 +178,14 @@ class FakeCompiler(dict): + pp = CompilerPreprocessor(self[None]) + + def apply_defn(defn): +- for k, v in defn.iteritems(): ++ for k, v in defn.items(): + if v is False: + if k in pp.context: + del pp.context[k] + else: + pp.context[k] = v + +- for glob, defn in self.iteritems(): ++ for glob, defn in self.items(): + if glob and not glob.startswith('-') and fnmatch(file, glob): + apply_defn(defn) + +@@ -216,7 +216,7 @@ class TestFakeCompiler(unittest.TestCase): + 'A': '1', + 'B': '2', + }) +- self.assertEquals(compiler(None, ['-E', 'file']), ++ self.assertEqual(compiler(None, ['-E', 'file']), + (0, '1 2 C', '')) + + compiler = FakeCompiler({ +@@ -238,25 +238,25 @@ class TestFakeCompiler(unittest.TestCase): + 'B': '42', + }, + }) +- self.assertEquals(compiler(None, ['-E', 'file']), ++ self.assertEqual(compiler(None, ['-E', 'file']), + (0, '1 2 C', '')) +- self.assertEquals(compiler(None, ['-E', '-foo', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-foo', 'file']), + (0, '1 2 foo', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-bar', 'file']), + (0, '1 bar bar', '')) +- self.assertEquals(compiler(None, ['-E', '-qux', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-qux', 'file']), + (0, '1 B C', '')) +- self.assertEquals(compiler(None, ['-E', '-foo', '-bar', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-foo', '-bar', 'file']), + (0, '1 bar bar', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', '-foo', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-bar', '-foo', 'file']), + (0, '1 bar foo', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', '-qux', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-bar', '-qux', 'file']), + (0, '1 B bar', '')) +- self.assertEquals(compiler(None, ['-E', '-qux', '-bar', 'file']), ++ self.assertEqual(compiler(None, ['-E', '-qux', '-bar', 'file']), + (0, '1 bar bar', '')) +- self.assertEquals(compiler(None, ['-E', 'file.c']), ++ self.assertEqual(compiler(None, ['-E', 'file.c']), + (0, '1 42 C', '')) +- self.assertEquals(compiler(None, ['-E', '-bar', 'file.c']), ++ self.assertEqual(compiler(None, ['-E', '-bar', 'file.c']), + (0, '1 bar bar', '')) + + def test_multiple_definitions(self): +@@ -267,7 +267,7 @@ class TestFakeCompiler(unittest.TestCase): + 'C': 3, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 2, +@@ -282,7 +282,7 @@ class TestFakeCompiler(unittest.TestCase): + 'C': 3, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 4, +@@ -302,7 +302,7 @@ class TestFakeCompiler(unittest.TestCase): + }, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 4, +@@ -330,7 +330,7 @@ class TestFakeCompiler(unittest.TestCase): + }, + }) + +- self.assertEquals(compiler, { ++ self.assertEqual(compiler, { + None: { + 'A': 1, + 'B': 2, +@@ -370,7 +370,7 @@ class CompilerResult(ReadOnlyNamespace): + def __add__(self, other): + assert isinstance(other, dict) + result = copy.deepcopy(self.__dict__) +- for k, v in other.iteritems(): ++ for k, v in other.items(): + if k == 'flags': + result.setdefault(k, []).extend(v) + else: +@@ -381,7 +381,7 @@ class CompilerResult(ReadOnlyNamespace): + class TestCompilerResult(unittest.TestCase): + def test_compiler_result(self): + result = CompilerResult() +- self.assertEquals(result.__dict__, { ++ self.assertEqual(result.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath(''), + 'version': '', +@@ -397,7 +397,7 @@ class TestCompilerResult(unittest.TestCase): + language='C', + flags=['-std=gnu99'], + ) +- self.assertEquals(result.__dict__, { ++ self.assertEqual(result.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath('/usr/bin/gcc'), + 'version': '4.2.1', +@@ -407,7 +407,7 @@ class TestCompilerResult(unittest.TestCase): + }) + + result2 = result + {'flags': ['-m32']} +- self.assertEquals(result2.__dict__, { ++ self.assertEqual(result2.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath('/usr/bin/gcc'), + 'version': '4.2.1', +@@ -416,14 +416,14 @@ class TestCompilerResult(unittest.TestCase): + 'flags': ['-std=gnu99', '-m32'], + }) + # Original flags are untouched. +- self.assertEquals(result.flags, ['-std=gnu99']) ++ self.assertEqual(result.flags, ['-std=gnu99']) + + result3 = result + { + 'compiler': '/usr/bin/gcc-4.7', + 'version': '4.7.3', + 'flags': ['-m32'], + } +- self.assertEquals(result3.__dict__, { ++ self.assertEqual(result3.__dict__, { + 'wrapper': [], + 'compiler': mozpath.abspath('/usr/bin/gcc-4.7'), + 'version': '4.7.3', +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py +index ac35d745f..cdd8ece1b 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import os + +diff --git a/python/mozbuild/mozbuild/test/configure/test_util.py b/python/mozbuild/mozbuild/test/configure/test_util.py +index 9f9575fd0..c2db1a628 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_util.py ++++ b/python/mozbuild/mozbuild/test/configure/test_util.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, print_function, unicode_literals ++ + + import logging + import os +@@ -11,7 +11,7 @@ import textwrap + import unittest + import sys + +-from StringIO import StringIO ++from io import StringIO + + from mozunit import main + from mozpack import path as mozpath +@@ -434,11 +434,11 @@ class TestLogSubprocessOutput(unittest.TestCase): + except SystemExit as e: + status = e.code + +- self.assertEquals(status, 0) ++ self.assertEqual(status, 0) + quote_char = "'" + if getpreferredencoding().lower() == 'utf-8': + quote_char = '\u00B4'.encode('utf-8') +- self.assertEquals(out.getvalue().strip(), quote_char) ++ self.assertEqual(out.getvalue().strip(), quote_char) + + + class TestVersion(unittest.TestCase): +diff --git a/python/mozbuild/mozbuild/testing.py b/python/mozbuild/mozbuild/testing.py +index 3229c3f77..82d250fab 100644 +--- a/python/mozbuild/mozbuild/testing.py ++++ b/python/mozbuild/mozbuild/testing.py +@@ -2,9 +2,9 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals + +-import cPickle as pickle ++ ++import pickle as pickle + import os + import sys + +@@ -70,7 +70,7 @@ REFTEST_FLAVORS = ('crashtest', 'reftest') + WEB_PLATFORM_TESTS_FLAVORS = ('web-platform-tests',) + + def all_test_flavors(): +- return ([v[0] for v in TEST_MANIFESTS.values()] + ++ return ([v[0] for v in list(TEST_MANIFESTS.values())] + + list(REFTEST_FLAVORS) + + list(WEB_PLATFORM_TESTS_FLAVORS)) + +@@ -210,7 +210,7 @@ def install_test_files(topsrcdir, topobjdir, tests_root, test_objs): + only a few tests need to be run. + """ + flavor_info = {flavor: (root, prefix, install) +- for (flavor, root, prefix, install) in TEST_MANIFESTS.values()} ++ for (flavor, root, prefix, install) in list(TEST_MANIFESTS.values())} + objdir_dest = mozpath.join(topobjdir, tests_root) + + converter = SupportFilesConverter() +@@ -292,7 +292,7 @@ def read_wpt_manifest(context, paths): + paths_file = os.path.join(context.config.topsrcdir, "testing", + "web-platform", "tests", "tools", "localpaths.py") + _globals = {"__file__": paths_file} +- execfile(paths_file, _globals) ++ exec(compile(open(paths_file, "rb").read(), paths_file, 'exec'), _globals) + import manifest as wptmanifest + finally: + sys.path = old_path +diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py +index 4ea227dc0..79cb15713 100644 +--- a/python/mozbuild/mozbuild/util.py ++++ b/python/mozbuild/mozbuild/util.py +@@ -5,7 +5,7 @@ + # This file contains miscellaneous utility functions that don't belong anywhere + # in particular. + +-from __future__ import absolute_import, unicode_literals, print_function ++ + + import argparse + import collections +@@ -21,6 +21,9 @@ import stat + import sys + import time + import types ++import pprint ++import six ++import subprocess + + from collections import ( + defaultdict, +@@ -36,7 +39,7 @@ from io import ( + if sys.version_info[0] == 3: + str_type = str + else: +- str_type = basestring ++ str_type = str + + if sys.platform == 'win32': + _kernel32 = ctypes.windll.kernel32 +@@ -78,7 +81,7 @@ def hash_file(path, hasher=None): + return h.hexdigest() + + +-class EmptyValue(unicode): ++class EmptyValue(str): + """A dummy type that behaves like an empty string and sequence. + + This type exists in order to support +@@ -92,7 +95,7 @@ class EmptyValue(unicode): + class ReadOnlyNamespace(object): + """A class for objects with immutable attributes set at initialization.""" + def __init__(self, **kwargs): +- for k, v in kwargs.iteritems(): ++ for k, v in kwargs.items(): + super(ReadOnlyNamespace, self).__setattr__(k, v) + + def __delattr__(self, key): +@@ -224,7 +227,7 @@ class FileAvoidWrite(BytesIO): + self.mode = mode + + def write(self, buf): +- if isinstance(buf, unicode): ++ if isinstance(buf, str): + buf = buf.encode('utf-8') + BytesIO.write(self, buf) + +@@ -267,6 +270,10 @@ class FileAvoidWrite(BytesIO): + if 'b' in self.mode: + writemode += 'b' + with open(self.name, writemode) as file: ++ if 'b' in self.mode and isinstance(buf, str): ++ buf = buf.encode('utf-8') ++ elif 'b' not in self.mode and isinstance(buf, bytes): ++ buf = buf.decode('utf-8') + file.write(buf) + + if self._capture_diff: +@@ -381,7 +388,7 @@ class ListMixin(object): + def __add__(self, other): + # Allow None and EmptyValue is a special case because it makes undefined + # variable references in moz.build behave better. +- other = [] if isinstance(other, (types.NoneType, EmptyValue)) else other ++ other = [] if isinstance(other, (type(None), EmptyValue)) else other + if not isinstance(other, list): + raise ValueError('Only lists can be appended to lists.') + +@@ -390,7 +397,7 @@ class ListMixin(object): + return new_list + + def __iadd__(self, other): +- other = [] if isinstance(other, (types.NoneType, EmptyValue)) else other ++ other = [] if isinstance(other, (type(None), EmptyValue)) else other + if not isinstance(other, list): + raise ValueError('Only lists can be appended to lists.') + +@@ -561,14 +568,14 @@ def FlagsFactory(flags): + functions below. + """ + assert isinstance(flags, dict) +- assert all(isinstance(v, type) for v in flags.values()) ++ assert all(isinstance(v, type) for v in list(flags.values())) + + class Flags(object): +- __slots__ = flags.keys() ++ __slots__ = list(flags.keys()) + _flags = flags + + def update(self, **kwargs): +- for k, v in kwargs.iteritems(): ++ for k, v in kwargs.items(): + setattr(self, k, v) + + def __getattr__(self, name): +@@ -1006,8 +1013,6 @@ def TypedNamedTuple(name, fields): + 'got %s, expected %s' % (fname, + type(value), ftype)) + +- super(TypedTuple, self).__init__(*args, **kwargs) +- + TypedTuple._fields = fields + + return TypedTuple +@@ -1099,14 +1104,14 @@ def group_unified_files(files, unified_prefix, unified_suffix, + # issue. So we do a little dance to filter it out ourselves. + dummy_fill_value = ("dummy",) + def filter_out_dummy(iterable): +- return itertools.ifilter(lambda x: x != dummy_fill_value, ++ return filter(lambda x: x != dummy_fill_value, + iterable) + + # From the itertools documentation, slightly modified: + def grouper(n, iterable): + "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx" + args = [iter(iterable)] * n +- return itertools.izip_longest(fillvalue=dummy_fill_value, *args) ++ return itertools.zip_longest(fillvalue=dummy_fill_value, *args) + + for i, unified_group in enumerate(grouper(files_per_unified_file, + files)): +@@ -1123,7 +1128,7 @@ def pair(iterable): + [(1,2), (3,4), (5,6)] + ''' + i = iter(iterable) +- return itertools.izip_longest(i, i) ++ return itertools.zip_longest(i, i) + + + VARIABLES_RE = re.compile('\$\((\w+)\)') +@@ -1141,7 +1146,7 @@ def expand_variables(s, variables): + value = variables.get(name) + if not value: + continue +- if not isinstance(value, types.StringTypes): ++ if not isinstance(value, (str,)): + value = ' '.join(value) + result += value + return result +@@ -1168,7 +1173,7 @@ class EnumStringComparisonError(Exception): + pass + + +-class EnumString(unicode): ++class EnumString(str): + '''A string type that only can have a limited set of values, similarly to + an Enum, and can only be compared against that set of values. + +@@ -1185,8 +1190,8 @@ class EnumString(unicode): + def __eq__(self, other): + if other not in self.POSSIBLE_VALUES: + raise EnumStringComparisonError( +- 'Can only compare with %s' +- % ', '.join("'%s'" % v for v in self.POSSIBLE_VALUES)) ++ '%s is not in %s' ++ % (other, ', '.join("'%s'" % v for v in self.POSSIBLE_VALUES))) + return super(EnumString, self).__eq__(other) + + def __ne__(self, other): +@@ -1204,14 +1209,14 @@ def _escape_char(c): + # quoting could be done with either ' or ". + if c == "'": + return "\\'" +- return unicode(c.encode('unicode_escape')) ++ return str(c.encode('unicode_escape')) + + # Mapping table between raw characters below \x80 and their escaped + # counterpart, when they differ + _INDENTED_REPR_TABLE = { + c: e + for c, e in map(lambda x: (x, _escape_char(x)), +- map(unichr, range(128))) ++ map(chr, range(128))) + if c != e + } + # Regexp matching all characters to escape. +@@ -1219,7 +1224,33 @@ _INDENTED_REPR_RE = re.compile( + '([' + ''.join(_INDENTED_REPR_TABLE.values()) + ']+)') + + ++# Stolen from gecko master [1] ++# [1] https://github.com/mozilla/gecko-dev/blob/4165a2e843c494bfb3e35d8a1fbf9c61209e3675/python/mozbuild/mozbuild/util.py#L1286 ++ ++# The default PrettyPrinter has some issues with UTF-8, so we need to override ++# some stuff here. ++class _PrettyPrinter(pprint.PrettyPrinter): ++ def format(self, object, context, maxlevels, level): ++ if not (isinstance(object, six.text_type) or ++ isinstance(object, six.binary_type)): ++ return super(_PrettyPrinter, self).format( ++ object, context, maxlevels, level) ++ # This is super hacky and weird, but the output of 'repr' actually ++ # varies based on the default I/O encoding of the process, which isn't ++ # necessarily utf-8. Instead we open a new shell and ask what the repr ++ # WOULD be assuming the default encoding is utf-8. If you can come up ++ # with a better way of doing this without simply re-implementing the ++ # logic of "repr", please replace this. ++ env = dict(os.environ) ++ env['PYTHONIOENCODING'] = 'utf-8' ++ ret = six.ensure_text(subprocess.check_output( ++ [sys.executable], input='print(repr(%s))' % repr(object), ++ universal_newlines=True, env=env, encoding='utf-8')).strip() ++ return (ret, True, False) ++ + def indented_repr(o, indent=4): ++ return _PrettyPrinter(indent=indent).pformat(o) ++ + '''Similar to repr(), but returns an indented representation of the object + + One notable difference with repr is that the returned representation +@@ -1242,7 +1273,7 @@ def indented_repr(o, indent=4): + elif isinstance(o, bytes): + yield 'b' + yield repr(o) +- elif isinstance(o, unicode): ++ elif isinstance(o, str): + yield "'" + # We want a readable string (non escaped unicode), but some + # special characters need escaping (e.g. \n, \t, etc.) +@@ -1272,11 +1303,11 @@ def encode(obj, encoding='utf-8'): + if isinstance(obj, dict): + return { + encode(k, encoding): encode(v, encoding) +- for k, v in obj.iteritems() ++ for k, v in obj.items() + } + if isinstance(obj, bytes): + return obj +- if isinstance(obj, unicode): ++ if isinstance(obj, str): + return obj.encode(encoding) + if isinstance(obj, Iterable): + return [encode(i, encoding) for i in obj] +diff --git a/python/mozbuild/mozbuild/virtualenv.py b/python/mozbuild/mozbuild/virtualenv.py +index 38d06d71d..c67c046f3 100644 +--- a/python/mozbuild/mozbuild/virtualenv.py ++++ b/python/mozbuild/mozbuild/virtualenv.py +@@ -531,9 +531,9 @@ def verify_python_version(log_handle): + + our = LooseVersion('%d.%d.%d' % (major, minor, micro)) + +- if major != MINIMUM_PYTHON_MAJOR or our < MINIMUM_PYTHON_VERSION: +- log_handle.write('Python %s or greater (but not Python 3) is ' +- 'required to build. ' % MINIMUM_PYTHON_VERSION) ++ if our < MINIMUM_PYTHON_VERSION: ++ log_handle.write('Python %s or greater is required to build. ' ++ % MINIMUM_PYTHON_VERSION) + log_handle.write('You are running Python %s.\n' % our) + + if os.name in ('nt', 'ce'): +diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py +index c91b99cf1..02eac0dbb 100644 +--- a/python/mozbuild/mozpack/chrome/manifest.py ++++ b/python/mozbuild/mozpack/chrome/manifest.py +@@ -2,11 +2,11 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import re + import os +-from urlparse import urlparse ++from urllib.parse import urlparse + import mozpack.path as mozpath + from mozpack.chrome.flags import Flags + from mozpack.errors import errors +@@ -316,7 +316,7 @@ class ManifestContract(ManifestEntry): + return self.serialize(self.contractID, self.cid) + + # All manifest classes by their type name. +-MANIFESTS_TYPES = dict([(c.type, c) for c in globals().values() ++MANIFESTS_TYPES = dict([(c.type, c) for c in list(globals().values()) + if type(c) == type and issubclass(c, ManifestEntry) + and hasattr(c, 'type') and c.type]) + +diff --git a/python/mozbuild/mozpack/copier.py b/python/mozbuild/mozpack/copier.py +index 1e521e52b..43ed9be4a 100644 +--- a/python/mozbuild/mozpack/copier.py ++++ b/python/mozbuild/mozpack/copier.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import os + import stat +@@ -113,7 +113,7 @@ class FileRegistry(object): + ''' + Return all paths stored in the container, in the order they were added. + ''' +- return self._files.keys() ++ return list(self._files.keys()) + + def __len__(self): + ''' +@@ -146,7 +146,7 @@ class FileRegistry(object): + for path, file in registry: + (...) + ''' +- return self._files.iteritems() ++ return iter(self._files.items()) + + def required_directories(self): + ''' +@@ -155,7 +155,7 @@ class FileRegistry(object): + unspecified (virtual) root directory (and do not include said root + directory). + ''' +- return set(k for k, v in self._required_directories.items() if v > 0) ++ return set(k for k, v in list(self._required_directories.items()) if v > 0) + + def output_to_inputs_tree(self): + ''' +@@ -295,7 +295,7 @@ class FileCopier(FileRegistry): + + Returns a FileCopyResult that details what changed. + ''' +- assert isinstance(destination, basestring) ++ assert isinstance(destination, str) + assert not os.path.exists(destination) or os.path.isdir(destination) + + result = FileCopyResult() +@@ -563,7 +563,7 @@ class Jarrer(FileRegistry, BaseFile): + def exists(self): + return self.deflater is not None + +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + assert isinstance(dest, Dest) + +diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py +index 8ce353375..bf35e39b8 100644 +--- a/python/mozbuild/mozpack/files.py ++++ b/python/mozbuild/mozpack/files.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + import errno + import os +@@ -57,7 +57,7 @@ else: + + def _copyfile(src, dest): + # False indicates `dest` should be overwritten if it exists already. +- if isinstance(src, unicode) and isinstance(dest, unicode): ++ if isinstance(src, str) and isinstance(dest, str): + _CopyFileW(src, dest, False) + elif isinstance(src, str) and isinstance(dest, str): + _CopyFileA(src, dest, False) +@@ -164,7 +164,7 @@ class BaseFile(object): + disabled when skip_if_older is False. + Returns whether a copy was actually performed (True) or not (False). + ''' +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + else: + assert isinstance(dest, Dest) +@@ -278,11 +278,11 @@ class ExecutableFile(File): + ''' + def copy(self, dest, skip_if_older=True): + real_dest = dest +- if not isinstance(dest, basestring): ++ if not isinstance(dest, str): + fd, dest = mkstemp() + os.close(fd) + os.remove(dest) +- assert isinstance(dest, basestring) ++ assert isinstance(dest, str) + # If File.copy didn't actually copy because dest is newer, check the + # file sizes. If dest is smaller, it means it is already stripped and + # elfhacked, so we can skip. +@@ -319,7 +319,7 @@ class AbsoluteSymlinkFile(File): + File.__init__(self, path) + + def copy(self, dest, skip_if_older=True): +- assert isinstance(dest, basestring) ++ assert isinstance(dest, str) + + # The logic in this function is complicated by the fact that symlinks + # aren't universally supported. So, where symlinks aren't supported, we +@@ -410,7 +410,7 @@ class HardlinkFile(File): + ''' + + def copy(self, dest, skip_if_older=True): +- assert isinstance(dest, basestring) ++ assert isinstance(dest, str) + + if not hasattr(os, 'link'): + return super(HardlinkFile, self).copy( +@@ -471,7 +471,7 @@ class ExistingFile(BaseFile): + self.required = required + + def copy(self, dest, skip_if_older=True): +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + else: + assert isinstance(dest, Dest) +@@ -517,7 +517,7 @@ class PreprocessedFile(BaseFile): + ''' + Invokes the preprocessor to create the destination file. + ''' +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + else: + assert isinstance(dest, Dest) +@@ -657,7 +657,7 @@ class XPTFile(GeneratedFile): + the individual XPTs to link. + skip_if_older is ignored. + ''' +- if isinstance(dest, basestring): ++ if isinstance(dest, str): + dest = Dest(dest) + assert isinstance(dest, Dest) + +@@ -1108,7 +1108,7 @@ class ComposedFinder(BaseFinder): + from mozpack.copier import FileRegistry + self.files = FileRegistry() + +- for base, finder in sorted(finders.iteritems()): ++ for base, finder in sorted(finders.items()): + if self.files.contains(base): + self.files.remove(base) + for p, f in finder.find(''): +diff --git a/python/mozbuild/mozpack/manifests.py b/python/mozbuild/mozpack/manifests.py +index 27c66634b..f79b40086 100644 +--- a/python/mozbuild/mozpack/manifests.py ++++ b/python/mozbuild/mozpack/manifests.py +@@ -2,8 +2,6 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import, unicode_literals +- + from contextlib import contextmanager + import json + +@@ -116,7 +114,7 @@ class InstallManifest(object): + self._source_files = set() + + if path or fileobj: +- with _auto_fileobj(path, fileobj, 'rb') as fh: ++ with _auto_fileobj(path, fileobj, 'r') as fh: + self._source_files.add(fh.name) + self._load_from_fileobj(fh) + +@@ -175,7 +173,7 @@ class InstallManifest(object): + dest, content = fields[1:] + + self.add_content( +- self._decode_field_entry(content).encode('utf-8'), dest) ++ self._decode_field_entry(content), dest) + continue + + # Don't fail for non-actionable items, allowing +@@ -228,7 +226,7 @@ class InstallManifest(object): + + It is an error if both are specified. + """ +- with _auto_fileobj(path, fileobj, 'wb') as fh: ++ with _auto_fileobj(path, fileobj, 'w') as fh: + fh.write('%d\n' % self.CURRENT_VERSION) + + for dest in sorted(self._dests): +@@ -242,13 +240,11 @@ class InstallManifest(object): + for path in paths: + source = mozpath.join(base, path) + parts = ['%d' % type, mozpath.join(dest, path), source] +- fh.write('%s\n' % self.FIELD_SEPARATOR.join( +- p.encode('utf-8') for p in parts)) ++ fh.write('%s\n' % self.FIELD_SEPARATOR.join(parts)) + else: + parts = ['%d' % entry[0], dest] + parts.extend(entry[1:]) +- fh.write('%s\n' % self.FIELD_SEPARATOR.join( +- p.encode('utf-8') for p in parts)) ++ fh.write('%s\n' % self.FIELD_SEPARATOR.join(parts)) + + def add_link(self, source, dest): + """Add a link to this manifest. +@@ -439,7 +435,7 @@ class InstallManifest(object): + if install_type == self.CONTENT: + # GeneratedFile expect the buffer interface, which the unicode + # type doesn't have, so encode to a str. +- content = self._decode_field_entry(entry[1]).encode('utf-8') ++ content = self._decode_field_entry(entry[1]) + registry.add(dest, GeneratedFile(content)) + continue + +diff --git a/python/mozbuild/mozpack/mozjar.py b/python/mozbuild/mozpack/mozjar.py +index a723fd2c0..0b04d233c 100644 +--- a/python/mozbuild/mozpack/mozjar.py ++++ b/python/mozbuild/mozpack/mozjar.py +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-from __future__ import absolute_import ++ + + from io import BytesIO + import struct +@@ -14,9 +14,10 @@ from zipfile import ( + ZIP_DEFLATED, + ) + from collections import OrderedDict +-from urlparse import urlparse, ParseResult ++from urllib.parse import urlparse, ParseResult + import mozpack.path as mozpath + from mozbuild.util import memoize ++from functools import reduce + + + JAR_STORED = ZIP_STORED +@@ -72,7 +73,7 @@ class JarStruct(object): + an instance with empty fields. + ''' + assert self.MAGIC and isinstance(self.STRUCT, OrderedDict) +- self.size_fields = set(t for t in self.STRUCT.itervalues() ++ self.size_fields = set(t for t in self.STRUCT.values() + if not t in JarStruct.TYPE_MAPPING) + self._values = {} + if data: +@@ -94,7 +95,7 @@ class JarStruct(object): + # For all fields used as other fields sizes, keep track of their value + # separately. + sizes = dict((t, 0) for t in self.size_fields) +- for name, t in self.STRUCT.iteritems(): ++ for name, t in self.STRUCT.items(): + if t in JarStruct.TYPE_MAPPING: + value, size = JarStruct.get_data(t, data[offset:]) + else: +@@ -113,7 +114,7 @@ class JarStruct(object): + Initialize an instance with empty fields. + ''' + self.signature = self.MAGIC +- for name, t in self.STRUCT.iteritems(): ++ for name, t in self.STRUCT.items(): + if name in self.size_fields: + continue + self._values[name] = 0 if t in JarStruct.TYPE_MAPPING else '' +@@ -138,9 +139,9 @@ class JarStruct(object): + from self.STRUCT. + ''' + serialized = struct.pack('" % (self.__class__.__name__, +@@ -374,7 +375,7 @@ class JarReader(object): + entries = self.entries + if not entries: + return JAR_STORED +- return max(f['compression'] for f in entries.itervalues()) ++ return max(f['compression'] for f in entries.values()) + + @property + def entries(self): +@@ -390,7 +391,7 @@ class JarReader(object): + preload = JarStruct.get_data('uint32', self._data)[0] + entries = OrderedDict() + offset = self._cdir_end['cdir_offset'] +- for e in xrange(self._cdir_end['cdir_entries']): ++ for e in range(self._cdir_end['cdir_entries']): + entry = JarCdirEntry(self._data[offset:]) + offset += entry.size + # Creator host system. 0 is MSDOS, 3 is Unix +@@ -452,7 +453,7 @@ class JarReader(object): + for file in jarReader: + ... + ''' +- for entry in self.entries.itervalues(): ++ for entry in self.entries.values(): + yield self._getreader(entry) + + def __getitem__(self, name): +@@ -547,7 +548,7 @@ class JarWriter(object): + headers = {} + preload_size = 0 + # Prepare central directory entries +- for entry, content in self._contents.itervalues(): ++ for entry, content in self._contents.values(): + header = JarLocalFileHeader() + for name in entry.STRUCT: + if name in header: +@@ -562,7 +563,7 @@ class JarWriter(object): + end['disk_entries'] = len(self._contents) + end['cdir_entries'] = end['disk_entries'] + end['cdir_size'] = reduce(lambda x, y: x + y[0].size, +- self._contents.values(), 0) ++ list(self._contents.values()), 0) + # On optimized archives, store the preloaded size and the central + # directory entries, followed by the first end of central directory. + if self._optimize: +@@ -571,18 +572,18 @@ class JarWriter(object): + if preload_size: + preload_size += offset + self._data.write(struct.pack('= 6 # https://bugzilla.redhat.com/show_bug.cgi?id=1328045 @@ -82,7 +85,7 @@ do_configure() { export SHELL="/bin/sh" cd ${S} # Add mozjs python-modules necessary - PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + PYTHONPATH="${S}/third_party/python/which:${S}/config:${S}/build" for sub_dir in python testing/mozbase; do for module_dir in `ls $sub_dir -1`;do [ $module_dir = "virtualenv" ] && continue @@ -96,7 +99,6 @@ do_configure() { cd ${S}/js/src autoconf213 --macrodir=${STAGING_DATADIR_NATIVE}/autoconf213 old-configure.in > old-configure - sed -i 's:refresh = True:refresh = False:g' ${S}/build/moz.configure/old.configure cd ${B} ${S}/js/src/configure ${EXTRA_OECONF} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:23 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: reproducible: Allow configuration of saved debug output Message-ID: <158066240352.22128.16280324985700359802@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. The following commit(s) were added to refs/heads/master by this push: new 138ed4a reproducible: Allow configuration of saved debug output 138ed4a is described below commit 138ed4aa96ec5069f9f7fd02994a42452dbccc2d Author: Richard Purdie AuthorDate: Thu Oct 24 13:09:33 2019 -0500 reproducible: Allow configuration of saved debug output If OEQA_DEBUGGING_SAVED_OUTPUT is set in the environment, use this location to store reproducibile build failure output. This aids debugging on the YP autobuilder in particular. Use a date in the directory name to make it easier to find failure output. Also clean up empty directories as they're unnecessary distracting noise. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9c715ef..c261076 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -15,6 +15,7 @@ import tempfile import shutil import stat import os +import datetime MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -80,6 +81,9 @@ class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + os.makedirs(self.save_results, exist_ok=True) + datestr = datetime.datetime.now().strftime('%Y%m%d') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' % datestr, dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:29 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (0563aee -> daa8f50) Message-ID: <158066240907.22344.13672513619317377257@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 0563aee bitbake.conf: drop pod2man from hosttools discard d3f55d6 reproducible: Allow configuration of saved debug output discard a7b7107 opensbi: Remove dependency on FDT discard 8b8966e gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build discard 33536f8 busybox: sort the .config file used by ptests discard 3a012a1 glibc: Update to final 2.31 release discard 8ad70d6 uninative: Recognise ppc64 host ldso discard 4097430 icu: update SRC_URI discard f7808db glibc: merge libc-common.bbclass into glibc.bb discard 757ebef classes/reproducible_build: Read SDE file later discard cb2c03f libgcc.inc: Fix an issue w/ a recursive symlink discard b569dbb toaster.bbclass: Fix error when toaster is used to monitor a build discard e53bb9c u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig discard b3e769f devtool/standard.py: Allow recipe to disable menuconfig logic discard f28d83c gcc-cross-canadian: A missing space in an append caused an invalid option discard 5cc2243 texinfo-dummy-native: Allow to coexist with texinfo-native discard bfcef54 autoconf-archive: Add missing texinfo inherit discard 3a2f963 glibc-package.inc: Remove warnings about unpacked directories discard f4c271b iptables: upgrade 1.8.3 -> 1.8.4 discard aa443e2 iw: upgrade 5.3 -> 5.4 discard 35ddbf2 iproute2: upgrade 5.3.0 -> 5.5.0 discard 5b4c4b4 musl: Update to latest discard d9abe61 valgrind: Fix ptest builds on musl discard 1d52ada valgrind: fix the remaining ptest failures discard 96bd673 HACK: Enable saving of packages new 37dea00 valgrind: fix the remaining ptest failures new b08bad3 valgrind: Fix ptest builds on musl new d37d383 musl: Update to latest new 31b1312 iproute2: upgrade 5.3.0 -> 5.5.0 new 3bb3363 iw: upgrade 5.3 -> 5.4 new 1db4535 iptables: upgrade 1.8.3 -> 1.8.4 new db2fc04 glibc-package.inc: Remove warnings about unpacked directories new aa3a883 autoconf-archive: Add missing texinfo inherit new 7ab4bb1 texinfo-dummy-native: Allow to coexist with texinfo-native new 5cd7aa9 gcc-cross-canadian: A missing space in an append caused an invalid option new 6082d05 devtool/standard.py: Allow recipe to disable menuconfig logic new 71b7503 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig new 914f40d toaster.bbclass: Fix error when toaster is used to monitor a build new ec2879e libgcc.inc: Fix an issue w/ a recursive symlink new 12e75f7 classes/reproducible_build: Read SDE file later new 86c11a9 glibc: merge libc-common.bbclass into glibc.bb new ba4eada icu: update SRC_URI new f3bc71a uninative: Recognise ppc64 host ldso new 462b44f glibc: Update to final 2.31 release new 3d046d8 busybox: sort the .config file used by ptests new 4f79b11 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build new 4c65cea opensbi: Remove dependency on FDT new 39f87fd bitbake.conf: drop pod2man from hosttools new daa8f50 reproducible: Allow configuration of saved debug output This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0563aee) \ N -- N -- N refs/heads/master-next (daa8f50) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 24 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:30 +0000 Subject: [oe-commits] [openembedded-core] 01/24: valgrind: fix the remaining ptest failures In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.419C7232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 37dea00bdfb910bdf6398706fa8e64e185efd136 Author: Alexander Kanavin AuthorDate: Mon Jan 27 15:19:07 2020 +0100 valgrind: fix the remaining ptest failures Particularly, one test is disabled as it is failing everywhere, two patches that actually cause failures are dropped and some binaries are prevented from being stripped where that is expected. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...s-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ++++++++++++++++++++++ ...-valgrind-adjust-std_list-expected-output.patch | 32 -------------------- ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 -------------------- meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 23 +++++++++++++-- 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch new file mode 100644 index 0000000..d641998 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch @@ -0,0 +1,34 @@ +From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 24 Jan 2020 17:55:39 +0100 +Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths + +In oe-core, /tmp is linked to /var/volatile/tmp and +valgrind output changes accordingly + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + none/tests/fdleak_cmsg.stderr.exp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp +index 6e5a797b9..0ede1ab18 100644 +--- a/none/tests/fdleak_cmsg.stderr.exp ++++ b/none/tests/fdleak_cmsg.stderr.exp +@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null + + + FILE DESCRIPTORS: 6 open at exit. +-Open file descriptor ...: /tmp/data2 ++Open file descriptor ...: ... + ... + +-Open file descriptor ...: /tmp/data1 ++Open file descriptor ...: ... + ... + + Open AF_UNIX socket ...: +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch b/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch deleted file mode 100644 index a82972e..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1e9265b03cf51d09c028d657fe826d7156a783 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 13 May 2019 17:26:26 -0400 -Subject: [PATCH 2/2] valgrind: adjust std_list expected output - -The run-ptest script uses a custom --yocto-ptest option -to change the summary statistics that valgrind issues -to a format that matches what ptest-runner expects. - -Only this std_list test which checks that strcpy() works -properly on Ubuntu-12.04 and later is affected by this change. -It's normal output when called with --yocto-ptest is a blank -line so adjust the expected output. - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Randy MacLeod ---- - drd/tests/std_list.stderr.exp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drd/tests/std_list.stderr.exp b/drd/tests/std_list.stderr.exp -index d18786f80..8b1378917 100644 ---- a/drd/tests/std_list.stderr.exp -+++ b/drd/tests/std_list.stderr.exp -@@ -1,3 +1 @@ - -- --ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch deleted file mode 100644 index 05886c7..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 01:20:32 -0700 -Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding - offset to it - -Fixes -error: invalid use of undefined type 'struct __pthread' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - drd/tests/pth_detached3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef1..35d43a6 100644 ---- a/drd/tests/pth_detached3.c -+++ b/drd/tests/pth_detached3.c -@@ -21,7 +21,7 @@ int main(int argc, char** argv) - pthread_detach(thread); - - /* Invoke pthread_detach() with an invalid thread ID. */ -- pthread_detach(thread + 8); -+ pthread_detach((pthread_t*)(&thread + 8)); - - fprintf(stderr, "Finished.\n"); - --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834c..0f86aa4 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0003-correct-include-directive-path-for-config.h.patch \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ - file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ @@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ - file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ + file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" @@ -205,4 +204,24 @@ do_install_ptest() { # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest + + # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) + # https://bugs.kde.org/show_bug.cgi?id=402833 + rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest + + # As the binary isn't stripped or debug-splitted, the source file isn't fetched + # via dwarfsrcfiles either, so it needs to be installed manually. + mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ + install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ } + +# avoid stripping some generated binaries otherwise some of the tests will fail +# run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/none/tests/tls \ + ${PKGD}${PTEST_PATH}/none/tests/tls.so \ + ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ + ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ + ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ + ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:32 +0000 Subject: [oe-commits] [openembedded-core] 03/24: musl: Update to latest In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.56E5D23293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d37d38314542996bdc2b5bece4223dcd9680edfc Author: Khem Raj AuthorDate: Mon Jan 27 20:08:49 2020 -0800 musl: Update to latest Changelog [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=91e662d1d941215eb024787db5e910dbfb5b169f..83350eb17b9cb355e3f08b0340c4f1e8c437fac9 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 1676e28..6298720 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "91e662d1d941215eb024787db5e910dbfb5b169f" +SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:33 +0000 Subject: [oe-commits] [openembedded-core] 04/24: iproute2: upgrade 5.3.0 -> 5.5.0 In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.6545F23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 31b1312b053e3e15406c798f3a16c693ea264fe2 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:25 2020 +0100 iproute2: upgrade 5.3.0 -> 5.5.0 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iproute2/{iproute2_5.3.0.bb => iproute2_5.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb similarity index 66% rename from meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb index 75772d4..ad0ab13 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb @@ -4,8 +4,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[md5sum] = "227404413c8d6db649d6188ead1e5a6e" -SRC_URI[sha256sum] = "cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f" +SRC_URI[md5sum] = "ee8e2cdb416d4a8ef39525d39ab7c2d0" +SRC_URI[sha256sum] = "bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b" # CFLAGS are computed in Makefile and reference CCOPTS # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:31 +0000 Subject: [oe-commits] [openembedded-core] 02/24: valgrind: Fix ptest builds on musl In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.4C67C23293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b08bad3836d9e78c7065a5cd1f9666ad139ee083 Author: Khem Raj AuthorDate: Mon Jan 27 19:58:50 2020 -0800 valgrind: Fix ptest builds on musl Signed-off-by: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 44 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch new file mode 100644 index 0000000..44d707a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -0,0 +1,44 @@ +From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 27 Jan 2020 17:17:19 -0800 +Subject: [PATCH] tests: Make pthread_detatch call portable across platforms + +pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type +this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable +across glibc and musl + +Fixes +| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' +| 24 | pthread_detach(thread + 8); +| | ^ + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +Signed-off-by: Khem Raj +--- + drd/tests/pth_detached3.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c +index c02eef11a..efeb15b72 100644 +--- a/drd/tests/pth_detached3.c ++++ b/drd/tests/pth_detached3.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + static void* thread_func(void* arg) + { +@@ -21,7 +22,7 @@ int main(int argc, char** argv) + pthread_detach(thread); + + /* Invoke pthread_detach() with an invalid thread ID. */ +- pthread_detach(thread + 8); ++ pthread_detach((pthread_t)((uintptr_t)thread + 8)); + + fprintf(stderr, "Finished.\n"); + +-- +2.25.0 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 0f86aa4..1475ff8 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ + file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:35 +0000 Subject: [oe-commits] [openembedded-core] 06/24: iptables: upgrade 1.8.3 -> 1.8.4 In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.85A93232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1db4535d4718def0631bbf6aec222b0aabae115f Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:27 2020 +0100 iptables: upgrade 1.8.3 -> 1.8.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iptables/{iptables_1.8.3.bb => iptables_1.8.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb b/meta/recipes-extended/iptables/iptables_1.8.4.bb similarity index 96% rename from meta/recipes-extended/iptables/iptables_1.8.3.bb rename to meta/recipes-extended/iptables/iptables_1.8.4.bb index 96d195d..cf1388c 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.4.bb @@ -16,8 +16,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513" -SRC_URI[sha256sum] = "a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" +SRC_URI[md5sum] = "9b201107957fbf62709c3d8226239b0d" +SRC_URI[sha256sum] = "993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:37 +0000 Subject: [oe-commits] [openembedded-core] 08/24: autoconf-archive: Add missing texinfo inherit In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.9EEAD232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa3a8835b65976090ef6a0254aa11be96b9804ee Author: Richard Purdie AuthorDate: Tue Jan 28 19:15:51 2020 +0000 autoconf-archive: Add missing texinfo inherit Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb index 985a254..13593d7 100644 --- a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb @@ -9,7 +9,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "d46413c8b00a125b1529bae385bbec55" SRC_URI[sha256sum] = "17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f" -inherit autotools allarch +inherit autotools allarch texinfo PACKAGES = "${PN} ${PN}-doc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:36 +0000 Subject: [oe-commits] [openembedded-core] 07/24: glibc-package.inc: Remove warnings about unpacked directories In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.91DAB232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit db2fc0414872a962695028e3d55f1a6f695cda72 Author: Richard Purdie AuthorDate: Tue Jan 28 14:37:45 2020 +0000 glibc-package.inc: Remove warnings about unpacked directories If documemtation generation is disabled, the recipe throws warnings about unpackaged files. Avoid this. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index ede9e9b..d2667f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -213,6 +213,8 @@ stash_locale_cleanup () { rm -rf $cleanupdir${libdir}/gconv rm -rf $cleanupdir${localedir} rm -rf $cleanupdir${datadir}/locale + rmdir --ignore-fail-on-non-empty $cleanupdir${datadir} + if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then if [ -d "$cleanupdir${exec_prefix}/lib" ]; then if [ -z "${ARCH_DYNAMIC_LOADER}" -o \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:38 +0000 Subject: [oe-commits] [openembedded-core] 09/24: texinfo-dummy-native: Allow to coexist with texinfo-native In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.AC679232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7ab4bb112d8f51a5eee24ab77b80a330aead52a0 Author: Richard Purdie AuthorDate: Wed Jan 29 11:38:07 2020 +0000 texinfo-dummy-native: Allow to coexist with texinfo-native Signed-off-by: Richard Purdie --- .../recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 1254bc8..3732d4f 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -13,15 +13,19 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" inherit native +# +# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir +# which is later in PATH than bindir where texinfo-native installs +# do_install_name() { - FILENAME="${D}${bindir}/$1" + FILENAME="${D}${base_bindir}/$1" # Using ln causes problems with rm_work cp -T "${S}/template.py" "$FILENAME" chmod +x $FILENAME } do_install() { - mkdir -p "${D}${bindir}" + mkdir -p "${D}${base_bindir}" for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \ txixml2texi texi2any install-info ginstall-info \ update-info-dir; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:40 +0000 Subject: [oe-commits] [openembedded-core] 11/24: devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.CABB4232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6082d0570285f7032821c75679645c2d49382daf Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:44 2019 +0000 devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 52efeae..bab644b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:39 +0000 Subject: [oe-commits] [openembedded-core] 10/24: gcc-cross-canadian: A missing space in an append caused an invalid option In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.B8DFC23294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5cd7aa999a5a9662add21b77209b790956d26ac5 Author: Mark Hatle AuthorDate: Tue Jan 28 12:12:28 2020 -0600 gcc-cross-canadian: A missing space in an append caused an invalid option When configuring the cross-candian toolchain for a non-linux target system, the resulting gcc configuration included: --enable-initfini-array--without-headers these should have been two separate options. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index f14cbf7..4aac345 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -158,7 +158,7 @@ SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = "--without-headers --with-newlib" -EXTRA_OECONF_append_eabi = "--without-headers --with-newlib" +EXTRA_OECONF_append_elf = " --without-headers --with-newlib" +EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:34 +0000 Subject: [oe-commits] [openembedded-core] 05/24: iw: upgrade 5.3 -> 5.4 In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.78F89232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3bb3363d239254500302b7de6db1ac6b0d2dc32b Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:26 2020 +0100 iw: upgrade 5.3 -> 5.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iw/iw/separate-objdir.patch | 24 ++++++++++++++-------- .../iw/{iw_5.3.bb => iw_5.4.bb} | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index eb01a5a..179fd90 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch @@ -1,3 +1,6 @@ +From ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae +Date: Mon, 27 Jan 2020 22:48:03 +0100 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -11,12 +14,12 @@ Signed-off-by: Maxin B. John 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 33aaf6a..9030796 100644 +index 90f2251..714cdb9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ MAKEFLAGS += --no-print-directory - + +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) @@ -24,19 +27,24 @@ index 33aaf6a..9030796 100644 PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -@@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) +@@ -92,7 +96,7 @@ all: $(ALL) version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ - $(Q)./version.sh $@ + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ - - %.o: %.c iw.h nl80211.h + + nl80211-commands.inc: nl80211.h + @$(NQ) ' GEN ' $@ +@@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h + + %.o: %.c iw.h nl80211.h nl80211-commands.inc @$(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - + ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) --- -2.20.1 (Apple Git-117) +-- +2.23.0 + diff --git a/meta/recipes-connectivity/iw/iw_5.3.bb b/meta/recipes-connectivity/iw/iw_5.4.bb similarity index 85% rename from meta/recipes-connectivity/iw/iw_5.3.bb rename to meta/recipes-connectivity/iw/iw_5.4.bb index f7f13f5..9f58e49 100644 --- a/meta/recipes-connectivity/iw/iw_5.3.bb +++ b/meta/recipes-connectivity/iw/iw_5.4.bb @@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://separate-objdir.patch \ " -SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31" -SRC_URI[sha256sum] = "175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a" +SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6" +SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c" inherit pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:41 +0000 Subject: [oe-commits] [openembedded-core] 12/24: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165329.E76CD232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 71b75035dd3da500fdb5dc89abed81857be964df Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:51 2019 +0000 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ec77762..648298d 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -85,6 +85,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:42 +0000 Subject: [oe-commits] [openembedded-core] 13/24: toaster.bbclass: Fix error when toaster is used to monitor a build In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.0DA9123293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 914f40d2f40b04c7652958a7d07b199565af6991 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:01 2020 -0600 toaster.bbclass: Fix error when toaster is used to monitor a build The error being corrected looks like: File: '/home/jenkins/workspace/OEBuild/build-32/oe-core/meta/classes/toaster.bbclass', lineno: 130, function: toaster_package_dumpdata 0126: lpkgdata = {} 0127: datadir = os.path.join(pkgdatadir, 'runtime') 0128: 0129: # scan and send data for each generated package *** 0130: for datafile in os.listdir(datadir): 0131: if not datafile.endswith('.packaged'): 0132: lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) 0133: # Fire an event containing the pkg data 0134: bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/jenkins/workspace/OEBuild/builds/build-32/tmp-glibc/work/core2-64-oe-linux/puzzles/2_0.0+gitAUTOINC+c6e0161dd4-r0/pkgdata/runtime' There must be a small window before the data is available, but while the monitoring is on-going. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 6a65ecb..9518ddf 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -126,11 +126,12 @@ def _toaster_dumpdata(pkgdatadir, d): datadir = os.path.join(pkgdatadir, 'runtime') # scan and send data for each generated package - for datafile in os.listdir(datadir): - if not datafile.endswith('.packaged'): - lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) - # Fire an event containing the pkg data - bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) + if os.path.exists(datadir): + for datafile in os.listdir(datadir): + if not datafile.endswith('.packaged'): + lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) + # Fire an event containing the pkg data + bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) python toaster_package_dumpdata() { _toaster_dumpdata(d.getVar('PKGDESTWORK'), d) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:43 +0000 Subject: [oe-commits] [openembedded-core] 14/24: libgcc.inc: Fix an issue w/ a recursive symlink In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.2723523293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ec2879eca51d3fdb11eba6f50ff00bef1d1a1494 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:02 2020 -0600 libgcc.inc: Fix an issue w/ a recursive symlink If the OS is not Linux, the code could end up generating a recursive symlink. This can happen because the same symlink can be created twice in a row. If this happenes, the second symlink becomes a link to itself within the directory pointed to by the original link. In order to prevent this, verify that the destination does not already exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index e008d14..6d48ec9 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -9,14 +9,18 @@ do_install_append_class-target () { "linux-musleabi") extra_target_os="linux-gnueabi";; *) extra_target_os="linux";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then case "${TARGET_OS}" in "linux-musleabi") extra_target_os="linux-musleabihf";; "linux-gnueabi") extra_target_os="linux-gnueabihf";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:46 +0000 Subject: [oe-commits] [openembedded-core] 17/24: icu: update SRC_URI In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.5E2C9232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ba4eada7950f3248e0b367d347e9abe2e2c9e3c7 Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:44 +0000 Subject: [oe-commits] [openembedded-core] 15/24: classes/reproducible_build: Read SDE file later In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.445F723293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12e75f702458ffaaa4ec414a3e13a7c254ebadf7 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..750eb95 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:47 +0000 Subject: [oe-commits] [openembedded-core] 18/24: uninative: Recognise ppc64 host ldso In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.693B7232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f3bc71aaa0d911975a8b19f11cc352b0d8d37f73 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:45 +0000 Subject: [oe-commits] [openembedded-core] 16/24: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.544E0232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 86c11a99e2fd4022e10ea51e1a3f44aa43d2e706 Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:48 +0000 Subject: [oe-commits] [openembedded-core] 19/24: glibc: Update to final 2.31 release In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.7397F232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 462b44f836042616ae9b152ab4c1e82cf2e04f70 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:49 +0000 Subject: [oe-commits] [openembedded-core] 20/24: busybox: sort the .config file used by ptests In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.7E366232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3d046d8c9beabad45f18cbcc37198b0c36f1ff62 Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:52 +0000 Subject: [oe-commits] [openembedded-core] 23/24: bitbake.conf: drop pod2man from hosttools In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.9D114232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 39f87fddc5c93355ea0911999b4c1254c6ec366e Author: Alexander Kanavin AuthorDate: Fri Jan 31 19:49:35 2020 +0100 bitbake.conf: drop pod2man from hosttools pod2man writes the current date into manpages, and while later versions of it respect SOURCE_DATE_EPOCH and use that instead, earlier versions do not. This was found to cause reproducibility issues. This patch replaces host version of pod2man with one from perl-native. [YOCTO #13755] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b6aa9f3..f7544b3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -488,7 +488,7 @@ HOSTTOOLS += " \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ + mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726..8e7ef00 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -18,6 +18,8 @@ TARGET_CC_ARCH += "${LDFLAGS}" RDEPENDS_${PN} += "bash" +inherit perlnative + # For native builds we use the host Python PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" PYTHONRDEPS_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:50 +0000 Subject: [oe-commits] [openembedded-core] 21/24: gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.88D4923293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4f79b1186da004de10dc5fdd283c8b811b460f4a Author: Andrey Zhizhikin AuthorDate: Mon Jan 27 10:44:44 2020 +0000 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build When opencv is picked in PACKAGECONFIG, plugin fails to locate data dirs. This is due to meson.build file uses 'test' utility to verify that the data dirs path is present and not taking sysroot into prefix. Introduce additional patch, which picks up PKG_CONFIG_SYSROOT_DIR as prefix for 'test' utility to verify the data dir is actually present. Signed-off-by: Andrey Zhizhikin Signed-off-by: Richard Purdie --- ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch new file mode 100644 index 0000000..4b6591c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -0,0 +1,49 @@ +From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin +Date: Mon, 27 Jan 2020 10:22:35 +0000 +Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build + +When Yocto build is performed, opencv searches for data dir using simple +'test' command, this fails because pkg-config provides an absolute +path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR +in order for the 'test' utility to pick up the absolute path. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin +--- + ext/opencv/meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55dfe..a26403482 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -78,20 +78,21 @@ else + endif + + if opencv_found ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation +- r = run_command('test', '-d', opencv_prefix + '/share/opencv') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' + else +-- +2.17.1 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb index 56ae7a1..024277e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb @@ -6,6 +6,7 @@ SRC_URI = " \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:53 +0000 Subject: [oe-commits] [openembedded-core] 24/24: reproducible: Allow configuration of saved debug output In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.A816723293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit daa8f50a4c59e23e09d2410b96dd16ef12b47d2c Author: Richard Purdie AuthorDate: Thu Oct 24 13:09:33 2019 -0500 reproducible: Allow configuration of saved debug output If OEQA_DEBUGGING_SAVED_OUTPUT is set in the environment, use this location to store reproducibile build failure output. This aids debugging on the YP autobuilder in particular. Use a date in the directory name to make it easier to find failure output. Also clean up empty directories as they're unnecessary distracting noise. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9c715ef..c261076 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -15,6 +15,7 @@ import tempfile import shutil import stat import os +import datetime MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -80,6 +81,9 @@ class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + os.makedirs(self.save_results, exist_ok=True) + datestr = datetime.datetime.now().strftime('%Y%m%d') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' % datestr, dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 16:53:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 16:53:51 +0000 Subject: [oe-commits] [openembedded-core] 22/24: opensbi: Remove dependency on FDT In-Reply-To: <158066240907.22344.13672513619317377257@git.openembedded.org> References: <158066240907.22344.13672513619317377257@git.openembedded.org> Message-ID: <20200202165330.92783232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4c65cea348c8a1479f91e969ac188c009d1b2129 Author: Alistair Francis AuthorDate: Thu Jan 30 15:04:23 2020 -0800 opensbi: Remove dependency on FDT U-Boot no longer requires OpenSBI to include a FDT for the HiFive Unleashed, so remove the support from OpenSBI. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +------------------- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +--- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7..2e32943 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload -def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): if 'linux' in sbi_payload or 'Image' in sbi_payload: return "virtual/kernel:do_deploy" if 'u-boot.bin' in sbi_payload: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.5.bb index 6a90262..71d64fa 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb @@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" -DEPENDS += "dtc-native" require opensbi-payloads.inc @@ -21,7 +20,7 @@ SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" +EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" # Required if specifying a custom payload do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" @@ -47,7 +46,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - COMPATIBLE_HOST = "(riscv64|riscv32).*" INHIBIT_PACKAGE_STRIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:30 +0000 Subject: [oe-commits] [openembedded-core] 03/21: musl: Update to latest In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.691DD23293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bc922df14d128212e396658f76d63b03a6f30729 Author: Khem Raj AuthorDate: Mon Jan 27 20:08:49 2020 -0800 musl: Update to latest Changelog [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=91e662d1d941215eb024787db5e910dbfb5b169f..83350eb17b9cb355e3f08b0340c4f1e8c437fac9 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 1676e28..6298720 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "91e662d1d941215eb024787db5e910dbfb5b169f" +SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:27 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (138ed4a -> 472507b) Message-ID: <158066306794.27256.12948139815779264307@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 138ed4a reproducible: Allow configuration of saved debug output new 64bc13f valgrind: fix the remaining ptest failures new 20e7d63 valgrind: Fix ptest builds on musl new bc922df musl: Update to latest new 90f670a iproute2: upgrade 5.3.0 -> 5.5.0 new 9b436d3 iw: upgrade 5.3 -> 5.4 new 490dd75 iptables: upgrade 1.8.3 -> 1.8.4 new 811a5b1 glibc-package.inc: Remove warnings about unpacked directories new 0675fdc autoconf-archive: Add missing texinfo inherit new 0a1099d texinfo-dummy-native: Allow to coexist with texinfo-native new 7b52893 gcc-cross-canadian: A missing space in an append caused an invalid option new 6cc17e6 devtool/standard.py: Allow recipe to disable menuconfig logic new a6c430b u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig new c7329b1 toaster.bbclass: Fix error when toaster is used to monitor a build new ef28e5a libgcc.inc: Fix an issue w/ a recursive symlink new a0bff0d glibc: merge libc-common.bbclass into glibc.bb new 1a01c30 icu: update SRC_URI new 15f7eed uninative: Recognise ppc64 host ldso new b0df2fc glibc: Update to final 2.31 release new 93c7fa3 busybox: sort the .config file used by ptests new 575fca9 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build new 472507b opensbi: Remove dependency on FDT The 21 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/libc-common.bbclass | 37 ---------------- meta/classes/toaster.bbclass | 11 ++--- meta/classes/uninative.bbclass | 2 +- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +-------- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +- meta/recipes-bsp/u-boot/u-boot.inc | 2 + .../{iproute2_5.3.0.bb => iproute2_5.5.0.bb} | 4 +- .../iw/iw/separate-objdir.patch | 24 +++++++---- .../iw/{iw_5.3.bb => iw_5.4.bb} | 4 +- meta/recipes-core/busybox/busybox.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-package.inc | 42 ++++++++++++++++++- meta/recipes-core/glibc/glibc-version.inc | 6 +-- meta/recipes-core/musl/musl_git.bb | 2 +- .../autoconf-archive_2019.01.06.bb | 2 +- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 +- meta/recipes-devtools/gcc/libgcc.inc | 8 +++- ...s-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 +++++++++++++++ ...pthread_detatch-call-portable-across-plat.patch | 44 +++++++++++++++++++ ...-valgrind-adjust-std_list-expected-output.patch | 32 -------------- ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 -------------- meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 24 ++++++++++- .../{iptables_1.8.3.bb => iptables_1.8.4.bb} | 4 +- .../texinfo-dummy-native/texinfo-dummy-native.bb | 8 +++- ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + meta/recipes-support/icu/icu_64.2.bb | 11 +++-- scripts/lib/devtool/standard.py | 6 ++- 29 files changed, 257 insertions(+), 166 deletions(-) delete mode 100644 meta/classes/libc-common.bbclass rename meta/recipes-connectivity/iproute2/{iproute2_5.3.0.bb => iproute2_5.5.0.bb} (66%) rename meta/recipes-connectivity/iw/{iw_5.3.bb => iw_5.4.bb} (85%) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch rename meta/recipes-extended/iptables/{iptables_1.8.3.bb => iptables_1.8.4.bb} (96%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:28 +0000 Subject: [oe-commits] [openembedded-core] 01/21: valgrind: fix the remaining ptest failures In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.54BB4232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 64bc13f3c9c96584494f0984da5253a306e8a140 Author: Alexander Kanavin AuthorDate: Mon Jan 27 15:19:07 2020 +0100 valgrind: fix the remaining ptest failures Particularly, one test is disabled as it is failing everywhere, two patches that actually cause failures are dropped and some binaries are prevented from being stripped where that is expected. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...s-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ++++++++++++++++++++++ ...-valgrind-adjust-std_list-expected-output.patch | 32 -------------------- ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 -------------------- meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 23 +++++++++++++-- 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch new file mode 100644 index 0000000..d641998 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch @@ -0,0 +1,34 @@ +From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 24 Jan 2020 17:55:39 +0100 +Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths + +In oe-core, /tmp is linked to /var/volatile/tmp and +valgrind output changes accordingly + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + none/tests/fdleak_cmsg.stderr.exp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp +index 6e5a797b9..0ede1ab18 100644 +--- a/none/tests/fdleak_cmsg.stderr.exp ++++ b/none/tests/fdleak_cmsg.stderr.exp +@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null + + + FILE DESCRIPTORS: 6 open at exit. +-Open file descriptor ...: /tmp/data2 ++Open file descriptor ...: ... + ... + +-Open file descriptor ...: /tmp/data1 ++Open file descriptor ...: ... + ... + + Open AF_UNIX socket ...: +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch b/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch deleted file mode 100644 index a82972e..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1e9265b03cf51d09c028d657fe826d7156a783 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 13 May 2019 17:26:26 -0400 -Subject: [PATCH 2/2] valgrind: adjust std_list expected output - -The run-ptest script uses a custom --yocto-ptest option -to change the summary statistics that valgrind issues -to a format that matches what ptest-runner expects. - -Only this std_list test which checks that strcpy() works -properly on Ubuntu-12.04 and later is affected by this change. -It's normal output when called with --yocto-ptest is a blank -line so adjust the expected output. - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Randy MacLeod ---- - drd/tests/std_list.stderr.exp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drd/tests/std_list.stderr.exp b/drd/tests/std_list.stderr.exp -index d18786f80..8b1378917 100644 ---- a/drd/tests/std_list.stderr.exp -+++ b/drd/tests/std_list.stderr.exp -@@ -1,3 +1 @@ - -- --ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch deleted file mode 100644 index 05886c7..0000000 --- a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 01:20:32 -0700 -Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding - offset to it - -Fixes -error: invalid use of undefined type 'struct __pthread' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - drd/tests/pth_detached3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef1..35d43a6 100644 ---- a/drd/tests/pth_detached3.c -+++ b/drd/tests/pth_detached3.c -@@ -21,7 +21,7 @@ int main(int argc, char** argv) - pthread_detach(thread); - - /* Invoke pthread_detach() with an invalid thread ID. */ -- pthread_detach(thread + 8); -+ pthread_detach((pthread_t*)(&thread + 8)); - - fprintf(stderr, "Finished.\n"); - --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834c..0f86aa4 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0003-correct-include-directive-path-for-config.h.patch \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ - file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ @@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ - file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ + file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" @@ -205,4 +204,24 @@ do_install_ptest() { # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest + + # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) + # https://bugs.kde.org/show_bug.cgi?id=402833 + rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest + + # As the binary isn't stripped or debug-splitted, the source file isn't fetched + # via dwarfsrcfiles either, so it needs to be installed manually. + mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ + install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ } + +# avoid stripping some generated binaries otherwise some of the tests will fail +# run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/none/tests/tls \ + ${PKGD}${PTEST_PATH}/none/tests/tls.so \ + ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ + ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ + ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ + ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:31 +0000 Subject: [oe-commits] [openembedded-core] 04/21: iproute2: upgrade 5.3.0 -> 5.5.0 In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.71D6D23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 90f670a9f389f497d5dc00c0d3f955f07cff5805 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:25 2020 +0100 iproute2: upgrade 5.3.0 -> 5.5.0 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iproute2/{iproute2_5.3.0.bb => iproute2_5.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb similarity index 66% rename from meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb index 75772d4..ad0ab13 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb @@ -4,8 +4,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[md5sum] = "227404413c8d6db649d6188ead1e5a6e" -SRC_URI[sha256sum] = "cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f" +SRC_URI[md5sum] = "ee8e2cdb416d4a8ef39525d39ab7c2d0" +SRC_URI[sha256sum] = "bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b" # CFLAGS are computed in Makefile and reference CCOPTS # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:29 +0000 Subject: [oe-commits] [openembedded-core] 02/21: valgrind: Fix ptest builds on musl In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.5FC8B23293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 20e7d638322cf03f512d4f13c698f25211097f86 Author: Khem Raj AuthorDate: Mon Jan 27 19:58:50 2020 -0800 valgrind: Fix ptest builds on musl Signed-off-by: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 44 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch new file mode 100644 index 0000000..44d707a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -0,0 +1,44 @@ +From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 27 Jan 2020 17:17:19 -0800 +Subject: [PATCH] tests: Make pthread_detatch call portable across platforms + +pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type +this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable +across glibc and musl + +Fixes +| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' +| 24 | pthread_detach(thread + 8); +| | ^ + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +Signed-off-by: Khem Raj +--- + drd/tests/pth_detached3.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c +index c02eef11a..efeb15b72 100644 +--- a/drd/tests/pth_detached3.c ++++ b/drd/tests/pth_detached3.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + static void* thread_func(void* arg) + { +@@ -21,7 +22,7 @@ int main(int argc, char** argv) + pthread_detach(thread); + + /* Invoke pthread_detach() with an invalid thread ID. */ +- pthread_detach(thread + 8); ++ pthread_detach((pthread_t)((uintptr_t)thread + 8)); + + fprintf(stderr, "Finished.\n"); + +-- +2.25.0 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 0f86aa4..1475ff8 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ + file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:33 +0000 Subject: [oe-commits] [openembedded-core] 06/21: iptables: upgrade 1.8.3 -> 1.8.4 In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.86BFE232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 490dd755899a149a36cbb2e60a08a37e0c93d225 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:27 2020 +0100 iptables: upgrade 1.8.3 -> 1.8.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iptables/{iptables_1.8.3.bb => iptables_1.8.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb b/meta/recipes-extended/iptables/iptables_1.8.4.bb similarity index 96% rename from meta/recipes-extended/iptables/iptables_1.8.3.bb rename to meta/recipes-extended/iptables/iptables_1.8.4.bb index 96d195d..cf1388c 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.4.bb @@ -16,8 +16,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513" -SRC_URI[sha256sum] = "a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" +SRC_URI[md5sum] = "9b201107957fbf62709c3d8226239b0d" +SRC_URI[sha256sum] = "993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:34 +0000 Subject: [oe-commits] [openembedded-core] 07/21: glibc-package.inc: Remove warnings about unpacked directories In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.90919232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 811a5b1b4d4da97caaca2779c8aa5687cbf0c609 Author: Richard Purdie AuthorDate: Tue Jan 28 14:37:45 2020 +0000 glibc-package.inc: Remove warnings about unpacked directories If documemtation generation is disabled, the recipe throws warnings about unpackaged files. Avoid this. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index ede9e9b..d2667f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -213,6 +213,8 @@ stash_locale_cleanup () { rm -rf $cleanupdir${libdir}/gconv rm -rf $cleanupdir${localedir} rm -rf $cleanupdir${datadir}/locale + rmdir --ignore-fail-on-non-empty $cleanupdir${datadir} + if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then if [ -d "$cleanupdir${exec_prefix}/lib" ]; then if [ -z "${ARCH_DYNAMIC_LOADER}" -o \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:37 +0000 Subject: [oe-commits] [openembedded-core] 10/21: gcc-cross-canadian: A missing space in an append caused an invalid option In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.ADB9923294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7b52893632dae7bc9ac75dddc7ad625e19f41050 Author: Mark Hatle AuthorDate: Tue Jan 28 12:12:28 2020 -0600 gcc-cross-canadian: A missing space in an append caused an invalid option When configuring the cross-candian toolchain for a non-linux target system, the resulting gcc configuration included: --enable-initfini-array--without-headers these should have been two separate options. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index f14cbf7..4aac345 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -158,7 +158,7 @@ SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = "--without-headers --with-newlib" -EXTRA_OECONF_append_eabi = "--without-headers --with-newlib" +EXTRA_OECONF_append_elf = " --without-headers --with-newlib" +EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:35 +0000 Subject: [oe-commits] [openembedded-core] 08/21: autoconf-archive: Add missing texinfo inherit In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.9B10A232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0675fdcc2bd29ee98adf428bcb4758dc28bf1230 Author: Richard Purdie AuthorDate: Tue Jan 28 19:15:51 2020 +0000 autoconf-archive: Add missing texinfo inherit Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb index 985a254..13593d7 100644 --- a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2019.01.06.bb @@ -9,7 +9,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "d46413c8b00a125b1529bae385bbec55" SRC_URI[sha256sum] = "17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f" -inherit autotools allarch +inherit autotools allarch texinfo PACKAGES = "${PN} ${PN}-doc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:36 +0000 Subject: [oe-commits] [openembedded-core] 09/21: texinfo-dummy-native: Allow to coexist with texinfo-native In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.A515F232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0a1099d7d346d540b616f88f30ebaf1571d9eba1 Author: Richard Purdie AuthorDate: Wed Jan 29 11:38:07 2020 +0000 texinfo-dummy-native: Allow to coexist with texinfo-native Signed-off-by: Richard Purdie --- .../recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 1254bc8..3732d4f 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -13,15 +13,19 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" inherit native +# +# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir +# which is later in PATH than bindir where texinfo-native installs +# do_install_name() { - FILENAME="${D}${bindir}/$1" + FILENAME="${D}${base_bindir}/$1" # Using ln causes problems with rm_work cp -T "${S}/template.py" "$FILENAME" chmod +x $FILENAME } do_install() { - mkdir -p "${D}${bindir}" + mkdir -p "${D}${base_bindir}" for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \ txixml2texi texi2any install-info ginstall-info \ update-info-dir; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:38 +0000 Subject: [oe-commits] [openembedded-core] 11/21: devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.B7B0823294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6cc17e658c3dbadc772353f0f200561d2d988658 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:44 2019 +0000 devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 52efeae..bab644b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -936,8 +936,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:39 +0000 Subject: [oe-commits] [openembedded-core] 12/21: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.C087623294C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a6c430b0077eb56b4adbe391a0a05a52133cc8f0 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:51 2019 +0000 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ec77762..648298d 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -85,6 +85,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:40 +0000 Subject: [oe-commits] [openembedded-core] 13/21: toaster.bbclass: Fix error when toaster is used to monitor a build In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.CA4D423294E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c7329b17cbbef64984196e2b79a81988db1d2bf3 Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:01 2020 -0600 toaster.bbclass: Fix error when toaster is used to monitor a build The error being corrected looks like: File: '/home/jenkins/workspace/OEBuild/build-32/oe-core/meta/classes/toaster.bbclass', lineno: 130, function: toaster_package_dumpdata 0126: lpkgdata = {} 0127: datadir = os.path.join(pkgdatadir, 'runtime') 0128: 0129: # scan and send data for each generated package *** 0130: for datafile in os.listdir(datadir): 0131: if not datafile.endswith('.packaged'): 0132: lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) 0133: # Fire an event containing the pkg data 0134: bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/jenkins/workspace/OEBuild/builds/build-32/tmp-glibc/work/core2-64-oe-linux/puzzles/2_0.0+gitAUTOINC+c6e0161dd4-r0/pkgdata/runtime' There must be a small window before the data is available, but while the monitoring is on-going. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 6a65ecb..9518ddf 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -126,11 +126,12 @@ def _toaster_dumpdata(pkgdatadir, d): datadir = os.path.join(pkgdatadir, 'runtime') # scan and send data for each generated package - for datafile in os.listdir(datadir): - if not datafile.endswith('.packaged'): - lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) - # Fire an event containing the pkg data - bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) + if os.path.exists(datadir): + for datafile in os.listdir(datadir): + if not datafile.endswith('.packaged'): + lpkgdata = _toaster_load_pkgdatafile(datadir, datafile) + # Fire an event containing the pkg data + bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) python toaster_package_dumpdata() { _toaster_dumpdata(d.getVar('PKGDESTWORK'), d) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:41 +0000 Subject: [oe-commits] [openembedded-core] 14/21: libgcc.inc: Fix an issue w/ a recursive symlink In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.D419523294F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ef28e5a74d939acc98d6e8e9a0efbeb143b8025f Author: Mark Hatle AuthorDate: Tue Jan 21 18:27:02 2020 -0600 libgcc.inc: Fix an issue w/ a recursive symlink If the OS is not Linux, the code could end up generating a recursive symlink. This can happen because the same symlink can be created twice in a row. If this happenes, the second symlink becomes a link to itself within the directory pointed to by the original link. In order to prevent this, verify that the destination does not already exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index e008d14..6d48ec9 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -9,14 +9,18 @@ do_install_append_class-target () { "linux-musleabi") extra_target_os="linux-gnueabi";; *) extra_target_os="linux";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then case "${TARGET_OS}" in "linux-musleabi") extra_target_os="linux-musleabihf";; "linux-gnueabi") extra_target_os="linux-gnueabihf";; esac - ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then + ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os + fi fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:32 +0000 Subject: [oe-commits] [openembedded-core] 05/21: iw: upgrade 5.3 -> 5.4 In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.7CA19232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9b436d3c5625f1525a1c9e94886ff9f373ec7cf1 Author: Changhyeok Bae AuthorDate: Mon Jan 27 22:59:26 2020 +0100 iw: upgrade 5.3 -> 5.4 Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- .../iw/iw/separate-objdir.patch | 24 ++++++++++++++-------- .../iw/{iw_5.3.bb => iw_5.4.bb} | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index eb01a5a..179fd90 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch @@ -1,3 +1,6 @@ +From ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae +Date: Mon, 27 Jan 2020 22:48:03 +0100 Subject: [PATCH] Support separation of SRCDIR and OBJDIR Typical use of VPATH to locate the sources. @@ -11,12 +14,12 @@ Signed-off-by: Maxin B. John 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 33aaf6a..9030796 100644 +index 90f2251..714cdb9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ MAKEFLAGS += --no-print-directory - + +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) +OBJDIR ?= $(PWD) +VPATH = $(SRCDIR) @@ -24,19 +27,24 @@ index 33aaf6a..9030796 100644 PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -@@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) +@@ -92,7 +96,7 @@ all: $(ALL) version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ $(wildcard .git/index .git/refs/tags) @$(NQ) ' GEN ' $@ - $(Q)./version.sh $@ + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ - - %.o: %.c iw.h nl80211.h + + nl80211-commands.inc: nl80211.h + @$(NQ) ' GEN ' $@ +@@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h + + %.o: %.c iw.h nl80211.h nl80211-commands.inc @$(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - + ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) --- -2.20.1 (Apple Git-117) +-- +2.23.0 + diff --git a/meta/recipes-connectivity/iw/iw_5.3.bb b/meta/recipes-connectivity/iw/iw_5.4.bb similarity index 85% rename from meta/recipes-connectivity/iw/iw_5.3.bb rename to meta/recipes-connectivity/iw/iw_5.4.bb index f7f13f5..9f58e49 100644 --- a/meta/recipes-connectivity/iw/iw_5.3.bb +++ b/meta/recipes-connectivity/iw/iw_5.4.bb @@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://separate-objdir.patch \ " -SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31" -SRC_URI[sha256sum] = "175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a" +SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6" +SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c" inherit pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:43 +0000 Subject: [oe-commits] [openembedded-core] 16/21: icu: update SRC_URI In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.E98D0232938@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1a01c30653c2b0282543aa3cdae8d87af871c24a Author: Alexander Kanavin AuthorDate: Sat Feb 1 11:58:22 2020 +0100 icu: update SRC_URI New releases of ICU are published on github. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7a..44caa43 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:44 +0000 Subject: [oe-commits] [openembedded-core] 17/21: uninative: Recognise ppc64 host ldso In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170429.0007E232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 15f7eedf3f153f844dd64f028877aac621e040d1 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:50 2020 -0800 uninative: Recognise ppc64 host ldso Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a..70799bb 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:45 +0000 Subject: [oe-commits] [openembedded-core] 18/21: glibc: Update to final 2.31 release In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170429.09F1523293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b0df2fcb26cb1b2b48e8f66cfcbfd351a7737099 Author: Khem Raj AuthorDate: Sat Feb 1 09:27:51 2020 -0800 glibc: Update to final 2.31 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baa..936db5a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d9..8d412cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e..f489650 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:42 +0000 Subject: [oe-commits] [openembedded-core] 15/21: glibc: merge libc-common.bbclass into glibc.bb In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170428.DD26B232950@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a0bff0db1eeb128776757d5f3d0bc1ebdc135498 Author: Ross Burton AuthorDate: Wed Jan 29 21:13:46 2020 +0000 glibc: merge libc-common.bbclass into glibc.bb There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/libc-common.bbclass | 37 ---------------------------- meta/recipes-core/glibc/glibc-package.inc | 40 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass deleted file mode 100644 index 0e351b6..0000000 --- a/meta/classes/libc-common.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -do_install() { - oe_runmake install_root=${D} install - install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf - install -d ${D}${localedir} - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - sed -i "/$i/d" ${WORKDIR}/SUPPORTED - done - rm -f ${D}${sysconfdir}/rpc - rm -rf ${D}${datadir}/zoneinfo - rm -rf ${D}${libexecdir}/getconf -} - -def get_libc_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: - return "--without-fp" - return "" - -python populate_packages_prepend () { - if d.getVar('DEBIAN_NAMES'): - pkgs = d.getVar('PACKAGES').split() - bpn = d.getVar('BPN') - prefix = d.getVar('MLPREFIX') or "" - # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') - libcprefix = prefix + bpn + '-' - for p in pkgs: - # And all the subpackages. - if p.startswith(libcprefix): - renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) - # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') -} diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index d2667f5..3aed7be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -inherit libc-common multilib_header +inherit multilib_header + +do_install() { + oe_runmake install_root=${D} install + install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf + install -d ${D}${localedir} + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + sed -i "/$i/d" ${WORKDIR}/SUPPORTED + done + rm -f ${D}${sysconfdir}/rpc + rm -rf ${D}${datadir}/zoneinfo + rm -rf ${D}${libexecdir}/getconf -do_install_append () { rm -f ${D}${sysconfdir}/localtime # remove empty glibc dir @@ -108,6 +120,11 @@ do_install_append () { fi } +def get_libc_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]: + return "--without-fp" + return "" + do_install_append_class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -235,6 +252,25 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } +python populate_packages_prepend () { + if d.getVar('DEBIAN_NAMES'): + pkgs = d.getVar('PACKAGES').split() + bpn = d.getVar('BPN') + prefix = d.getVar('MLPREFIX') or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) + # For backward compatibility with old -dbg package + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') +} + pkg_postinst_nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:46 +0000 Subject: [oe-commits] [openembedded-core] 19/21: busybox: sort the .config file used by ptests In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170429.139B823293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 93c7fa3b369c8eb61b65cdd82111c8016d707fb6 Author: Alexander Kanavin AuthorDate: Fri Jan 31 16:30:25 2020 +0100 busybox: sort the .config file used by ptests It was found to have slight variations in order of options depending on the host. Sorting it helps reproducibility. [YOCTO #13756] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 391e4fd..1a82f23 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -356,7 +356,7 @@ do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget - cp ${B}/.config ${D}${PTEST_PATH}/ + sort ${B}/.config > ${D}${PTEST_PATH}/.config ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:47 +0000 Subject: [oe-commits] [openembedded-core] 20/21: gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170429.1C3F123293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 575fca95307dafb3f7d80f9bf0e63605a9328b59 Author: Andrey Zhizhikin AuthorDate: Mon Jan 27 10:44:44 2020 +0000 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build When opencv is picked in PACKAGECONFIG, plugin fails to locate data dirs. This is due to meson.build file uses 'test' utility to verify that the data dirs path is present and not taking sysroot into prefix. Introduce additional patch, which picks up PKG_CONFIG_SYSROOT_DIR as prefix for 'test' utility to verify the data dir is actually present. Signed-off-by: Andrey Zhizhikin Signed-off-by: Richard Purdie --- ...lve-missing-opencv-data-dir-in-yocto-buil.patch | 49 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch new file mode 100644 index 0000000..4b6591c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch @@ -0,0 +1,49 @@ +From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin +Date: Mon, 27 Jan 2020 10:22:35 +0000 +Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build + +When Yocto build is performed, opencv searches for data dir using simple +'test' command, this fails because pkg-config provides an absolute +path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR +in order for the 'test' utility to pick up the absolute path. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin +--- + ext/opencv/meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55dfe..a26403482 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -78,20 +78,21 @@ else + endif + + if opencv_found ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] + + # Check the data dir used by opencv for its xml data files + # Use prefix from pkg-config to be compatible with cross-compilation +- r = run_command('test', '-d', opencv_prefix + '/share/opencv') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' + else +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' + else +-- +2.17.1 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb index 56ae7a1..024277e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb @@ -6,6 +6,7 @@ SRC_URI = " \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:04:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:04:48 +0000 Subject: [oe-commits] [openembedded-core] 21/21: opensbi: Remove dependency on FDT In-Reply-To: <158066306794.27256.12948139815779264307@git.openembedded.org> References: <158066306794.27256.12948139815779264307@git.openembedded.org> Message-ID: <20200202170429.27201232951@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 472507b8c446dcfe3cb08deecfbca4e5928ca504 Author: Alistair Francis AuthorDate: Thu Jan 30 15:04:23 2020 -0800 opensbi: Remove dependency on FDT U-Boot no longer requires OpenSBI to include a FDT for the HiFive Unleashed, so remove the support from OpenSBI. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 +------------------- meta/recipes-bsp/opensbi/opensbi_0.5.bb | 4 +--- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7..2e32943 100644 --- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload -def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): if 'linux' in sbi_payload or 'Image' in sbi_payload: return "virtual/kernel:do_deploy" if 'u-boot.bin' in sbi_payload: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.5.bb index 6a90262..71d64fa 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.5.bb @@ -2,7 +2,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" -DEPENDS += "dtc-native" require opensbi-payloads.inc @@ -21,7 +20,7 @@ SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a22 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" +EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" # Required if specifying a custom payload do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" @@ -47,7 +46,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - COMPATIBLE_HOST = "(riscv64|riscv32).*" INHIBIT_PACKAGE_STRIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:11 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (daa8f50 -> 1ef9ce1) Message-ID: <158066311136.28141.7556188207207646500@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard daa8f50 reproducible: Allow configuration of saved debug output discard 39f87fd bitbake.conf: drop pod2man from hosttools discard 4c65cea opensbi: Remove dependency on FDT discard 4f79b11 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build discard 3d046d8 busybox: sort the .config file used by ptests discard 462b44f glibc: Update to final 2.31 release discard f3bc71a uninative: Recognise ppc64 host ldso discard ba4eada icu: update SRC_URI discard 86c11a9 glibc: merge libc-common.bbclass into glibc.bb discard 12e75f7 classes/reproducible_build: Read SDE file later discard ec2879e libgcc.inc: Fix an issue w/ a recursive symlink discard 914f40d toaster.bbclass: Fix error when toaster is used to monitor a build discard 71b7503 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig discard 6082d05 devtool/standard.py: Allow recipe to disable menuconfig logic discard 5cd7aa9 gcc-cross-canadian: A missing space in an append caused an invalid option discard 7ab4bb1 texinfo-dummy-native: Allow to coexist with texinfo-native discard aa3a883 autoconf-archive: Add missing texinfo inherit discard db2fc04 glibc-package.inc: Remove warnings about unpacked directories discard 1db4535 iptables: upgrade 1.8.3 -> 1.8.4 discard 3bb3363 iw: upgrade 5.3 -> 5.4 discard 31b1312 iproute2: upgrade 5.3.0 -> 5.5.0 discard d37d383 musl: Update to latest discard b08bad3 valgrind: Fix ptest builds on musl discard 37dea00 valgrind: fix the remaining ptest failures add 138ed4a reproducible: Allow configuration of saved debug output add 64bc13f valgrind: fix the remaining ptest failures add 20e7d63 valgrind: Fix ptest builds on musl add bc922df musl: Update to latest add 90f670a iproute2: upgrade 5.3.0 -> 5.5.0 add 9b436d3 iw: upgrade 5.3 -> 5.4 add 490dd75 iptables: upgrade 1.8.3 -> 1.8.4 add 811a5b1 glibc-package.inc: Remove warnings about unpacked directories add 0675fdc autoconf-archive: Add missing texinfo inherit add 0a1099d texinfo-dummy-native: Allow to coexist with texinfo-native add 7b52893 gcc-cross-canadian: A missing space in an append caused an invalid option add 6cc17e6 devtool/standard.py: Allow recipe to disable menuconfig logic add a6c430b u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig add c7329b1 toaster.bbclass: Fix error when toaster is used to monitor a build add ef28e5a libgcc.inc: Fix an issue w/ a recursive symlink add a0bff0d glibc: merge libc-common.bbclass into glibc.bb add 1a01c30 icu: update SRC_URI add 15f7eed uninative: Recognise ppc64 host ldso add b0df2fc glibc: Update to final 2.31 release add 93c7fa3 busybox: sort the .config file used by ptests add 575fca9 gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build add 472507b opensbi: Remove dependency on FDT new b3313a1 classes/reproducible_build: Read SDE file later new 2ffc0c2 bitbake.conf: drop pod2man from hosttools new f6198a8 oeqa: reproducible: Do not strip packages new 053eeee texinfo/texinfo-dummy-native: Drop native path prefix new 0a16bcb texinfo: Only build texinfo when api-docs enabled new c54f1d8 bitbake.conf/sanity: Drop makeinfo as being required on buildhost new 2a5280b linux-yocto: introduce 5.4 recipes new 97f703f kern-tools: update Kconfiglib to latest (for 5.4+ kernel) new 1ef9ce1 kernel-devsrc: update to v5.4+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (daa8f50) \ N -- N -- N refs/heads/master-next (1ef9ce1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/sanity.bbclass | 2 +- meta/classes/texinfo.bbclass | 8 ++-- meta/conf/bitbake.conf | 2 +- meta/lib/oeqa/selftest/cases/reproducible.py | 1 + .../texinfo-dummy-native/texinfo-dummy-native.bb | 2 - .../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 ++-- ...linux-yocto-rt_5.2.bb => linux-yocto-rt_5.4.bb} | 12 ++--- ...x-yocto-tiny_5.2.bb => linux-yocto-tiny_5.4.bb} | 16 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 ++++++++++++++++++++++ 10 files changed, 81 insertions(+), 26 deletions(-) copy meta/recipes-kernel/linux/{linux-yocto-rt_5.2.bb => linux-yocto-rt_5.4.bb} (85%) copy meta/recipes-kernel/linux/{linux-yocto-tiny_5.2.bb => linux-yocto-tiny_5.4.bb} (62%) create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:13 +0000 Subject: [oe-commits] [openembedded-core] 02/09: bitbake.conf: drop pod2man from hosttools In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170511.CDB9B23293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ffc0c223bb4d0a2dd0e9a85388607daaf69bc72 Author: Alexander Kanavin AuthorDate: Fri Jan 31 19:49:35 2020 +0100 bitbake.conf: drop pod2man from hosttools pod2man writes the current date into manpages, and while later versions of it respect SOURCE_DATE_EPOCH and use that instead, earlier versions do not. This was found to cause reproducibility issues. This patch replaces host version of pod2man with one from perl-native. [YOCTO #13755] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b6aa9f3..f7544b3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -488,7 +488,7 @@ HOSTTOOLS += " \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ + mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726..8e7ef00 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -18,6 +18,8 @@ TARGET_CC_ARCH += "${LDFLAGS}" RDEPENDS_${PN} += "bash" +inherit perlnative + # For native builds we use the host Python PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" PYTHONRDEPS_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:14 +0000 Subject: [oe-commits] [openembedded-core] 03/09: oeqa: reproducible: Do not strip packages In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170511.DBB7823293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f6198a87eccc8675aef33f07de3e9fdd32a4182b Author: Joshua Watt AuthorDate: Sun Jan 19 12:59:59 2020 -0600 oeqa: reproducible: Do not strip packages Do not strip packages when testing reproducible builds. In some cases, stripped data differs between builds, but then gets removed. However, the contents affect the generation of the GCC build-id, which then differs in the resulting ELF files, even though the data that caused this is no longer there. Inhibit stripping so that their causes can be evaluated. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index c261076..04dc46f 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -148,6 +148,7 @@ class ReproducibleTests(OESelftestTestCase): config = textwrap.dedent('''\ INHERIT += "reproducible_build" PACKAGE_CLASSES = "{package_classes}" + INHIBIT_PACKAGE_STRIP = "1" TMPDIR = "{tmpdir}" ''').format(package_classes=' '.join('package_%s' % c for c in self.package_classes), tmpdir=tmpdir) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:12 +0000 Subject: [oe-commits] [openembedded-core] 01/09: classes/reproducible_build: Read SDE file later In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170511.BEE4C23293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b3313a10a3eb93f0a3710a35de0404fb49cd6202 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..750eb95 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:15 +0000 Subject: [oe-commits] [openembedded-core] 04/09: texinfo/texinfo-dummy-native: Drop native path prefix In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170511.E9BA3232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 053eeeec5e927e8992f531c7852757900ecaf768 Author: Richard Purdie AuthorDate: Tue Jan 28 14:42:55 2020 +0000 texinfo/texinfo-dummy-native: Drop native path prefix Now we have recipe specific sysroots we don't need this native path prefix. It was breaking the crosssdk/cross-canadian cases and causing bugs, removing it is the simplest solution. Signed-off-by: Richard Purdie --- meta/classes/texinfo.bbclass | 4 +--- meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass index 6b0def0..72091c7 100644 --- a/meta/classes/texinfo.bbclass +++ b/meta/classes/texinfo.bbclass @@ -10,9 +10,7 @@ TEXDEP = "texinfo-native" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" -PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" -PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" # libtool-cross doesn't inherit cross TEXDEP_pn-libtool-cross = "texinfo-dummy-native" -PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" + diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 3732d4f..ec04bfe 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -9,8 +9,6 @@ SRC_URI = "file://template.py file://COPYING" S = "${WORKDIR}" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - inherit native # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:17 +0000 Subject: [oe-commits] [openembedded-core] 06/09: bitbake.conf/sanity: Drop makeinfo as being required on buildhost In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170512.13C62232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c54f1d8f707de4350a2dd47e035a67893894f430 Author: Richard Purdie AuthorDate: Tue Jan 28 14:46:22 2020 +0000 bitbake.conf/sanity: Drop makeinfo as being required on buildhost This is a long standing 'odd' dependency which we've meant to resolve. We shouldn't need it and it introduces reproducability issues. We already have texinfo-dummy-native and texinfo-native which can provide it but the work to remove the hosttool was never completed. After cleaning up texinfo.bbclass, this can now be removed with minimal impact on build time. [YOCTO #13753] Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5c2f8f9..cca5cda 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -2,7 +2,7 @@ # Sanity check the users setup for common misconfigurations # -SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \ +SANITY_REQUIRED_UTILITIES ?= "patch diffstat git bzip2 tar \ gzip gawk chrpath wget cpio perl file which" def bblayers_conf_file(d): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f7544b3..8b4621f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -487,7 +487,7 @@ HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ - head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ + head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:16 +0000 Subject: [oe-commits] [openembedded-core] 05/09: texinfo: Only build texinfo when api-docs enabled In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170512.02ABB232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0a16bcbc65804493218cc2b9a154f8c87f641e1f Author: Richard Purdie AuthorDate: Tue Jan 28 14:45:27 2020 +0000 texinfo: Only build texinfo when api-docs enabled Also fix the crosssdk and cross-canadian cases. Signed-off-by: Richard Purdie --- meta/classes/texinfo.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass index 72091c7..f46baca 100644 --- a/meta/classes/texinfo.bbclass +++ b/meta/classes/texinfo.bbclass @@ -6,9 +6,11 @@ # Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and # makeinfo from SANITY_REQUIRED_UTILITIES. -TEXDEP = "texinfo-native" +TEXDEP = "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'texinfo-replacement-native', 'texinfo-dummy-native', d)}" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" +TEXDEP_class-crosssdk = "texinfo-dummy-native" +TEXDEP_class-cross-canadian = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" # libtool-cross doesn't inherit cross -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:19 +0000 Subject: [oe-commits] [openembedded-core] 08/09: kern-tools: update Kconfiglib to latest (for 5.4+ kernel) In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170512.33C46232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 97f703fca0536ac26beae499f88910cbfa693e42 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:09 2020 -0500 kern-tools: update Kconfiglib to latest (for 5.4+ kernel) When a symbol doesn't make it into the final analysis is run using Kconfiglib to show dependencies. v5.4 has introduced Kconfig elements that Kconfiglib can't parse (hence we get no analysis). Updating the Kconfiglib snapshot solves our problem. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 8ca7193..a4c0b6f 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "bb6df0ef2365689cd3df6f76a8838cddae0d9343" +SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:20 +0000 Subject: [oe-commits] [openembedded-core] 09/09: kernel-devsrc: update to v5.4+ In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170512.44DE5232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1ef9ce17af3d6ea5dda5245b24faed6e520bdc78 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:10 2020 -0500 kernel-devsrc: update to v5.4+ To support on-target module building, we need to include syscall.tbl for ARM64 (just like we do for other architectures). We also copy .config with -a to ensure that we don't trigger extra processing and regen configs. Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index b6f2dbc..2fa4be6 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -78,7 +78,7 @@ do_install() { cp Module.markers $kerneldir/build fi - cp .config $kerneldir/build + cp -a .config $kerneldir/build # This scripts copy blow up QA, so for now, we require a more # complex 'make scripts' to restore these, versus copying them @@ -128,11 +128,12 @@ do_install() { # extra files, just in case cp -a --parents tools/objtool/* $kerneldir/build/ - cp -a --parents tools/lib/str_error_r.c $kerneldir/build/ - cp -a --parents tools/lib/string.c $kerneldir/build/ + cp -a --parents tools/lib/* $kerneldir/build/ cp -a --parents tools/lib/subcmd/* $kerneldir/build/ cp -a --parents tools/include/* $kerneldir/build/ + + cp -a --parents $(find tools/arch/${ARCH}/ -type f) $kerneldir/build/ fi if [ "${ARCH}" = "arm64" ]; then @@ -186,6 +187,7 @@ do_install() { # required for generate missing syscalls prepare phase cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build if [ "${ARCH}" = "x86" ]; then # files for 'make prepare' to succeed with kernel-devel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 2 17:05:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 02 Feb 2020 17:05:18 +0000 Subject: [oe-commits] [openembedded-core] 07/09: linux-yocto: introduce 5.4 recipes In-Reply-To: <158066311136.28141.7556188207207646500@git.openembedded.org> References: <158066311136.28141.7556188207207646500@git.openembedded.org> Message-ID: <20200202170512.2646E232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2a5280bf3595d8ac0658803f9e22db53ebfe270e Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:08 2020 -0500 linux-yocto: introduce 5.4 recipes This creates recipes for the v5.4/* branches of the linux-yocto reference kernel. preempt-rt, yaffs2, aufs5 and reference board specific patches are part of these branches. All major architectures: x86,x86-64,ARM, ARM64,ppc,mips and mips64 have been feature tested against this reference. 5.4 is a LTS release, and as such will receive -stable updates for the duration of upstream korg support. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 44 ++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 32 ++++++++++++++ meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb new file mode 100644 index 0000000..52f0e3b --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -0,0 +1,44 @@ +KBRANCH ?= "v5.4/standard/preempt-rt/base" + +require recipes-kernel/linux/linux-yocto.inc + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LINUX_VERSION ?= "5.4.15" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "5.4.15" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +LINUX_KERNEL_TYPE = "preempt-rt" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb new file mode 100644 index 0000000..a028b37 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -0,0 +1,32 @@ +KBRANCH ?= "v5.4/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" + +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "5.4.15" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +PV = "5.4.15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb new file mode 100644 index 0000000..9fbc47d --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -0,0 +1,54 @@ +KBRANCH ?= "v5.4/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" +KBRANCH_qemux86 ?= "v5.4/standard/base" +KBRANCH_qemux86-64 ?= "v5.4/standard/base" +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +# remap qemuarm to qemuarma15 for the 5.4 kernel +# KMACHINE_qemuarm ?= "qemuarma15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION ?= "5.4.15" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "5.4.15" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:42 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (472507b -> 1be199f) Message-ID: <158068870217.18330.12961933104311978463@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 472507b opensbi: Remove dependency on FDT add b3313a1 classes/reproducible_build: Read SDE file later new 0e23c6f oeqa: reproducible: Do not strip packages new f7c9e4c texinfo/texinfo-dummy-native: Drop native path prefix new 9547637 texinfo: Only build texinfo when api-docs enabled new deda455 bitbake.conf: drop pod2man from hosttools new 0c58c47 bitbake.conf/sanity: Drop makeinfo as being required on buildhost new 2c2bdd9 linux-yocto: introduce 5.4 recipes new 240e0ae kern-tools: update Kconfiglib to latest (for 5.4+ kernel) new 1be199f kernel-devsrc: update to v5.4+ The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/reproducible_build.bbclass | 40 ++++++++++++---- meta/classes/sanity.bbclass | 2 +- meta/classes/texinfo.bbclass | 8 ++-- meta/conf/bitbake.conf | 4 +- meta/lib/oeqa/selftest/cases/reproducible.py | 1 + .../opkg-utils/opkg-utils_0.4.2.bb | 2 + .../texinfo-dummy-native/texinfo-dummy-native.bb | 2 - .../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 ++-- ...linux-yocto-rt_5.2.bb => linux-yocto-rt_5.4.bb} | 12 ++--- ...x-yocto-tiny_5.2.bb => linux-yocto-tiny_5.4.bb} | 16 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 ++++++++++++++++++++++ 12 files changed, 115 insertions(+), 36 deletions(-) copy meta/recipes-kernel/linux/{linux-yocto-rt_5.2.bb => linux-yocto-rt_5.4.bb} (85%) copy meta/recipes-kernel/linux/{linux-yocto-tiny_5.2.bb => linux-yocto-tiny_5.4.bb} (62%) create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:44 +0000 Subject: [oe-commits] [openembedded-core] 02/08: texinfo/texinfo-dummy-native: Drop native path prefix In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.8A59B23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f7c9e4c4cbb2a74a3627dc8da37083eef071e3cb Author: Richard Purdie AuthorDate: Tue Jan 28 14:42:55 2020 +0000 texinfo/texinfo-dummy-native: Drop native path prefix Now we have recipe specific sysroots we don't need this native path prefix. It was breaking the crosssdk/cross-canadian cases and causing bugs, removing it is the simplest solution. Signed-off-by: Richard Purdie --- meta/classes/texinfo.bbclass | 4 +--- meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass index 6b0def0..72091c7 100644 --- a/meta/classes/texinfo.bbclass +++ b/meta/classes/texinfo.bbclass @@ -10,9 +10,7 @@ TEXDEP = "texinfo-native" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" -PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" -PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" # libtool-cross doesn't inherit cross TEXDEP_pn-libtool-cross = "texinfo-dummy-native" -PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" + diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index 3732d4f..ec04bfe 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -9,8 +9,6 @@ SRC_URI = "file://template.py file://COPYING" S = "${WORKDIR}" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - inherit native # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:45 +0000 Subject: [oe-commits] [openembedded-core] 03/08: texinfo: Only build texinfo when api-docs enabled In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.93B51232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 95476373b20ba56c2877c70b5b36335446904f37 Author: Richard Purdie AuthorDate: Tue Jan 28 14:45:27 2020 +0000 texinfo: Only build texinfo when api-docs enabled Also fix the crosssdk and cross-canadian cases. Signed-off-by: Richard Purdie --- meta/classes/texinfo.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass index 72091c7..f46baca 100644 --- a/meta/classes/texinfo.bbclass +++ b/meta/classes/texinfo.bbclass @@ -6,9 +6,11 @@ # Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and # makeinfo from SANITY_REQUIRED_UTILITIES. -TEXDEP = "texinfo-native" +TEXDEP = "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'texinfo-replacement-native', 'texinfo-dummy-native', d)}" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" +TEXDEP_class-crosssdk = "texinfo-dummy-native" +TEXDEP_class-cross-canadian = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" # libtool-cross doesn't inherit cross -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:43 +0000 Subject: [oe-commits] [openembedded-core] 01/08: oeqa: reproducible: Do not strip packages In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.7EA3723293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0e23c6faf8169a333ae29064553705b5d7d6b589 Author: Joshua Watt AuthorDate: Sun Jan 19 12:59:59 2020 -0600 oeqa: reproducible: Do not strip packages Do not strip packages when testing reproducible builds. In some cases, stripped data differs between builds, but then gets removed. However, the contents affect the generation of the GCC build-id, which then differs in the resulting ELF files, even though the data that caused this is no longer there. Inhibit stripping so that their causes can be evaluated. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index c261076..04dc46f 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -148,6 +148,7 @@ class ReproducibleTests(OESelftestTestCase): config = textwrap.dedent('''\ INHERIT += "reproducible_build" PACKAGE_CLASSES = "{package_classes}" + INHIBIT_PACKAGE_STRIP = "1" TMPDIR = "{tmpdir}" ''').format(package_classes=' '.join('package_%s' % c for c in self.package_classes), tmpdir=tmpdir) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:46 +0000 Subject: [oe-commits] [openembedded-core] 04/08: bitbake.conf: drop pod2man from hosttools In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.9F3E3232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit deda455b3c1829003a4cc14520f30e616be93dfb Author: Alexander Kanavin AuthorDate: Fri Jan 31 19:49:35 2020 +0100 bitbake.conf: drop pod2man from hosttools pod2man writes the current date into manpages, and while later versions of it respect SOURCE_DATE_EPOCH and use that instead, earlier versions do not. This was found to cause reproducibility issues. This patch replaces host version of pod2man with one from perl-native. [YOCTO #13755] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b6aa9f3..f7544b3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -488,7 +488,7 @@ HOSTTOOLS += " \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ + mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726..8e7ef00 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -18,6 +18,8 @@ TARGET_CC_ARCH += "${LDFLAGS}" RDEPENDS_${PN} += "bash" +inherit perlnative + # For native builds we use the host Python PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" PYTHONRDEPS_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:47 +0000 Subject: [oe-commits] [openembedded-core] 05/08: bitbake.conf/sanity: Drop makeinfo as being required on buildhost In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.AB09A232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0c58c479af151969dfb84d8763696da657f7248d Author: Richard Purdie AuthorDate: Tue Jan 28 14:46:22 2020 +0000 bitbake.conf/sanity: Drop makeinfo as being required on buildhost This is a long standing 'odd' dependency which we've meant to resolve. We shouldn't need it and it introduces reproducability issues. We already have texinfo-dummy-native and texinfo-native which can provide it but the work to remove the hosttool was never completed. After cleaning up texinfo.bbclass, this can now be removed with minimal impact on build time. [YOCTO #13753] Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5c2f8f9..cca5cda 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -2,7 +2,7 @@ # Sanity check the users setup for common misconfigurations # -SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \ +SANITY_REQUIRED_UTILITIES ?= "patch diffstat git bzip2 tar \ gzip gawk chrpath wget cpio perl file which" def bblayers_conf_file(d): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f7544b3..8b4621f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -487,7 +487,7 @@ HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ - head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ + head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:49 +0000 Subject: [oe-commits] [openembedded-core] 07/08: kern-tools: update Kconfiglib to latest (for 5.4+ kernel) In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.BCA1F232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 240e0ae13d35469eecafc82d2cd9cfd110095c55 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:09 2020 -0500 kern-tools: update Kconfiglib to latest (for 5.4+ kernel) When a symbol doesn't make it into the final analysis is run using Kconfiglib to show dependencies. v5.4 has introduced Kconfig elements that Kconfiglib can't parse (hence we get no analysis). Updating the Kconfiglib snapshot solves our problem. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 8ca7193..a4c0b6f 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "bb6df0ef2365689cd3df6f76a8838cddae0d9343" +SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:50 +0000 Subject: [oe-commits] [openembedded-core] 08/08: kernel-devsrc: update to v5.4+ In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.C635E23294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1be199f79479d9c8125bd3548cd4f2354f597640 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:10 2020 -0500 kernel-devsrc: update to v5.4+ To support on-target module building, we need to include syscall.tbl for ARM64 (just like we do for other architectures). We also copy .config with -a to ensure that we don't trigger extra processing and regen configs. Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index b6f2dbc..2fa4be6 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -78,7 +78,7 @@ do_install() { cp Module.markers $kerneldir/build fi - cp .config $kerneldir/build + cp -a .config $kerneldir/build # This scripts copy blow up QA, so for now, we require a more # complex 'make scripts' to restore these, versus copying them @@ -128,11 +128,12 @@ do_install() { # extra files, just in case cp -a --parents tools/objtool/* $kerneldir/build/ - cp -a --parents tools/lib/str_error_r.c $kerneldir/build/ - cp -a --parents tools/lib/string.c $kerneldir/build/ + cp -a --parents tools/lib/* $kerneldir/build/ cp -a --parents tools/lib/subcmd/* $kerneldir/build/ cp -a --parents tools/include/* $kerneldir/build/ + + cp -a --parents $(find tools/arch/${ARCH}/ -type f) $kerneldir/build/ fi if [ "${ARCH}" = "arm64" ]; then @@ -186,6 +187,7 @@ do_install() { # required for generate missing syscalls prepare phase cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build if [ "${ARCH}" = "x86" ]; then # files for 'make prepare' to succeed with kernel-devel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:48 +0000 Subject: [oe-commits] [openembedded-core] 06/08: linux-yocto: introduce 5.4 recipes In-Reply-To: <158068870217.18330.12961933104311978463@git.openembedded.org> References: <158068870217.18330.12961933104311978463@git.openembedded.org> Message-ID: <20200203001142.B42AF232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c2bdd9661e4341178f2d831bb56e961e74e8509 Author: Bruce Ashfield AuthorDate: Tue Jan 28 17:14:08 2020 -0500 linux-yocto: introduce 5.4 recipes This creates recipes for the v5.4/* branches of the linux-yocto reference kernel. preempt-rt, yaffs2, aufs5 and reference board specific patches are part of these branches. All major architectures: x86,x86-64,ARM, ARM64,ppc,mips and mips64 have been feature tested against this reference. 5.4 is a LTS release, and as such will receive -stable updates for the duration of upstream korg support. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 44 ++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 32 ++++++++++++++ meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb new file mode 100644 index 0000000..52f0e3b --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -0,0 +1,44 @@ +KBRANCH ?= "v5.4/standard/preempt-rt/base" + +require recipes-kernel/linux/linux-yocto.inc + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LINUX_VERSION ?= "5.4.15" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "5.4.15" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +LINUX_KERNEL_TYPE = "preempt-rt" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb new file mode 100644 index 0000000..a028b37 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -0,0 +1,32 @@ +KBRANCH ?= "v5.4/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" + +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "5.4.15" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +PV = "5.4.15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb new file mode 100644 index 0000000..9fbc47d --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -0,0 +1,54 @@ +KBRANCH ?= "v5.4/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" +KBRANCH_qemux86 ?= "v5.4/standard/base" +KBRANCH_qemux86-64 ?= "v5.4/standard/base" +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" + +# remap qemuarm to qemuarma15 for the 5.4 kernel +# KMACHINE_qemuarm ?= "qemuarma15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION ?= "5.4.15" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "5.4.15" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:57 +0000 Subject: [oe-commits] [openembedded-core] 01/07: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.6B00523293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1ca4b04db025ef8c57e76a71e993eeb386ca4ec9 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:56 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1ef9ce1 -> 1a98112) Message-ID: <158068871622.18770.7165868996791957563@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 1ef9ce1 kernel-devsrc: update to v5.4+ discard 97f703f kern-tools: update Kconfiglib to latest (for 5.4+ kernel) discard 2a5280b linux-yocto: introduce 5.4 recipes discard c54f1d8 bitbake.conf/sanity: Drop makeinfo as being required on buildhost discard 0a16bcb texinfo: Only build texinfo when api-docs enabled discard 053eeee texinfo/texinfo-dummy-native: Drop native path prefix discard f6198a8 oeqa: reproducible: Do not strip packages discard 2ffc0c2 bitbake.conf: drop pod2man from hosttools add 0e23c6f oeqa: reproducible: Do not strip packages add f7c9e4c texinfo/texinfo-dummy-native: Drop native path prefix add 9547637 texinfo: Only build texinfo when api-docs enabled add deda455 bitbake.conf: drop pod2man from hosttools add 0c58c47 bitbake.conf/sanity: Drop makeinfo as being required on buildhost add 2c2bdd9 linux-yocto: introduce 5.4 recipes add 240e0ae kern-tools: update Kconfiglib to latest (for 5.4+ kernel) add 1be199f kernel-devsrc: update to v5.4+ new 1ca4b04 oescripts.py: use unittest.SkipUnless for class skip new 885baf0 base.bbclass: extend PACKAGECONFIG for conflict package configs new 0a42994 glew/curl: specify exclusive package configs new bb84d46 HACK: signing: Add extra test debug new e9c9d74 systemd: Upgrade 243.2 -> 243.4-latest new 0922b49 systemd: Refresh the patches new 1a98112 sstatesig: Log timestamps for hashequiv in reprodubile builds This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1ef9ce1) \ N -- N -- N refs/heads/master-next (1a98112) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/base.bbclass | 20 ++- meta/lib/oe/sstatesig.py | 4 + meta/lib/oeqa/selftest/cases/oescripts.py | 7 +- meta/lib/oeqa/selftest/cases/signing.py | 8 +- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 ++++-------- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 2 - meta/recipes-graphics/glew/glew_2.1.0.bb | 4 +- meta/recipes-support/curl/curl_7.68.0.bb | 4 +- 13 files changed, 80 insertions(+), 285 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_243.2.bb => systemd-boot_243.4.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch rename meta/recipes-core/systemd/{systemd_243.2.bb => systemd_243.4.bb} (99%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:12:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:12:00 +0000 Subject: [oe-commits] [openembedded-core] 04/07: HACK: signing: Add extra test debug In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.88C4F232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bb84d4634c84a01c78facff3843f04e11174e86c Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:58 +0000 Subject: [oe-commits] [openembedded-core] 02/07: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.73F1123293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 885baf055ff5bd9754834810e43f35777f40f823 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:11:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:11:59 +0000 Subject: [oe-commits] [openembedded-core] 03/07: glew/curl: specify exclusive package configs In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.7CE56232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0a42994cd8a655151c0f129fc518b6a78d025555 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:12:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:12:02 +0000 Subject: [oe-commits] [openembedded-core] 06/07: systemd: Refresh the patches In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.A26FB232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0922b49024b5526f97fdb901a9cb9635ab0b9777 Author: Khem Raj AuthorDate: Tue Jan 28 12:21:14 2020 -0800 systemd: Refresh the patches Fixes WARNING: systemd-1_243.4+gitAUTOINC+70e8c1978a-r0 do_patch: Fuzz detected: Applying patch 0001-do-not-disable-buffer-in-writing-files.patch ... QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...01-do-not-disable-buffer-in-writing-files.patch | 88 +++++++--------------- 1 file changed, 27 insertions(+), 61 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 2f4daf8..d6d68a0 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -38,11 +38,9 @@ Signed-off-by: Scott Murray src/vconsole/vconsole-setup.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -51,7 +49,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -105,11 +103,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,11 +121,9 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -138,8 +132,6 @@ index 123d00e13e..e7ea78f349 100644 if (r < 0) return r; -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -294,7 +294,7 @@ void disable_coredumps(void) { @@ -151,11 +143,9 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) if (!fn) return log_oom(); @@ -164,7 +154,7 @@ index aa9d811f2e..8c7f2dae7a 100644 } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) (void) delete_rule(rule); @@ -182,11 +172,9 @@ index aa9d811f2e..8c7f2dae7a 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -195,7 +183,7 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -204,11 +192,9 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) } #ifdef SMACK_RUN_LABEL @@ -230,8 +216,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,11 +227,9 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -256,11 +238,9 @@ index c4a7f2f3d3..bcac758284 100644 if (r < 0) { if (r == -ELOOP) return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { +@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd if (!t) return -ENOMEM; @@ -269,11 +249,9 @@ index 30b9a66334..cc1d577933 100644 } return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +260,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,7 +271,7 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -311,11 +287,9 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c +@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con log_debug("Setting '%s' to '%s'", p, value); @@ -324,11 +298,9 @@ index 93bdcf11bf..68cddb7a9f 100644 } int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +@@ -54,7 +54,7 @@ static int write_hibernate_location_info /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { @@ -337,7 +309,7 @@ index b9fe96635d..f168d7f890 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +@@ -98,14 +98,14 @@ static int write_hibernate_location_info offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); @@ -363,7 +335,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,24 +344,20 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 + bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { +@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -398,11 +366,9 @@ index cb5123042a..ea309a9e7f 100644 if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:12:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:12:01 +0000 Subject: [oe-commits] [openembedded-core] 05/07: systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.96669232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e9c9d7485fd88677a47fc2819176c25b1d387b71 Author: Alex Kiernan AuthorDate: Mon Jan 27 23:13:06 2020 +0000 systemd: Upgrade 243.2 -> 243.4-latest Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Commits from v243-stable: 70e8c1978a9a seccomp: real syscall numbers are >= 0 a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change b59d88cc62a4 man: fix typo in net-naming-scheme man page c5e5ac095821 man: fix typos (#14304) 9a2f26564d5a ipv4ll: do not reset conflict counter on restart bc9e1ebfdd3b Fix typo (duplicate "or") c6cb71b7e741 network: if /sys is rw, then udev should be around 67dcdfd95629 nspawn: do not fail if udev is not running a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative b1cf452ff5f6 systemctl: enhance message about kexec missing kernel 07a0e5b42523 man: use mkswap@ instead of makeswap@ 57dc017c6bac journald: don't ask for the machine ID if we don't need it ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field 471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61a0 man: drop reference to machined, add one for journald instead fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b2378 shared/ask-password-api: modify keyctl break value a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed 4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit() d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be* a67a3ae04b89 man: document all pager variables for systemctl and systemd 3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug 733e7f19d3cf travis: add missing closing quote sign 0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter= aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules b9a619bb6738 udevadm: ignore EROFS and return earlier 1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree 7fa7080248aa umount: be happy if /proc/swaps doesn't exist 71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools b50ca0152681 core: do not propagate polkit error to caller 99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list 37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault 3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC 2139d58652bb bpf: fix off-by-one in class whitelisting cb7693595db9 bpf: fix device type filter 56e1ba304b00 core: constify bpf program arrays b06b7ace92c1 run: propagate return code/status from the child 5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection 8d88a2ecd7ce udev: fix error code in the log message c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node f218b65b3246 udev: do not append newline when write attributes ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone 8b888d236007 seccomp: add all *time64 syscalls 53d8feeb2334 libblkid: open device in nonblock mode. b9478046b03d man: describe ordering in case of Conflicts= fa3e5bd2bbb4 man: put description of Wants= above Requires= bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page 9c12127e3d2e man: save pull-raw example file without underscores 4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page 03cc374fca74 shared/format-table: disable ellipsization when piped 0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too fc0451bc0a3f allow an empty DefaultInstance= in configuration files 587266c24aae man/systemd.net-naming-scheme: fix typo e0e63f0f9bb9 nspawn: respect quiet on capabilities warning 37e50c05b564 nspawn: mangle slice name 4fefc493541e mkosi: Find hostname command on Arch Linux c430e8affba4 Fix mkosi on Arch Linux 1765b8d803dd Update to Fedora31 0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2 24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available 14e377ef3519 sd-boot: Only disable optimization on debug builds a39008ddecb9 meson: correct man page deps 4c1dcc06fa30 sd-event: don't invalidate source type on disconnect fb89ee34cedc analyze: fix minor memleak a449299bc087 analyze: sort list of unknown syscalls kernel implements 51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists 819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq d2b4d7ee17de network-generator: Add missing help for --root f1b18c206208 modules-load: do not fail service if modules are not present 606de6626714 pid1: order .automount units after local-fs-pre.target 1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command 00af6c447f25 resolved: set stream type during DnsStream creation 66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function 34fa67bbe732 machine-id-setup: avoid unexpected aborting 24c99fa2ef3d test-socket-util: avoid writing past the defined buffer ce82233f99b3 test: drop duplicated 's' 75a0e7209114 nspawn: fix handling of --console=help f41a282875fc Revert "sysusers: properly mark generated accounts as locked" fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users 6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS 961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure 19590e289ace ceph is a network filesystem 339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func 47d0e23d26af udev: fix memleak caused by wrong cleanup function a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.* cb1d892f1780 parse_hwdb: process files in order ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range 25bb377a73e7 cgroup: fix typo in BPF firewall support warning message 6d97aca0d503 fix build with compilers with default stack-protector enabled fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p 20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV 6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment 9d8e889810b5 nspawn: consistenly fail if parsing the environment fails 40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min ea248e53bf76 cgroup: Check ancestor memory min for unified memory config de1d25a506db cgroup: docs: memory.high doc fixups 2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem 5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly 8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments a0577353f191 man: Add a missing space in machinectl(1) 693e98398869 log: Add missing "%" in "%m" log format strings ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 2 - 6 files changed, 18 insertions(+), 212 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.2.bb b/meta/recipes-core/systemd/systemd-boot_243.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.2.bb rename to meta/recipes-core/systemd/systemd-boot_243.4.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 18f17d2..2fca6dc 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" +SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +PV = "243.4+git${SRCPV}" + S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff..ea37680 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/units/meson.build b/units/meson.build -index e1ee9f86c3..6bb7771b36 100644 ---- a/units/meson.build -+++ b/units/meson.build +Index: systemd-stable/units/meson.build +=================================================================== +--- systemd-stable.orig/units/meson.build ++++ systemd-stable/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 30a6bc9918..4231f3b70f 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount +Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount ++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index e940c7c9ad..6be7f5cc9b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +Index: systemd-stable/units/systemd-binfmt.service.in +=================================================================== +--- systemd-stable.orig/units/systemd-binfmt.service.in ++++ systemd-stable/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount + After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target - ConditionPathIsReadWrite=/proc/sys/ -@@ -28,3 +29,6 @@ Type=oneshot +@@ -29,3 +30,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt TimeoutSec=90s diff --git a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch b/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted file mode 100644 index f359d28..0000000 --- a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Nov 2019 17:51:30 +0100 -Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's - __NR_xyz namespace invasion - -A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the -same conditioning for all cases of our __NR_xyz use. - -Fixes: #14031 - -Reference: -https://github.com/systemd/systemd/pull/14032/commits/62f66fdbcc33580467c01b1f149474b6c973df5a - -Upstream-Status: Backport - -Signed-off-by: Ming Liu ---- - src/basic/missing_syscall.h | 10 +++++----- - src/test/test-seccomp.c | 19 ++++++++++--------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 6d9b125..1255d8b 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c - - #if !HAVE_KCMP - static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { --# ifdef __NR_kcmp -+# if defined __NR_kcmp && __NR_kcmp > 0 - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else - errno = ENOSYS; -@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i - - #if !HAVE_KEYCTL - static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { --# ifdef __NR_keyctl -+# if defined __NR_keyctl && __NR_keyctl > 0 - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; -@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg - } - - static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { --# ifdef __NR_add_key -+# if defined __NR_add_key && __NR_add_key > 0 - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; -@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip - } - - static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { --# ifdef __NR_request_key -+# if defined __NR_request_key && __NR_request_key > 0 - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; -@@ -496,7 +496,7 @@ enum { - static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, - unsigned long maxnode) { - long i; --# ifdef __NR_set_mempolicy -+# if defined __NR_set_mempolicy && __NR_set_mempolicy > 0 - i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); - # else - errno = ENOSYS; -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 018c20f..c669204 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -28,7 +28,8 @@ - #include "tmpfile-util.h" - #include "virt.h" - --#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) -+/* __NR_socket may be invalid due to libseccomp */ -+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) - /* On these archs, socket() is implemented via the socketcall() syscall multiplexer, - * and we can't restrict it hence via seccomp. */ - # define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1 -@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) { - assert_se(pid >= 0); - - if (pid == 0) { --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); - #endif - - assert_se(seccomp_protect_sysctl() >= 0); - --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0); - assert_se(errno == EPERM); - #endif -@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(poll(NULL, 0, 0) == 0); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0); -@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); -@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) { - * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On - * other architectures, let's just fall back to the glibc call. */ - --#ifdef SYS_open -- return (int) syscall(SYS_open, path, flags, mode); -+#if defined __NR_open && __NR_open > 0 -+ return (int) syscall(__NR_open, path, flags, mode); - #else - return open(path, flags, mode); - #endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch b/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted file mode 100644 index ba20a0b..0000000 --- a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d0122c077d2d8fd0fd29b463c501e7ddf9177ff3 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 24 Sep 2019 17:04:50 +0800 -Subject: [PATCH] unit-file.c: consider symlink on filesystems like NFS - -Some filesystems do not fully support readdir, according to the manual, -so we should also consider DT_UNKNOWN to correctly handle symlinks. - -Signed-off-by: Chen Qi - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/13637] ---- - src/shared/unit-file.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c -index 4a5f23e6c1..8373103000 100644 ---- a/src/shared/unit-file.c -+++ b/src/shared/unit-file.c -@@ -247,6 +247,7 @@ int unit_file_build_name_map( - _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; - const char *suffix, *dst = NULL; - bool valid_unit_name; -+ struct stat sb; - - valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY); - -@@ -279,7 +280,10 @@ int unit_file_build_name_map( - if (hashmap_contains(ids, de->d_name)) - continue; - -- if (de->d_type == DT_LNK) { -+ if (de->d_type == DT_LNK || -+ (de->d_type == DT_UNKNOWN && -+ lstat(filename, &sb) == 0 && -+ (sb.st_mode & S_IFMT) == S_IFLNK)) { - /* We don't explicitly check for alias loops here. unit_ids_map_get() which - * limits the number of hops should be used to access the map. */ - --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_243.2.bb b/meta/recipes-core/systemd/systemd_243.4.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.2.bb rename to meta/recipes-core/systemd/systemd_243.4.bb index e31fac8..5020165 100644 --- a/meta/recipes-core/systemd/systemd_243.2.bb +++ b/meta/recipes-core/systemd/systemd_243.4.bb @@ -22,8 +22,6 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0004-rules-whitelist-hd-devices.patch \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ - file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \ file://99-default.preset \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:12:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:12:03 +0000 Subject: [oe-commits] [openembedded-core] 07/07: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158068871622.18770.7165868996791957563@git.openembedded.org> References: <158068871622.18770.7165868996791957563@git.openembedded.org> Message-ID: <20200203001156.B0D81232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1a98112938ff75052328cc2454c8f4b4ef72a231 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:11 +0000 Subject: [oe-commits] [openembedded-core] 01/24: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.1D78623293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f9b29252220d97e1198f00438d8914a2617fa170 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:12 +0000 Subject: [oe-commits] [openembedded-core] 02/24: findutils: drop upstream-version-is-even In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.2920A23293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c958d8c9e0d973df9ea32950345dd0dd446d954 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:16 2020 +0100 findutils: drop upstream-version-is-even Upstream seems to have dropped the odd-even policy Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/findutils/findutils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index a0e1f89..9aa7239 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -8,7 +8,7 @@ SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" -inherit autotools gettext texinfo update-alternatives upstream-version-is-even +inherit autotools gettext texinfo update-alternatives ALTERNATIVE_${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:10 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1a98112 -> d662f56) Message-ID: <158068879053.19514.3781903308780973632@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 1a98112 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 0922b49 systemd: Refresh the patches discard e9c9d74 systemd: Upgrade 243.2 -> 243.4-latest new f9b2925 sstatesig: Log timestamps for hashequiv in reprodubile builds new 3c958d8 findutils: drop upstream-version-is-even new 094ff2f libva-utils: fix upstream version check new 65ef6ed speexdsp: fix upstream version check new 5fe6df6 shared-mime-info: fix (sort of) upstream version check new b8525d0 bison: upgrade 3.4.2 -> 3.5 new f0b4115 puzzles: upgrade to latest revision new 8a36785 socat: upgrade 1.7.3.3 -> 1.7.3.4 new 6f6ecc8 linux-firmware: upgrade to latest revision new 936d41c libxpm: upgrade 3.5.12 -> 3.5.13 new 17d2d1e ccache: upgrade 3.7.3 -> 3.7.7 new 85a703d piglit: upgrade to latest revision new 9cbc6e4 kmscube: upgrade to latest revision new 2a5024e ncurses: upgrade 6.1+20190803 -> 6.1+20191019 new 42705b1 python3-gitdb: upgrade 2.0.5 -> 2.0.6 new 99de4b7 libedit: upgrade 20191025-3.1 -> 20191231-3.1 new 5bfa795 python3-setuptools: upgrade 42.0.2 -> 45.0.0 new 9aba70a python3-git: upgrade 3.0.2 -> 3.0.5 new adb6061 gnu-config: upgrade to latest revision new eb75a3a libarchive: upgrade 3.4.0 -> 3.4.1 new 3bd43da python3-six: upgrade 1.13.0 -> 1.14.0 new 059a2c2 xserver-xorg: upgrade 1.20.6 -> 1.20.7 new 2169bc4 sed: upgrade 4.7 -> 4.8 new d662f56 libpcre2: upgrade 10.33 -> 10.34 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1a98112) \ N -- N -- N refs/heads/master-next (d662f56) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 24 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} | 4 +- ...rses-selective-backport-of-20191012-patch.patch | 169 --------------------- ...ses_6.1+20190803.bb => ncurses_6.1+20191019.bb} | 9 +- ...systemd-boot_243.4.bb => systemd-boot_243.2.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 +++++++---- ...e-comprehensive-protection-against-libsec.patch | 152 ++++++++++++++++++ ...-consider-symlink-on-filesystems-like-NFS.patch | 42 +++++ .../systemd/{systemd_243.4.bb => systemd_243.2.bb} | 2 + .../bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 +- meta/recipes-devtools/ccache/ccache_3.7.3.bb | 7 - meta/recipes-devtools/ccache/ccache_3.7.7.bb | 7 + meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 +- ...dit_20191025-3.1.bb => libedit_20191231-3.1.bb} | 4 +- ...ionally-do-not-fetch-code-by-easy_install.patch | 6 +- meta/recipes-devtools/python/python-gitdb.inc | 4 +- meta/recipes-devtools/python/python-setuptools.inc | 4 +- meta/recipes-devtools/python/python-six.inc | 6 +- .../{python3-git_3.0.2.bb => python3-git_3.0.5.bb} | 4 +- ...thon3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} | 1 + ...ools_42.0.2.bb => python3-setuptools_45.0.0.bb} | 0 ...python3-six_1.13.0.bb => python3-six_1.14.0.bb} | 1 + meta/recipes-extended/findutils/findutils.inc | 2 +- .../libarchive/libarchive/CVE-2019-19221.patch | 101 ------------ .../{libarchive_3.4.0.bb => libarchive_3.4.1.bb} | 8 +- .../sed/{sed_4.7.bb => sed_4.8.bb} | 7 +- meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +- meta/recipes-graphics/libva/libva-utils_2.6.0.bb | 2 +- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- .../{libxpm_3.5.12.bb => libxpm_3.5.13.bb} | 4 +- ...erver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 4 +- ...ware_20190815.bb => linux-firmware_20200117.bb} | 8 +- meta/recipes-multimedia/speex/speexdsp_1.2.0.bb | 2 + meta/recipes-sato/puzzles/puzzles_git.bb | 4 +- .../{libpcre2_10.33.bb => libpcre2_10.34.bb} | 4 +- .../shared-mime-info/shared-mime-info_git.bb | 3 + 37 files changed, 335 insertions(+), 370 deletions(-) rename meta/recipes-connectivity/socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} (92%) delete mode 100644 meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch rename meta/recipes-core/ncurses/{ncurses_6.1+20190803.bb => ncurses_6.1+20191019.bb} (55%) rename meta/recipes-core/systemd/{systemd-boot_243.4.bb => systemd-boot_243.2.bb} (100%) create mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch create mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch rename meta/recipes-core/systemd/{systemd_243.4.bb => systemd_243.2.bb} (99%) rename meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} (90%) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.7.3.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.7.7.bb rename meta/recipes-devtools/libedit/{libedit_20191025-3.1.bb => libedit_20191231-3.1.bb} (78%) rename meta/recipes-devtools/python/{python3-git_3.0.2.bb => python3-git_3.0.5.bb} (88%) rename meta/recipes-devtools/python/{python3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} (97%) rename meta/recipes-devtools/python/{python3-setuptools_42.0.2.bb => python3-setuptools_45.0.0.bb} (100%) rename meta/recipes-devtools/python/{python3-six_1.13.0.bb => python3-six_1.14.0.bb} (97%) delete mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch rename meta/recipes-extended/libarchive/{libarchive_3.4.0.bb => libarchive_3.4.1.bb} (91%) rename meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} (91%) rename meta/recipes-graphics/xorg-lib/{libxpm_3.5.12.bb => libxpm_3.5.13.bb} (81%) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (88%) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190815.bb => linux-firmware_20200117.bb} (99%) rename meta/recipes-support/libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:13 +0000 Subject: [oe-commits] [openembedded-core] 03/24: libva-utils: fix upstream version check In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.3723D232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 094ff2fa1c679573c85406846851cd209e55c211 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:17 2020 +0100 libva-utils: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/libva/libva-utils_2.6.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/libva/libva-utils_2.6.0.bb b/meta/recipes-graphics/libva/libva-utils_2.6.0.bb index 0037fdf..03b3802 100644 --- a/meta/recipes-graphics/libva/libva-utils_2.6.0.bb +++ b/meta/recipes-graphics/libva/libva-utils_2.6.0.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.6-branch" SRCREV = "8ea1eba433dcbceb0e5dcb54b8e3f984987f7a17" S = "${WORKDIR}/git" -UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" DEPENDS = "libva" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:14 +0000 Subject: [oe-commits] [openembedded-core] 04/24: speexdsp: fix upstream version check In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.45535232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 65ef6ed3297a81ebc6a8f85922c0d7bd808183c3 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:18 2020 +0100 speexdsp: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-multimedia/speex/speexdsp_1.2.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb b/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb index 2f934eb..6369646 100644 --- a/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb +++ b/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8" SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz" +UPSTREAM_CHECK_REGEX = "speexdsp-(?P\d+(\.\d+)+)\.tar" + SRC_URI[md5sum] = "b722df341576dc185d897131321008fc" SRC_URI[sha256sum] = "682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:15 +0000 Subject: [oe-commits] [openembedded-core] 05/24: shared-mime-info: fix (sort of) upstream version check In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.53FD2232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5fe6df63644868baced946f45123fe760bdace46 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:19 2020 +0100 shared-mime-info: fix (sort of) upstream version check Upstream is using - to separate version components which version checker at the moment can't deal with (i.e 1-15-1 when 1.15.1 is meant). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb index f0d5bc6..7a060b0 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -12,6 +12,9 @@ SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" PV = "1.15" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "Release-(?P(\d+(\-\d+)+))" +UPSTREAM_VERSION_UNKNOWN = "1" + inherit autotools pkgconfig gettext python3native mime EXTRA_OECONF = "--disable-update-mimedb" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:16 +0000 Subject: [oe-commits] [openembedded-core] 06/24: bison: upgrade 3.4.2 -> 3.5 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.64FB2232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b8525d0946cac5e4285eff176ad706b42e1fb9b4 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:20 2020 +0100 bison: upgrade 3.4.2 -> 3.5 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.4.2.bb b/meta/recipes-devtools/bison/bison_3.5.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.4.2.bb rename to meta/recipes-devtools/bison/bison_3.5.bb index 46f0f90..3d8f657 100644 --- a/meta/recipes-devtools/bison/bison_3.4.2.bb +++ b/meta/recipes-devtools/bison/bison_3.5.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "d1ceb9dfde2d03b24a4c1137f7f1b572" -SRC_URI[sha256sum] = "27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0" +SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" +SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:18 +0000 Subject: [oe-commits] [openembedded-core] 08/24: socat: upgrade 1.7.3.3 -> 1.7.3.4 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.84DC023294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8a36785e18f8951bac235f23bd1ece594a0215fc Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:22 2020 +0100 socat: upgrade 1.7.3.3 -> 1.7.3.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../recipes-connectivity/socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb b/meta/recipes-connectivity/socat/socat_1.7.3.4.bb similarity index 92% rename from meta/recipes-connectivity/socat/socat_1.7.3.3.bb rename to meta/recipes-connectivity/socat/socat_1.7.3.4.bb index ee01578..9b0d407 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.4.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f" -SRC_URI[sha256sum] = "0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a" +SRC_URI[md5sum] = "3cca4f8cd9d2d1caabd9cc099451bac9" +SRC_URI[sha256sum] = "972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:17 +0000 Subject: [oe-commits] [openembedded-core] 07/24: puzzles: upgrade to latest revision In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.745D4232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f0b41153a59c756e8982bfe2ece9f51617ec05aa Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:21 2020 +0100 puzzles: upgrade to latest revision License-Update: list of contributors updated. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/puzzles/puzzles_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 57f2af4..41b78d6 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b" +LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" DEPENDS = "libxt" @@ -17,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "1c0c49dd5cd8df6ae87f7be5371be84589fa2662" +SRCREV = "79a5378b5adc46ee33ba34d55738f916fb8adfc9" PE = "2" PV = "0.0+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:20 +0000 Subject: [oe-commits] [openembedded-core] 10/24: libxpm: upgrade 3.5.12 -> 3.5.13 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.A19AC23293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 936d41c3e89b0c0b756e617cf4943771398a2c78 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:24 2020 +0100 libxpm: upgrade 3.5.12 -> 3.5.13 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/{libxpm_3.5.12.bb => libxpm_3.5.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb similarity index 81% rename from meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb rename to meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb index 64d829b..fda8e32 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb @@ -21,7 +21,7 @@ PACKAGES =+ "sxpm cxpm" FILES_cxpm = "${bindir}/cxpm" FILES_sxpm = "${bindir}/sxpm" -SRC_URI[md5sum] = "20f4627672edb2bd06a749f11aa97302" -SRC_URI[sha256sum] = "fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec" +SRC_URI[md5sum] = "6f0ecf8d103d528cfc803aa475137afa" +SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:21 +0000 Subject: [oe-commits] [openembedded-core] 11/24: ccache: upgrade 3.7.3 -> 3.7.7 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.AE4A623293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 17d2d1e78aad09d2add38ddb955a1a211ef301bd Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:25 2020 +0100 ccache: upgrade 3.7.3 -> 3.7.7 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/ccache/ccache_3.7.3.bb | 7 ------- meta/recipes-devtools/ccache/ccache_3.7.7.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/ccache/ccache_3.7.3.bb b/meta/recipes-devtools/ccache/ccache_3.7.3.bb deleted file mode 100644 index c6a682e..0000000 --- a/meta/recipes-devtools/ccache/ccache_3.7.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514" - -SRC_URI[md5sum] = "7be62ea6e190941a8c12a3d5394fd926" -SRC_URI[sha256sum] = "355955a61562c53c4ec4669e1c92708b0008f50d214b27f07a87cf4a1fa6b01e" diff --git a/meta/recipes-devtools/ccache/ccache_3.7.7.bb b/meta/recipes-devtools/ccache/ccache_3.7.7.bb new file mode 100644 index 0000000..3e7362b --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_3.7.7.bb @@ -0,0 +1,7 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a" + +SRC_URI[md5sum] = "500d7bd9ebc6ee3105d7fc332c1ef395" +SRC_URI[sha256sum] = "9b61f7fab2ec15305ee8382b03365503232dfb04b57414e7b0433768d530fa8a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:19 +0000 Subject: [oe-commits] [openembedded-core] 09/24: linux-firmware: upgrade to latest revision In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.957D823293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6f6ecc8c3e92d142bd5373b69efaaf90fa27862d Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:23 2020 +0100 linux-firmware: upgrade to latest revision License-Update: Copyright years, file lists Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../{linux-firmware_20190815.bb => linux-firmware_20200117.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb index d83000b..8111c41 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb @@ -66,7 +66,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=ab515ef6495ab5c5a3b08ab2db62df11 \ + file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \ file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ @@ -88,6 +88,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ + file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ @@ -98,6 +99,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ + file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ @@ -123,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ + file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -192,7 +194,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" +SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:22 +0000 Subject: [oe-commits] [openembedded-core] 12/24: piglit: upgrade to latest revision In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.B91E5232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85a703dbcd925b10cf1feaec9863c874c1f09572 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:26 2020 +0100 piglit: upgrade to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index f53098c..d0d8331 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "603cfb97542a411e8957a0d689d8b28cf8b9ef4d" +SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:23 +0000 Subject: [oe-commits] [openembedded-core] 13/24: kmscube: upgrade to latest revision In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.C6176232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9cbc6e49a56b2491df7f47f5ceda4a200bd4c6d4 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:27 2020 +0100 kmscube: upgrade to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 8272004..a1a295f 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "f632b23a528ed6b4e1fddd774db005c30ab65568" +SRCREV = "76bb57d539cb43d267e561024c34e031bf351e04" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" UPSTREAM_CHECK_COMMITS = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:25 +0000 Subject: [oe-commits] [openembedded-core] 15/24: python3-gitdb: upgrade 2.0.5 -> 2.0.6 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.E767923294C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 42705b1745f5b7251e32e30e6b989327b4cf1f68 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:29 2020 +0100 python3-gitdb: upgrade 2.0.5 -> 2.0.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-gitdb.inc | 4 ++-- .../python/{python3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python-gitdb.inc b/meta/recipes-devtools/python/python-gitdb.inc index 633752f..23ec298 100644 --- a/meta/recipes-devtools/python/python-gitdb.inc +++ b/meta/recipes-devtools/python/python-gitdb.inc @@ -8,8 +8,8 @@ inherit pypi PYPI_PACKAGE = "gitdb2" -SRC_URI[md5sum] = "94e59e5fb00960541f6e137b1456ab0a" -SRC_URI[sha256sum] = "83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2" +SRC_URI[md5sum] = "1a7ea3362e405f8a5634f7ee53636094" +SRC_URI[sha256sum] = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350" DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap" diff --git a/meta/recipes-devtools/python/python3-gitdb_2.0.5.bb b/meta/recipes-devtools/python/python3-gitdb_2.0.6.bb similarity index 97% rename from meta/recipes-devtools/python/python3-gitdb_2.0.5.bb rename to meta/recipes-devtools/python/python3-gitdb_2.0.6.bb index fe15832..2dcd9c8 100644 --- a/meta/recipes-devtools/python/python3-gitdb_2.0.5.bb +++ b/meta/recipes-devtools/python/python3-gitdb_2.0.6.bb @@ -1,2 +1,3 @@ inherit setuptools3 require python-gitdb.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:26 +0000 Subject: [oe-commits] [openembedded-core] 16/24: libedit: upgrade 20191025-3.1 -> 20191231-3.1 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.018AD23294E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 99de4b7fa49ab2487234f440f4172c71b301b7ad Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:30 2020 +0100 libedit: upgrade 20191025-3.1 -> 20191231-3.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libedit/{libedit_20191025-3.1.bb => libedit_20191231-3.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/libedit/libedit_20191025-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb similarity index 78% rename from meta/recipes-devtools/libedit/libedit_20191025-3.1.bb rename to meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index f810013..7116c9d 100644 --- a/meta/recipes-devtools/libedit/libedit_20191025-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -13,7 +13,7 @@ inherit autotools SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ file://stdc-predef.patch \ " -SRC_URI[md5sum] = "2d6568467080cfd75e715d045102b544" -SRC_URI[sha256sum] = "6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39" +SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" +SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:28 +0000 Subject: [oe-commits] [openembedded-core] 18/24: python3-git: upgrade 3.0.2 -> 3.0.5 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.206A423293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9aba70a41b69cf6f5f879e3b2d2318fbe884d5e7 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:32 2020 +0100 python3-git: upgrade 3.0.2 -> 3.0.5 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-git_3.0.2.bb => python3-git_3.0.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-git_3.0.2.bb b/meta/recipes-devtools/python/python3-git_3.0.5.bb similarity index 88% rename from meta/recipes-devtools/python/python3-git_3.0.2.bb rename to meta/recipes-devtools/python/python3-git_3.0.5.bb index 9dd753d..36313ef 100644 --- a/meta/recipes-devtools/python/python3-git_3.0.2.bb +++ b/meta/recipes-devtools/python/python3-git_3.0.5.bb @@ -12,8 +12,8 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[md5sum] = "ccec14a5c9f18702406122983d80032c" -SRC_URI[sha256sum] = "d2f4945f8260f6981d724f5957bc076398ada55cb5d25aaee10108bcdc894100" +SRC_URI[md5sum] = "7555ad89a22f663c25cced5f623bdef0" +SRC_URI[sha256sum] = "9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42" DEPENDS += " ${PYTHON_PN}-gitdb" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:29 +0000 Subject: [oe-commits] [openembedded-core] 19/24: gnu-config: upgrade to latest revision In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.2B63E232947@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit adb6061df0dcb7a2f260cf01b0e81f581e3f1e5a Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:33 2020 +0100 gnu-config: upgrade to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 1630c12..48b7e6d 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "b98424c249119b79d3f709e26eb86f2fd4d5e5f3" -PV = "20190501+git${SRCPV}" +SRCREV = "5256817ace8493502ec88501a19e4051c2e220b0" +PV = "20200117+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:24 +0000 Subject: [oe-commits] [openembedded-core] 14/24: ncurses: upgrade 6.1+20190803 -> 6.1+20191019 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001311.D8F0E23294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2a5024e28883fdf3b3e5c2f1a18e9015fa7466e8 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:28 2020 +0100 ncurses: upgrade 6.1+20190803 -> 6.1+20191019 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...rses-selective-backport-of-20191012-patch.patch | 169 --------------------- ...ses_6.1+20190803.bb => ncurses_6.1+20191019.bb} | 9 +- 2 files changed, 4 insertions(+), 174 deletions(-) diff --git a/meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch b/meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch deleted file mode 100644 index 7870c4b..0000000 --- a/meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 064b77f173337aa790f1cec0d741bfbc61a33d31 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Fri, 18 Oct 2019 09:57:43 -0400 -Subject: [PATCH] ncurses: selective backport of 20191012 patch - -Upstream-Status: Backport [https://salsa.debian.org/debian/ncurses/commit/243908b1e3d81] - -Contents of the upstream patch that are not applied to comp_hash.c, -parse_entry.c, or dump_entry.c have been omitted. - -CVE: CVE-2019-17594 -CVE: CVE-2019-17595 - -Signed-off-by: Trevor Gamblin - ---- - ncurses/tinfo/comp_hash.c | 14 ++++++++++---- - ncurses/tinfo/parse_entry.c | 32 ++++++++++++++++---------------- - progs/dump_entry.c | 7 ++++--- - 3 files changed, 30 insertions(+), 23 deletions(-) - -diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c -index 21f165ca..a62d38f9 100644 ---- a/ncurses/tinfo/comp_hash.c -+++ b/ncurses/tinfo/comp_hash.c -@@ -44,7 +44,7 @@ - #include - #include - --MODULE_ID("$Id: comp_hash.c,v 1.49 2019/03/10 00:06:48 tom Exp $") -+MODULE_ID("$Id: comp_hash.c,v 1.51 2019/10/12 16:32:13 tom Exp $") - - /* - * Finds the entry for the given string in the hash table if present. -@@ -63,7 +63,9 @@ _nc_find_entry(const char *string, - - hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - - real_table = _nc_get_table(termcap); - ptr = real_table + data->table_data[hashvalue]; -@@ -96,7 +98,9 @@ _nc_find_type_entry(const char *string, - const HashData *data = _nc_get_hash_info(termcap); - int hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - const struct name_table_entry *const table = _nc_get_table(termcap); - - ptr = table + data->table_data[hashvalue]; -@@ -124,7 +128,9 @@ _nc_find_user_entry(const char *string) - - hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - - real_table = _nc_get_userdefs_table(); - ptr = real_table + data->table_data[hashvalue]; -diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c -index f8cca8b5..064376c5 100644 ---- a/ncurses/tinfo/parse_entry.c -+++ b/ncurses/tinfo/parse_entry.c -@@ -47,7 +47,7 @@ - #include - #include - --MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $") -+MODULE_ID("$Id: parse_entry.c,v 1.98 2019/10/12 00:50:31 tom Exp $") - - #ifdef LINT - static short const parametrized[] = -@@ -654,12 +654,12 @@ _nc_capcmp(const char *s, const char *t) - } - - static void --append_acs0(string_desc * dst, int code, int src) -+append_acs0(string_desc * dst, int code, char *src, size_t off) - { -- if (src != 0) { -+ if (src != 0 && off < strlen(src)) { - char temp[3]; - temp[0] = (char) code; -- temp[1] = (char) src; -+ temp[1] = src[off]; - temp[2] = 0; - _nc_safe_strcat(dst, temp); - } -@@ -669,7 +669,7 @@ static void - append_acs(string_desc * dst, int code, char *src) - { - if (VALID_STRING(src) && strlen(src) == 1) { -- append_acs0(dst, code, *src); -+ append_acs0(dst, code, src, 0); - } - } - -@@ -1038,17 +1038,17 @@ postprocess_terminfo(TERMTYPE2 *tp) - _nc_str_init(&result, buf2, sizeof(buf2)); - _nc_safe_strcat(&result, acs_chars); - -- append_acs0(&result, 'l', box_chars_1[0]); /* ACS_ULCORNER */ -- append_acs0(&result, 'q', box_chars_1[1]); /* ACS_HLINE */ -- append_acs0(&result, 'k', box_chars_1[2]); /* ACS_URCORNER */ -- append_acs0(&result, 'x', box_chars_1[3]); /* ACS_VLINE */ -- append_acs0(&result, 'j', box_chars_1[4]); /* ACS_LRCORNER */ -- append_acs0(&result, 'm', box_chars_1[5]); /* ACS_LLCORNER */ -- append_acs0(&result, 'w', box_chars_1[6]); /* ACS_TTEE */ -- append_acs0(&result, 'u', box_chars_1[7]); /* ACS_RTEE */ -- append_acs0(&result, 'v', box_chars_1[8]); /* ACS_BTEE */ -- append_acs0(&result, 't', box_chars_1[9]); /* ACS_LTEE */ -- append_acs0(&result, 'n', box_chars_1[10]); /* ACS_PLUS */ -+ append_acs0(&result, 'l', box_chars_1, 0); /* ACS_ULCORNER */ -+ append_acs0(&result, 'q', box_chars_1, 1); /* ACS_HLINE */ -+ append_acs0(&result, 'k', box_chars_1, 2); /* ACS_URCORNER */ -+ append_acs0(&result, 'x', box_chars_1, 3); /* ACS_VLINE */ -+ append_acs0(&result, 'j', box_chars_1, 4); /* ACS_LRCORNER */ -+ append_acs0(&result, 'm', box_chars_1, 5); /* ACS_LLCORNER */ -+ append_acs0(&result, 'w', box_chars_1, 6); /* ACS_TTEE */ -+ append_acs0(&result, 'u', box_chars_1, 7); /* ACS_RTEE */ -+ append_acs0(&result, 'v', box_chars_1, 8); /* ACS_BTEE */ -+ append_acs0(&result, 't', box_chars_1, 9); /* ACS_LTEE */ -+ append_acs0(&result, 'n', box_chars_1, 10); /* ACS_PLUS */ - - if (buf2[0]) { - acs_chars = _nc_save_str(buf2); -diff --git a/progs/dump_entry.c b/progs/dump_entry.c -index d0e420ec..8a47084a 100644 ---- a/progs/dump_entry.c -+++ b/progs/dump_entry.c -@@ -39,7 +39,7 @@ - #include "termsort.c" /* this C file is generated */ - #include /* so is this */ - --MODULE_ID("$Id: dump_entry.c,v 1.173 2019/05/11 21:02:24 tom Exp $") -+MODULE_ID("$Id: dump_entry.c,v 1.175 2019/10/12 15:59:07 tom Exp $") - - #define DISCARD(string) string = ABSENT_STRING - #define PRINTF (void) printf -@@ -1136,7 +1136,8 @@ fmt_entry(TERMTYPE2 *tterm, - *d++ = '\\'; - *d = ':'; - } else if (*d == '\\') { -- *++d = *s++; -+ if ((*++d = *s++) == '\0') -+ break; - } - d++; - *d = '\0'; -@@ -1396,7 +1397,7 @@ one_one_mapping(const char *mapping) - - if (VALID_STRING(mapping)) { - int n = 0; -- while (mapping[n] != '\0') { -+ while (mapping[n] != '\0' && mapping[n + 1] != '\0') { - if (isLine(mapping[n]) && - mapping[n] != mapping[n + 1]) { - result = FALSE; --- -2.17.1 - diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb similarity index 55% rename from meta/recipes-core/ncurses/ncurses_6.1+20190803.bb rename to meta/recipes-core/ncurses/ncurses_6.1+20191019.bb index e638a37..ee7d4be 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb @@ -1,12 +1,11 @@ require ncurses.inc SRC_URI += "file://0001-tic-hang.patch \ - file://0002-configure-reproducible.patch \ - file://config.cache \ - file://0001-ncurses-selective-backport-of-20191012-patch.patch \ -" + file://0002-configure-reproducible.patch \ + file://config.cache \ + " # commit id corresponds to the revision in package version -SRCREV = "3c9b2677c96c645496997321bf2fe465a5e7e21f" +SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:27 +0000 Subject: [oe-commits] [openembedded-core] 17/24: python3-setuptools: upgrade 42.0.2 -> 45.0.0 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.1238D232946@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5bfa79569720b67f63b3ac34be3698759e59ed64 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:31 2020 +0100 python3-setuptools: upgrade 42.0.2 -> 45.0.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++--- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../{python3-setuptools_42.0.2.bb => python3-setuptools_45.0.0.bb} | 0 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 169d1b1..b1a6813 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 5bba4f57f048016aa92ce5909e9e372db619554e Mon Sep 17 00:00:00 2001 +From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 05508ce..945e118 100755 +index 09066f8..d3039a5 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -640,6 +640,11 @@ class easy_install(Command): +@@ -649,6 +649,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) def easy_install(self, spec, deps=False): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index d8bce71..c697937 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "5ac69b66a6f7d4785517017f37df28e9" -SRC_URI[sha256sum] = "c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940" +SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" +SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_42.0.2.bb b/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_42.0.2.bb rename to meta/recipes-devtools/python/python3-setuptools_45.0.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:31 +0000 Subject: [oe-commits] [openembedded-core] 21/24: python3-six: upgrade 1.13.0 -> 1.14.0 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.4546D23293B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3bd43daf1fff89f52100a3a71d424e7435a81442 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:35 2020 +0100 python3-six: upgrade 1.13.0 -> 1.14.0 License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-six.inc | 6 +++--- .../python/{python3-six_1.13.0.bb => python3-six_1.14.0.bb} | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index c386090..bbbddbe 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -2,10 +2,10 @@ SUMMARY = "Python 2 and 3 compatibility library" HOMEPAGE = "https://pypi.python.org/pypi/six/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f82eb3a1a7fade60bda5980935084b62" +LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" -SRC_URI[md5sum] = "e92c23c882c7d5564ce5773fe31b2771" -SRC_URI[sha256sum] = "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66" +SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" +SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" inherit pypi diff --git a/meta/recipes-devtools/python/python3-six_1.13.0.bb b/meta/recipes-devtools/python/python3-six_1.14.0.bb similarity index 97% rename from meta/recipes-devtools/python/python3-six_1.13.0.bb rename to meta/recipes-devtools/python/python3-six_1.14.0.bb index 8795313..99e6629 100644 --- a/meta/recipes-devtools/python/python3-six_1.13.0.bb +++ b/meta/recipes-devtools/python/python3-six_1.14.0.bb @@ -1,2 +1,3 @@ inherit setuptools3 require python-six.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:30 +0000 Subject: [oe-commits] [openembedded-core] 20/24: libarchive: upgrade 3.4.0 -> 3.4.1 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.36FC723293C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eb75a3aea1d7bd7363fe9058f669bd90d65782fb Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:34 2020 +0100 libarchive: upgrade 3.4.0 -> 3.4.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libarchive/libarchive/CVE-2019-19221.patch | 101 --------------------- .../{libarchive_3.4.0.bb => libarchive_3.4.1.bb} | 8 +- 2 files changed, 3 insertions(+), 106 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch deleted file mode 100644 index b57e878..0000000 --- a/meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 22b1db9d46654afc6f0c28f90af8cdc84a199f41 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Thu, 21 Nov 2019 03:08:40 +0100 -Subject: [PATCH] Bugfix and optimize archive_wstring_append_from_mbs() - -The cal to mbrtowc() or mbtowc() should read up to mbs_length -bytes and not wcs_length. This avoids out-of-bounds reads. - -mbrtowc() and mbtowc() return (size_t)-1 wit errno EILSEQ when -they encounter an invalid multibyte character and (size_t)-2 when -they they encounter an incomplete multibyte character. As we return -failure and all our callers error out it makes no sense to continue -parsing mbs. - -As we allocate `len` wchars at the beginning and each wchar has -at least one byte, there will never be need to grow the buffer, -so the code can be left out. On the other hand, we are always -allocatng more memory than we need. - -As long as wcs_length == mbs_length == len we can omit wcs_length. -We keep the old code commented if we decide to save memory and -use autoexpanding wcs_length in the future. - -Fixes #1276 - -Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/22b1db9d46654afc6f0c28f90af8cdc84a199f41] -CVE: CVE-2019-19221 -Signed-off-by: Anuj Mittal ---- - libarchive/archive_string.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c -index 979a418b6..bd39c96f1 100644 ---- a/libarchive/archive_string.c -+++ b/libarchive/archive_string.c -@@ -591,7 +591,7 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * No single byte will be more than one wide character, - * so this length estimate will always be big enough. - */ -- size_t wcs_length = len; -+ // size_t wcs_length = len; - size_t mbs_length = len; - const char *mbs = p; - wchar_t *wcs; -@@ -600,7 +600,11 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - - memset(&shift_state, 0, sizeof(shift_state)); - #endif -- if (NULL == archive_wstring_ensure(dest, dest->length + wcs_length + 1)) -+ /* -+ * As we decided to have wcs_length == mbs_length == len -+ * we can use len here instead of wcs_length -+ */ -+ if (NULL == archive_wstring_ensure(dest, dest->length + len + 1)) - return (-1); - wcs = dest->s + dest->length; - /* -@@ -609,6 +613,12 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * multi bytes. - */ - while (*mbs && mbs_length > 0) { -+ /* -+ * The buffer we allocated is always big enough. -+ * Keep this code path in a comment if we decide to choose -+ * smaller wcs_length in the future -+ */ -+/* - if (wcs_length == 0) { - dest->length = wcs - dest->s; - dest->s[dest->length] = L'\0'; -@@ -618,24 +628,20 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - return (-1); - wcs = dest->s + dest->length; - } -+*/ - #if HAVE_MBRTOWC -- r = mbrtowc(wcs, mbs, wcs_length, &shift_state); -+ r = mbrtowc(wcs, mbs, mbs_length, &shift_state); - #else -- r = mbtowc(wcs, mbs, wcs_length); -+ r = mbtowc(wcs, mbs, mbs_length); - #endif - if (r == (size_t)-1 || r == (size_t)-2) { - ret_val = -1; -- if (errno == EILSEQ) { -- ++mbs; -- --mbs_length; -- continue; -- } else -- break; -+ break; - } - if (r == 0 || r > mbs_length) - break; - wcs++; -- wcs_length--; -+ // wcs_length--; - mbs += r; - mbs_length -= r; - } diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.0.bb b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb similarity index 91% rename from meta/recipes-extended/libarchive/libarchive_3.4.0.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.1.bb index 755a9c7..2d33dd8 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.0.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb @@ -31,12 +31,10 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," EXTRA_OECONF += "--enable-largefile" -SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ - file://CVE-2019-19221.patch \ -" +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "6046396255bd7cf6d0f6603a9bda39ac" -SRC_URI[sha256sum] = "8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e" +SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" +SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" inherit autotools update-alternatives pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:32 +0000 Subject: [oe-commits] [openembedded-core] 22/24: xserver-xorg: upgrade 1.20.6 -> 1.20.7 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.53E70232944@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 059a2c20276794923cae97931a35e0fc4b380809 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:36 2020 +0100 xserver-xorg: upgrade 1.20.6 -> 1.20.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb similarity index 88% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb index a1cd490..2bd10ad 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb @@ -5,8 +5,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-test-xtest-Initialize-array-with-braces.patch \ file://sdksyms-no-build-path.patch \ " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:33 +0000 Subject: [oe-commits] [openembedded-core] 23/24: sed: upgrade 4.7 -> 4.8 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.5FF81232945@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2169bc4fc6637813d61c4aa2c2be796510c2b9bb Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:37 2020 +0100 sed: upgrade 4.7 -> 4.8 License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sed/sed_4.7.bb b/meta/recipes-extended/sed/sed_4.8.bb similarity index 91% rename from meta/recipes-extended/sed/sed_4.7.bb rename to meta/recipes-extended/sed/sed_4.8.bb index a285941..39e3a61 100644 --- a/meta/recipes-extended/sed/sed_4.7.bb +++ b/meta/recipes-extended/sed/sed_4.8.bb @@ -2,15 +2,16 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://sed/sed.h;beginline=1;endline=15;md5=e869c874e5472ba89f63f381b0e93475" + file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ + " SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[md5sum] = "777ddfd9d71dd06711fe91f0925e1573" -SRC_URI[sha256sum] = "2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" +SRC_URI[md5sum] = "6d906edfdb3202304059233f51f9a71d" +SRC_URI[sha256sum] = "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" inherit autotools texinfo update-alternatives gettext ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 00:13:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 00:13:34 +0000 Subject: [oe-commits] [openembedded-core] 24/24: libpcre2: upgrade 10.33 -> 10.34 In-Reply-To: <158068879053.19514.3781903308780973632@git.openembedded.org> References: <158068879053.19514.3781903308780973632@git.openembedded.org> Message-ID: <20200203001312.6CBE123293A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d662f563317e156cabda1419bb4f70b0d896d4eb Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:38 2020 +0100 libpcre2: upgrade 10.33 -> 10.34 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre2_10.33.bb b/meta/recipes-support/libpcre/libpcre2_10.34.bb similarity index 93% rename from meta/recipes-support/libpcre/libpcre2_10.33.bb rename to meta/recipes-support/libpcre/libpcre2_10.34.bb index 87da313..fa8655e 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.33.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.34.bb @@ -14,8 +14,8 @@ SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "80b355f2dce909a2e2424f5c79eddb44" -SRC_URI[sha256sum] = "35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa" +SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366" +SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca" CVE_PRODUCT = "pcre2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 06:01:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 06:01:53 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: sdbus-c++: upgrade 0.7.6 -> 0.8.1 Message-ID: <158070971312.8730.16879490419311094665@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new bb253b2 sdbus-c++: upgrade 0.7.6 -> 0.8.1 bb253b2 is described below commit bb253b28c7f90bb9b7542955ae6002955e2195dc Author: sangelovic AuthorDate: Sun Feb 2 22:48:01 2020 +0100 sdbus-c++: upgrade 0.7.6 -> 0.8.1 See full changelog at https://github.com/Kistler-Group/sdbus-cpp/blob/v0.8.1/ChangeLog Signed-off-by: Stanislav Angelovic Signed-off-by: Khem Raj --- .../sdbus-c++/{sdbus-c++-0.7.6 => sdbus-c++-0.8.1}/run-ptest | 0 ...{sdbus-c++-tools-native_0.7.6.bb => sdbus-c++-tools-native_0.8.1.bb} | 2 +- .../recipes-core/sdbus-c++/{sdbus-c++_0.7.6.bb => sdbus-c++_0.8.1.bb} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.7.6/run-ptest b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest similarity index 100% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.7.6/run-ptest rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.8.1.bb similarity index 87% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.8.1.bb index 6492c23..e18b990 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.7.6.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.8.1.bb @@ -8,7 +8,7 @@ inherit cmake native DEPENDS += "expat" -SRCREV = "5121d46eed42231285c18d317a9f48e0b2849d5e" +SRCREV = "3a4f343fb924650e7639660efa5f143961162044" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb similarity index 95% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb index 57774cb..c4d63fd 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.7.6.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb @@ -16,7 +16,7 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B DEPENDS += "expat" -SRCREV = "5121d46eed42231285c18d317a9f48e0b2849d5e" +SRCREV = "3a4f343fb924650e7639660efa5f143961162044" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" SRC_URI += "file://run-ptest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 06:16:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 06:16:32 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (bb253b2 -> 3eaed6f) Message-ID: <158071059240.16610.6214751734227305543@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from bb253b2 sdbus-c++: upgrade 0.7.6 -> 0.8.1 new 59e3d74 recipes: Inherit perlnative for pod2man new 3eaed6f recipes: Inherit perlnative for pod2man The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb | 2 ++ meta-networking/recipes-support/netcf/netcf_0.2.8.bb | 2 +- meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb | 2 +- meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb | 2 +- meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb | 2 +- meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 06:16:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 06:16:34 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: recipes: Inherit perlnative for pod2man In-Reply-To: <158071059240.16610.6214751734227305543@git.openembedded.org> References: <158071059240.16610.6214751734227305543@git.openembedded.org> Message-ID: <20200203061632.9FEE723294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3eaed6f989f110ef7174dab881f9575ea680cc26 Author: Khem Raj AuthorDate: Sun Feb 2 22:15:12 2020 -0800 recipes: Inherit perlnative for pod2man replace host version of pod2man perl-native provides, helps in improving reproducability Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb | 2 ++ meta-networking/recipes-support/netcf/netcf_0.2.8.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb index 3221581..53a79af 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb @@ -9,6 +9,8 @@ SECTION = "net" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +inherit perlnative + SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ file://options.pptp \ " diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index c57e7d4..a180571 100644 --- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -20,7 +20,7 @@ do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot" S = "${WORKDIR}/git" -inherit gettext autotools pkgconfig systemd +inherit gettext autotools perlnative pkgconfig systemd EXTRA_OECONF_append_class-target = " --with-driver=redhat" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 06:16:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 06:16:33 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: recipes: Inherit perlnative for pod2man In-Reply-To: <158071059240.16610.6214751734227305543@git.openembedded.org> References: <158071059240.16610.6214751734227305543@git.openembedded.org> Message-ID: <20200203061632.93BAC23294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 59e3d748106cf91d23549fec9f7dcfbcd10e9e11 Author: Khem Raj AuthorDate: Sun Feb 2 22:13:18 2020 -0800 recipes: Inherit perlnative for pod2man replace host version of pod2man perl-native provides, helps in improving reproducability Signed-off-by: Khem Raj --- meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb | 2 +- meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb | 2 +- meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb | 2 +- meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index 41b4d0d..7871801 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -27,7 +27,7 @@ RDEPENDS_${PN} += "openssh-misc" # S = "${WORKDIR}/pam_ssh_agent_auth-${PV}" -inherit autotools-brokensep +inherit autotools-brokensep perlnative # Avoid autoreconf. Override the --libexec oe_runconf specifies so that # the module is put with the other pam modules. Because it cannot, in general, diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb index 24df750..38ce4f5 100644 --- a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb +++ b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig update-rc.d systemd +inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = ",,systemd" diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb index aeae071..259c640 100644 --- a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxtst" PR = "r1" -inherit features_check pkgconfig +inherit features_check pkgconfig perlnative # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb index fb8c4a2..91d77ac 100644 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb @@ -17,7 +17,7 @@ SRC_URI = "\ SRC_URI[md5sum] = "9d36882998449daceec267c68a21ff0d" SRC_URI[sha256sum] = "3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9" -inherit autotools systemd pkgconfig +inherit autotools systemd pkgconfig perlnative EXTRA_OECONF = " \ --disable-libusb \ diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index aefe362..efe95b1 100644 --- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -29,7 +29,7 @@ SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ S = "${WORKDIR}/git" -inherit autotools +inherit autotools perlnative # Fix rsnapshot.conf.default: # don't inject the host path into target configs. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 09:22:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 09:22:44 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d662f56 -> a41d77c) Message-ID: <158072176492.24076.16303646260112137903@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard d662f56 libpcre2: upgrade 10.33 -> 10.34 discard 2169bc4 sed: upgrade 4.7 -> 4.8 discard 059a2c2 xserver-xorg: upgrade 1.20.6 -> 1.20.7 new 201ad23 sed: upgrade 4.7 -> 4.8 new a41d77c libpcre2: upgrade 10.33 -> 10.34 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d662f56) \ N -- N -- N refs/heads/master-next (a41d77c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../xorg-xserver/{xserver-xorg_1.20.7.bb => xserver-xorg_1.20.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.7.bb => xserver-xorg_1.20.6.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 09:22:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 09:22:45 +0000 Subject: [oe-commits] [openembedded-core] 01/02: sed: upgrade 4.7 -> 4.8 In-Reply-To: <158072176492.24076.16303646260112137903@git.openembedded.org> References: <158072176492.24076.16303646260112137903@git.openembedded.org> Message-ID: <20200203092245.48DC323294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 201ad23c92c0246f570654ea1c1fe9abf952c377 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:37 2020 +0100 sed: upgrade 4.7 -> 4.8 License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sed/sed_4.7.bb b/meta/recipes-extended/sed/sed_4.8.bb similarity index 91% rename from meta/recipes-extended/sed/sed_4.7.bb rename to meta/recipes-extended/sed/sed_4.8.bb index a285941..39e3a61 100644 --- a/meta/recipes-extended/sed/sed_4.7.bb +++ b/meta/recipes-extended/sed/sed_4.8.bb @@ -2,15 +2,16 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://sed/sed.h;beginline=1;endline=15;md5=e869c874e5472ba89f63f381b0e93475" + file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ + " SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[md5sum] = "777ddfd9d71dd06711fe91f0925e1573" -SRC_URI[sha256sum] = "2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" +SRC_URI[md5sum] = "6d906edfdb3202304059233f51f9a71d" +SRC_URI[sha256sum] = "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" inherit autotools texinfo update-alternatives gettext ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 09:22:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 09:22:46 +0000 Subject: [oe-commits] [openembedded-core] 02/02: libpcre2: upgrade 10.33 -> 10.34 In-Reply-To: <158072176492.24076.16303646260112137903@git.openembedded.org> References: <158072176492.24076.16303646260112137903@git.openembedded.org> Message-ID: <20200203092245.5818D23294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a41d77c5e535d668d822112e27277a5f103b44a8 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:38 2020 +0100 libpcre2: upgrade 10.33 -> 10.34 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre2_10.33.bb b/meta/recipes-support/libpcre/libpcre2_10.34.bb similarity index 93% rename from meta/recipes-support/libpcre/libpcre2_10.33.bb rename to meta/recipes-support/libpcre/libpcre2_10.34.bb index 87da313..fa8655e 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.33.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.34.bb @@ -14,8 +14,8 @@ SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "80b355f2dce909a2e2424f5c79eddb44" -SRC_URI[sha256sum] = "35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa" +SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366" +SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca" CVE_PRODUCT = "pcre2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:03 +0000 Subject: [oe-commits] [openembedded-core] 01/22: findutils: drop upstream-version-is-even In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.0523123294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3b41a5518b5f51816171daf716fedfe16854b191 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:16 2020 +0100 findutils: drop upstream-version-is-even Upstream seems to have dropped the odd-even policy Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/findutils/findutils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index a0e1f89..9aa7239 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -8,7 +8,7 @@ SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" -inherit autotools gettext texinfo update-alternatives upstream-version-is-even +inherit autotools gettext texinfo update-alternatives ALTERNATIVE_${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:04 +0000 Subject: [oe-commits] [openembedded-core] 02/22: libva-utils: fix upstream version check In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.0F72F23294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3a881caedd862b6ac0bc4d86bcfb241769dd4956 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:17 2020 +0100 libva-utils: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/libva/libva-utils_2.6.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/libva/libva-utils_2.6.0.bb b/meta/recipes-graphics/libva/libva-utils_2.6.0.bb index 0037fdf..03b3802 100644 --- a/meta/recipes-graphics/libva/libva-utils_2.6.0.bb +++ b/meta/recipes-graphics/libva/libva-utils_2.6.0.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.6-branch" SRCREV = "8ea1eba433dcbceb0e5dcb54b8e3f984987f7a17" S = "${WORKDIR}/git" -UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" DEPENDS = "libva" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:05 +0000 Subject: [oe-commits] [openembedded-core] 03/22: speexdsp: fix upstream version check In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.1A2EB23294C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f6b84c1018bf0e0d788e48277b301432099d638d Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:18 2020 +0100 speexdsp: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-multimedia/speex/speexdsp_1.2.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb b/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb index 2f934eb..6369646 100644 --- a/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb +++ b/meta/recipes-multimedia/speex/speexdsp_1.2.0.bb @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8" SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz" +UPSTREAM_CHECK_REGEX = "speexdsp-(?P\d+(\.\d+)+)\.tar" + SRC_URI[md5sum] = "b722df341576dc185d897131321008fc" SRC_URI[sha256sum] = "682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:02 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (1be199f -> a18d8be) Message-ID: <158073504253.10152.14419527851701589388@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 1be199f kernel-devsrc: update to v5.4+ new 3b41a55 findutils: drop upstream-version-is-even new 3a881ca libva-utils: fix upstream version check new f6b84c1 speexdsp: fix upstream version check new fe38a5d shared-mime-info: fix (sort of) upstream version check new b784115 bison: upgrade 3.4.2 -> 3.5 new 4c6b294 puzzles: upgrade to latest revision new 37b11d0 socat: upgrade 1.7.3.3 -> 1.7.3.4 new 573267b linux-firmware: upgrade to latest revision new aea7f19 libxpm: upgrade 3.5.12 -> 3.5.13 new 4e852a1 ccache: upgrade 3.7.3 -> 3.7.7 new 02df1c2 piglit: upgrade to latest revision new 17eee40 kmscube: upgrade to latest revision new 325fe5f ncurses: upgrade 6.1+20190803 -> 6.1+20191019 new cb2bebf python3-gitdb: upgrade 2.0.5 -> 2.0.6 new 97045a0 libedit: upgrade 20191025-3.1 -> 20191231-3.1 new ed1d8e2 python3-setuptools: upgrade 42.0.2 -> 45.0.0 new d19ba66 python3-git: upgrade 3.0.2 -> 3.0.5 new de31c1e gnu-config: upgrade to latest revision new 8b58523 libarchive: upgrade 3.4.0 -> 3.4.1 new d524945 python3-six: upgrade 1.13.0 -> 1.14.0 new 9dc9107 sed: upgrade 4.7 -> 4.8 new a18d8be libpcre2: upgrade 10.33 -> 10.34 The 22 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} | 4 +- ...rses-selective-backport-of-20191012-patch.patch | 169 --------------------- ...ses_6.1+20190803.bb => ncurses_6.1+20191019.bb} | 9 +- .../bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 +- meta/recipes-devtools/ccache/ccache_3.7.3.bb | 7 - meta/recipes-devtools/ccache/ccache_3.7.7.bb | 7 + meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 +- ...dit_20191025-3.1.bb => libedit_20191231-3.1.bb} | 4 +- ...ionally-do-not-fetch-code-by-easy_install.patch | 6 +- meta/recipes-devtools/python/python-gitdb.inc | 4 +- meta/recipes-devtools/python/python-setuptools.inc | 4 +- meta/recipes-devtools/python/python-six.inc | 6 +- .../{python3-git_3.0.2.bb => python3-git_3.0.5.bb} | 4 +- ...thon3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} | 1 + ...ools_42.0.2.bb => python3-setuptools_45.0.0.bb} | 0 ...python3-six_1.13.0.bb => python3-six_1.14.0.bb} | 1 + meta/recipes-extended/findutils/findutils.inc | 2 +- .../libarchive/libarchive/CVE-2019-19221.patch | 101 ------------ .../{libarchive_3.4.0.bb => libarchive_3.4.1.bb} | 8 +- .../sed/{sed_4.7.bb => sed_4.8.bb} | 7 +- meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +- meta/recipes-graphics/libva/libva-utils_2.6.0.bb | 2 +- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- .../{libxpm_3.5.12.bb => libxpm_3.5.13.bb} | 4 +- ...ware_20190815.bb => linux-firmware_20200117.bb} | 8 +- meta/recipes-multimedia/speex/speexdsp_1.2.0.bb | 2 + meta/recipes-sato/puzzles/puzzles_git.bb | 4 +- .../{libpcre2_10.33.bb => libpcre2_10.34.bb} | 4 +- .../shared-mime-info/shared-mime-info_git.bb | 3 + 29 files changed, 60 insertions(+), 323 deletions(-) rename meta/recipes-connectivity/socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} (92%) delete mode 100644 meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch rename meta/recipes-core/ncurses/{ncurses_6.1+20190803.bb => ncurses_6.1+20191019.bb} (55%) rename meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} (90%) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.7.3.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.7.7.bb rename meta/recipes-devtools/libedit/{libedit_20191025-3.1.bb => libedit_20191231-3.1.bb} (78%) rename meta/recipes-devtools/python/{python3-git_3.0.2.bb => python3-git_3.0.5.bb} (88%) rename meta/recipes-devtools/python/{python3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} (97%) rename meta/recipes-devtools/python/{python3-setuptools_42.0.2.bb => python3-setuptools_45.0.0.bb} (100%) rename meta/recipes-devtools/python/{python3-six_1.13.0.bb => python3-six_1.14.0.bb} (97%) delete mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch rename meta/recipes-extended/libarchive/{libarchive_3.4.0.bb => libarchive_3.4.1.bb} (91%) rename meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} (91%) rename meta/recipes-graphics/xorg-lib/{libxpm_3.5.12.bb => libxpm_3.5.13.bb} (81%) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190815.bb => linux-firmware_20200117.bb} (99%) rename meta/recipes-support/libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:06 +0000 Subject: [oe-commits] [openembedded-core] 04/22: shared-mime-info: fix (sort of) upstream version check In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.23E1423294E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fe38a5df23a341ecc18f81b96a9b7628dc4b5a61 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:19 2020 +0100 shared-mime-info: fix (sort of) upstream version check Upstream is using - to separate version components which version checker at the moment can't deal with (i.e 1-15-1 when 1.15.1 is meant). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb index f0d5bc6..7a060b0 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -12,6 +12,9 @@ SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" PV = "1.15" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "Release-(?P(\d+(\-\d+)+))" +UPSTREAM_VERSION_UNKNOWN = "1" + inherit autotools pkgconfig gettext python3native mime EXTRA_OECONF = "--disable-update-mimedb" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:07 +0000 Subject: [oe-commits] [openembedded-core] 05/22: bison: upgrade 3.4.2 -> 3.5 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.31C8023294F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b7841157d9bfda027031ff13e39e2407cf41aeb7 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:20 2020 +0100 bison: upgrade 3.4.2 -> 3.5 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.4.2.bb b/meta/recipes-devtools/bison/bison_3.5.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.4.2.bb rename to meta/recipes-devtools/bison/bison_3.5.bb index 46f0f90..3d8f657 100644 --- a/meta/recipes-devtools/bison/bison_3.4.2.bb +++ b/meta/recipes-devtools/bison/bison_3.5.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "d1ceb9dfde2d03b24a4c1137f7f1b572" -SRC_URI[sha256sum] = "27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0" +SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" +SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:08 +0000 Subject: [oe-commits] [openembedded-core] 06/22: puzzles: upgrade to latest revision In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.3D637232950@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4c6b294b72d74c10b22407d82dee28d553345ec3 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:21 2020 +0100 puzzles: upgrade to latest revision License-Update: list of contributors updated. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/puzzles/puzzles_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 57f2af4..41b78d6 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b" +LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" DEPENDS = "libxt" @@ -17,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "1c0c49dd5cd8df6ae87f7be5371be84589fa2662" +SRCREV = "79a5378b5adc46ee33ba34d55738f916fb8adfc9" PE = "2" PV = "0.0+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:09 +0000 Subject: [oe-commits] [openembedded-core] 07/22: socat: upgrade 1.7.3.3 -> 1.7.3.4 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.46C4B232951@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 37b11d03bec508fa7428b6b0ed3a5f4ca2b7e65e Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:22 2020 +0100 socat: upgrade 1.7.3.3 -> 1.7.3.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../recipes-connectivity/socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb b/meta/recipes-connectivity/socat/socat_1.7.3.4.bb similarity index 92% rename from meta/recipes-connectivity/socat/socat_1.7.3.3.bb rename to meta/recipes-connectivity/socat/socat_1.7.3.4.bb index ee01578..9b0d407 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.4.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f" -SRC_URI[sha256sum] = "0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a" +SRC_URI[md5sum] = "3cca4f8cd9d2d1caabd9cc099451bac9" +SRC_URI[sha256sum] = "972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:11 +0000 Subject: [oe-commits] [openembedded-core] 09/22: libxpm: upgrade 3.5.12 -> 3.5.13 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.5B731232956@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit aea7f19f7156f21b4e429691b244b4e3b38584a0 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:24 2020 +0100 libxpm: upgrade 3.5.12 -> 3.5.13 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/{libxpm_3.5.12.bb => libxpm_3.5.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb similarity index 81% rename from meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb rename to meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb index 64d829b..fda8e32 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb @@ -21,7 +21,7 @@ PACKAGES =+ "sxpm cxpm" FILES_cxpm = "${bindir}/cxpm" FILES_sxpm = "${bindir}/sxpm" -SRC_URI[md5sum] = "20f4627672edb2bd06a749f11aa97302" -SRC_URI[sha256sum] = "fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec" +SRC_URI[md5sum] = "6f0ecf8d103d528cfc803aa475137afa" +SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:13 +0000 Subject: [oe-commits] [openembedded-core] 11/22: piglit: upgrade to latest revision In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.6F562232959@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 02df1c2555a83ff84846043c0068d17a7e0ecfe2 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:26 2020 +0100 piglit: upgrade to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index f53098c..d0d8331 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "603cfb97542a411e8957a0d689d8b28cf8b9ef4d" +SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:14 +0000 Subject: [oe-commits] [openembedded-core] 12/22: kmscube: upgrade to latest revision In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.78BD623295A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 17eee4095da69a4d19e28031fd4f67ba67c54cbd Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:27 2020 +0100 kmscube: upgrade to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 8272004..a1a295f 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "f632b23a528ed6b4e1fddd774db005c30ab65568" +SRCREV = "76bb57d539cb43d267e561024c34e031bf351e04" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" UPSTREAM_CHECK_COMMITS = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:12 +0000 Subject: [oe-commits] [openembedded-core] 10/22: ccache: upgrade 3.7.3 -> 3.7.7 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.656A8232957@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4e852a12a4df4ced83cc0f5f61bc9f16845dc8a5 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:25 2020 +0100 ccache: upgrade 3.7.3 -> 3.7.7 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/ccache/ccache_3.7.3.bb | 7 ------- meta/recipes-devtools/ccache/ccache_3.7.7.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/ccache/ccache_3.7.3.bb b/meta/recipes-devtools/ccache/ccache_3.7.3.bb deleted file mode 100644 index c6a682e..0000000 --- a/meta/recipes-devtools/ccache/ccache_3.7.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514" - -SRC_URI[md5sum] = "7be62ea6e190941a8c12a3d5394fd926" -SRC_URI[sha256sum] = "355955a61562c53c4ec4669e1c92708b0008f50d214b27f07a87cf4a1fa6b01e" diff --git a/meta/recipes-devtools/ccache/ccache_3.7.7.bb b/meta/recipes-devtools/ccache/ccache_3.7.7.bb new file mode 100644 index 0000000..3e7362b --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_3.7.7.bb @@ -0,0 +1,7 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a" + +SRC_URI[md5sum] = "500d7bd9ebc6ee3105d7fc332c1ef395" +SRC_URI[sha256sum] = "9b61f7fab2ec15305ee8382b03365503232dfb04b57414e7b0433768d530fa8a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:10 +0000 Subject: [oe-commits] [openembedded-core] 08/22: linux-firmware: upgrade to latest revision In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.525C3232952@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 573267be678e058bec775ba0c3f1b06f613927a6 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:23 2020 +0100 linux-firmware: upgrade to latest revision License-Update: Copyright years, file lists Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../{linux-firmware_20190815.bb => linux-firmware_20200117.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb index d83000b..8111c41 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb @@ -66,7 +66,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=ab515ef6495ab5c5a3b08ab2db62df11 \ + file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \ file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ @@ -88,6 +88,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ + file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ @@ -98,6 +99,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ + file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ @@ -123,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ + file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -192,7 +194,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" +SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:16 +0000 Subject: [oe-commits] [openembedded-core] 14/22: python3-gitdb: upgrade 2.0.5 -> 2.0.6 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.9110023294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cb2bebfd07f04f1049a5507af7656a92481439c3 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:29 2020 +0100 python3-gitdb: upgrade 2.0.5 -> 2.0.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-gitdb.inc | 4 ++-- .../python/{python3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python-gitdb.inc b/meta/recipes-devtools/python/python-gitdb.inc index 633752f..23ec298 100644 --- a/meta/recipes-devtools/python/python-gitdb.inc +++ b/meta/recipes-devtools/python/python-gitdb.inc @@ -8,8 +8,8 @@ inherit pypi PYPI_PACKAGE = "gitdb2" -SRC_URI[md5sum] = "94e59e5fb00960541f6e137b1456ab0a" -SRC_URI[sha256sum] = "83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2" +SRC_URI[md5sum] = "1a7ea3362e405f8a5634f7ee53636094" +SRC_URI[sha256sum] = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350" DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap" diff --git a/meta/recipes-devtools/python/python3-gitdb_2.0.5.bb b/meta/recipes-devtools/python/python3-gitdb_2.0.6.bb similarity index 97% rename from meta/recipes-devtools/python/python3-gitdb_2.0.5.bb rename to meta/recipes-devtools/python/python3-gitdb_2.0.6.bb index fe15832..2dcd9c8 100644 --- a/meta/recipes-devtools/python/python3-gitdb_2.0.5.bb +++ b/meta/recipes-devtools/python/python3-gitdb_2.0.6.bb @@ -1,2 +1,3 @@ inherit setuptools3 require python-gitdb.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:15 +0000 Subject: [oe-commits] [openembedded-core] 13/22: ncurses: upgrade 6.1+20190803 -> 6.1+20191019 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.83F9223294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 325fe5f68bc698f78f5c1a14407c0bbb4cba45f7 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:28 2020 +0100 ncurses: upgrade 6.1+20190803 -> 6.1+20191019 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...rses-selective-backport-of-20191012-patch.patch | 169 --------------------- ...ses_6.1+20190803.bb => ncurses_6.1+20191019.bb} | 9 +- 2 files changed, 4 insertions(+), 174 deletions(-) diff --git a/meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch b/meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch deleted file mode 100644 index 7870c4b..0000000 --- a/meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 064b77f173337aa790f1cec0d741bfbc61a33d31 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Fri, 18 Oct 2019 09:57:43 -0400 -Subject: [PATCH] ncurses: selective backport of 20191012 patch - -Upstream-Status: Backport [https://salsa.debian.org/debian/ncurses/commit/243908b1e3d81] - -Contents of the upstream patch that are not applied to comp_hash.c, -parse_entry.c, or dump_entry.c have been omitted. - -CVE: CVE-2019-17594 -CVE: CVE-2019-17595 - -Signed-off-by: Trevor Gamblin - ---- - ncurses/tinfo/comp_hash.c | 14 ++++++++++---- - ncurses/tinfo/parse_entry.c | 32 ++++++++++++++++---------------- - progs/dump_entry.c | 7 ++++--- - 3 files changed, 30 insertions(+), 23 deletions(-) - -diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c -index 21f165ca..a62d38f9 100644 ---- a/ncurses/tinfo/comp_hash.c -+++ b/ncurses/tinfo/comp_hash.c -@@ -44,7 +44,7 @@ - #include - #include - --MODULE_ID("$Id: comp_hash.c,v 1.49 2019/03/10 00:06:48 tom Exp $") -+MODULE_ID("$Id: comp_hash.c,v 1.51 2019/10/12 16:32:13 tom Exp $") - - /* - * Finds the entry for the given string in the hash table if present. -@@ -63,7 +63,9 @@ _nc_find_entry(const char *string, - - hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - - real_table = _nc_get_table(termcap); - ptr = real_table + data->table_data[hashvalue]; -@@ -96,7 +98,9 @@ _nc_find_type_entry(const char *string, - const HashData *data = _nc_get_hash_info(termcap); - int hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - const struct name_table_entry *const table = _nc_get_table(termcap); - - ptr = table + data->table_data[hashvalue]; -@@ -124,7 +128,9 @@ _nc_find_user_entry(const char *string) - - hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - - real_table = _nc_get_userdefs_table(); - ptr = real_table + data->table_data[hashvalue]; -diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c -index f8cca8b5..064376c5 100644 ---- a/ncurses/tinfo/parse_entry.c -+++ b/ncurses/tinfo/parse_entry.c -@@ -47,7 +47,7 @@ - #include - #include - --MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $") -+MODULE_ID("$Id: parse_entry.c,v 1.98 2019/10/12 00:50:31 tom Exp $") - - #ifdef LINT - static short const parametrized[] = -@@ -654,12 +654,12 @@ _nc_capcmp(const char *s, const char *t) - } - - static void --append_acs0(string_desc * dst, int code, int src) -+append_acs0(string_desc * dst, int code, char *src, size_t off) - { -- if (src != 0) { -+ if (src != 0 && off < strlen(src)) { - char temp[3]; - temp[0] = (char) code; -- temp[1] = (char) src; -+ temp[1] = src[off]; - temp[2] = 0; - _nc_safe_strcat(dst, temp); - } -@@ -669,7 +669,7 @@ static void - append_acs(string_desc * dst, int code, char *src) - { - if (VALID_STRING(src) && strlen(src) == 1) { -- append_acs0(dst, code, *src); -+ append_acs0(dst, code, src, 0); - } - } - -@@ -1038,17 +1038,17 @@ postprocess_terminfo(TERMTYPE2 *tp) - _nc_str_init(&result, buf2, sizeof(buf2)); - _nc_safe_strcat(&result, acs_chars); - -- append_acs0(&result, 'l', box_chars_1[0]); /* ACS_ULCORNER */ -- append_acs0(&result, 'q', box_chars_1[1]); /* ACS_HLINE */ -- append_acs0(&result, 'k', box_chars_1[2]); /* ACS_URCORNER */ -- append_acs0(&result, 'x', box_chars_1[3]); /* ACS_VLINE */ -- append_acs0(&result, 'j', box_chars_1[4]); /* ACS_LRCORNER */ -- append_acs0(&result, 'm', box_chars_1[5]); /* ACS_LLCORNER */ -- append_acs0(&result, 'w', box_chars_1[6]); /* ACS_TTEE */ -- append_acs0(&result, 'u', box_chars_1[7]); /* ACS_RTEE */ -- append_acs0(&result, 'v', box_chars_1[8]); /* ACS_BTEE */ -- append_acs0(&result, 't', box_chars_1[9]); /* ACS_LTEE */ -- append_acs0(&result, 'n', box_chars_1[10]); /* ACS_PLUS */ -+ append_acs0(&result, 'l', box_chars_1, 0); /* ACS_ULCORNER */ -+ append_acs0(&result, 'q', box_chars_1, 1); /* ACS_HLINE */ -+ append_acs0(&result, 'k', box_chars_1, 2); /* ACS_URCORNER */ -+ append_acs0(&result, 'x', box_chars_1, 3); /* ACS_VLINE */ -+ append_acs0(&result, 'j', box_chars_1, 4); /* ACS_LRCORNER */ -+ append_acs0(&result, 'm', box_chars_1, 5); /* ACS_LLCORNER */ -+ append_acs0(&result, 'w', box_chars_1, 6); /* ACS_TTEE */ -+ append_acs0(&result, 'u', box_chars_1, 7); /* ACS_RTEE */ -+ append_acs0(&result, 'v', box_chars_1, 8); /* ACS_BTEE */ -+ append_acs0(&result, 't', box_chars_1, 9); /* ACS_LTEE */ -+ append_acs0(&result, 'n', box_chars_1, 10); /* ACS_PLUS */ - - if (buf2[0]) { - acs_chars = _nc_save_str(buf2); -diff --git a/progs/dump_entry.c b/progs/dump_entry.c -index d0e420ec..8a47084a 100644 ---- a/progs/dump_entry.c -+++ b/progs/dump_entry.c -@@ -39,7 +39,7 @@ - #include "termsort.c" /* this C file is generated */ - #include /* so is this */ - --MODULE_ID("$Id: dump_entry.c,v 1.173 2019/05/11 21:02:24 tom Exp $") -+MODULE_ID("$Id: dump_entry.c,v 1.175 2019/10/12 15:59:07 tom Exp $") - - #define DISCARD(string) string = ABSENT_STRING - #define PRINTF (void) printf -@@ -1136,7 +1136,8 @@ fmt_entry(TERMTYPE2 *tterm, - *d++ = '\\'; - *d = ':'; - } else if (*d == '\\') { -- *++d = *s++; -+ if ((*++d = *s++) == '\0') -+ break; - } - d++; - *d = '\0'; -@@ -1396,7 +1397,7 @@ one_one_mapping(const char *mapping) - - if (VALID_STRING(mapping)) { - int n = 0; -- while (mapping[n] != '\0') { -+ while (mapping[n] != '\0' && mapping[n + 1] != '\0') { - if (isLine(mapping[n]) && - mapping[n] != mapping[n + 1]) { - result = FALSE; --- -2.17.1 - diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb similarity index 55% rename from meta/recipes-core/ncurses/ncurses_6.1+20190803.bb rename to meta/recipes-core/ncurses/ncurses_6.1+20191019.bb index e638a37..ee7d4be 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb @@ -1,12 +1,11 @@ require ncurses.inc SRC_URI += "file://0001-tic-hang.patch \ - file://0002-configure-reproducible.patch \ - file://config.cache \ - file://0001-ncurses-selective-backport-of-20191012-patch.patch \ -" + file://0002-configure-reproducible.patch \ + file://config.cache \ + " # commit id corresponds to the revision in package version -SRCREV = "3c9b2677c96c645496997321bf2fe465a5e7e21f" +SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:17 +0000 Subject: [oe-commits] [openembedded-core] 15/22: libedit: upgrade 20191025-3.1 -> 20191231-3.1 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.9BC4E232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 97045a0d87efc9bd20c2c096cab1c3e63e3bb436 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:30 2020 +0100 libedit: upgrade 20191025-3.1 -> 20191231-3.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libedit/{libedit_20191025-3.1.bb => libedit_20191231-3.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/libedit/libedit_20191025-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb similarity index 78% rename from meta/recipes-devtools/libedit/libedit_20191025-3.1.bb rename to meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index f810013..7116c9d 100644 --- a/meta/recipes-devtools/libedit/libedit_20191025-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -13,7 +13,7 @@ inherit autotools SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ file://stdc-predef.patch \ " -SRC_URI[md5sum] = "2d6568467080cfd75e715d045102b544" -SRC_URI[sha256sum] = "6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39" +SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" +SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:19 +0000 Subject: [oe-commits] [openembedded-core] 17/22: python3-git: upgrade 3.0.2 -> 3.0.5 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.AF2FB23294E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d19ba66daad9aef683a7dee0c59af29234201574 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:32 2020 +0100 python3-git: upgrade 3.0.2 -> 3.0.5 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-git_3.0.2.bb => python3-git_3.0.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-git_3.0.2.bb b/meta/recipes-devtools/python/python3-git_3.0.5.bb similarity index 88% rename from meta/recipes-devtools/python/python3-git_3.0.2.bb rename to meta/recipes-devtools/python/python3-git_3.0.5.bb index 9dd753d..36313ef 100644 --- a/meta/recipes-devtools/python/python3-git_3.0.2.bb +++ b/meta/recipes-devtools/python/python3-git_3.0.5.bb @@ -12,8 +12,8 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[md5sum] = "ccec14a5c9f18702406122983d80032c" -SRC_URI[sha256sum] = "d2f4945f8260f6981d724f5957bc076398ada55cb5d25aaee10108bcdc894100" +SRC_URI[md5sum] = "7555ad89a22f663c25cced5f623bdef0" +SRC_URI[sha256sum] = "9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42" DEPENDS += " ${PYTHON_PN}-gitdb" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:23 +0000 Subject: [oe-commits] [openembedded-core] 21/22: sed: upgrade 4.7 -> 4.8 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.D9B8023295E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9dc9107eca360ea491e37a5bd26432c77b696bee Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:37 2020 +0100 sed: upgrade 4.7 -> 4.8 License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sed/sed_4.7.bb b/meta/recipes-extended/sed/sed_4.8.bb similarity index 91% rename from meta/recipes-extended/sed/sed_4.7.bb rename to meta/recipes-extended/sed/sed_4.8.bb index a285941..39e3a61 100644 --- a/meta/recipes-extended/sed/sed_4.7.bb +++ b/meta/recipes-extended/sed/sed_4.8.bb @@ -2,15 +2,16 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://sed/sed.h;beginline=1;endline=15;md5=e869c874e5472ba89f63f381b0e93475" + file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ + " SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[md5sum] = "777ddfd9d71dd06711fe91f0925e1573" -SRC_URI[sha256sum] = "2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" +SRC_URI[md5sum] = "6d906edfdb3202304059233f51f9a71d" +SRC_URI[sha256sum] = "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" inherit autotools texinfo update-alternatives gettext ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:24 +0000 Subject: [oe-commits] [openembedded-core] 22/22: libpcre2: upgrade 10.33 -> 10.34 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.E49FE23295F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a18d8beb0dc36d9e63bbf80e93f044997a6c725f Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:38 2020 +0100 libpcre2: upgrade 10.33 -> 10.34 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre2_10.33.bb b/meta/recipes-support/libpcre/libpcre2_10.34.bb similarity index 93% rename from meta/recipes-support/libpcre/libpcre2_10.33.bb rename to meta/recipes-support/libpcre/libpcre2_10.34.bb index 87da313..fa8655e 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.33.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.34.bb @@ -14,8 +14,8 @@ SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "80b355f2dce909a2e2424f5c79eddb44" -SRC_URI[sha256sum] = "35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa" +SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366" +SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca" CVE_PRODUCT = "pcre2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:18 +0000 Subject: [oe-commits] [openembedded-core] 16/22: python3-setuptools: upgrade 42.0.2 -> 45.0.0 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.A6B2423294C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ed1d8e2db0d3b5c60ce83ccebb7f0f7ac36f243a Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:31 2020 +0100 python3-setuptools: upgrade 42.0.2 -> 45.0.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++--- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../{python3-setuptools_42.0.2.bb => python3-setuptools_45.0.0.bb} | 0 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 169d1b1..b1a6813 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 5bba4f57f048016aa92ce5909e9e372db619554e Mon Sep 17 00:00:00 2001 +From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 05508ce..945e118 100755 +index 09066f8..d3039a5 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -640,6 +640,11 @@ class easy_install(Command): +@@ -649,6 +649,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) def easy_install(self, spec, deps=False): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index d8bce71..c697937 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "5ac69b66a6f7d4785517017f37df28e9" -SRC_URI[sha256sum] = "c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940" +SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" +SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_42.0.2.bb b/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_42.0.2.bb rename to meta/recipes-devtools/python/python3-setuptools_45.0.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:22 +0000 Subject: [oe-commits] [openembedded-core] 20/22: python3-six: upgrade 1.13.0 -> 1.14.0 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.CF4EE23295D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d524945a553a95ec21b67432f68257cf2f312a4b Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:35 2020 +0100 python3-six: upgrade 1.13.0 -> 1.14.0 License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-six.inc | 6 +++--- .../python/{python3-six_1.13.0.bb => python3-six_1.14.0.bb} | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index c386090..bbbddbe 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -2,10 +2,10 @@ SUMMARY = "Python 2 and 3 compatibility library" HOMEPAGE = "https://pypi.python.org/pypi/six/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f82eb3a1a7fade60bda5980935084b62" +LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" -SRC_URI[md5sum] = "e92c23c882c7d5564ce5773fe31b2771" -SRC_URI[sha256sum] = "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66" +SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" +SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" inherit pypi diff --git a/meta/recipes-devtools/python/python3-six_1.13.0.bb b/meta/recipes-devtools/python/python3-six_1.14.0.bb similarity index 97% rename from meta/recipes-devtools/python/python3-six_1.13.0.bb rename to meta/recipes-devtools/python/python3-six_1.14.0.bb index 8795313..99e6629 100644 --- a/meta/recipes-devtools/python/python3-six_1.13.0.bb +++ b/meta/recipes-devtools/python/python3-six_1.14.0.bb @@ -1,2 +1,3 @@ inherit setuptools3 require python-six.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:20 +0000 Subject: [oe-commits] [openembedded-core] 18/22: gnu-config: upgrade to latest revision In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.B914D23295B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit de31c1e29230519e76799f6c65507ed21e8667f8 Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:33 2020 +0100 gnu-config: upgrade to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 1630c12..48b7e6d 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "b98424c249119b79d3f709e26eb86f2fd4d5e5f3" -PV = "20190501+git${SRCPV}" +SRCREV = "5256817ace8493502ec88501a19e4051c2e220b0" +PV = "20200117+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:21 +0000 Subject: [oe-commits] [openembedded-core] 19/22: libarchive: upgrade 3.4.0 -> 3.4.1 In-Reply-To: <158073504253.10152.14419527851701589388@git.openembedded.org> References: <158073504253.10152.14419527851701589388@git.openembedded.org> Message-ID: <20200203130403.C3A4223295C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8b58523919f3a8276d4e35c21a058c6d087a3c7e Author: Alexander Kanavin AuthorDate: Wed Jan 29 10:07:34 2020 +0100 libarchive: upgrade 3.4.0 -> 3.4.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libarchive/libarchive/CVE-2019-19221.patch | 101 --------------------- .../{libarchive_3.4.0.bb => libarchive_3.4.1.bb} | 8 +- 2 files changed, 3 insertions(+), 106 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch deleted file mode 100644 index b57e878..0000000 --- a/meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 22b1db9d46654afc6f0c28f90af8cdc84a199f41 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Thu, 21 Nov 2019 03:08:40 +0100 -Subject: [PATCH] Bugfix and optimize archive_wstring_append_from_mbs() - -The cal to mbrtowc() or mbtowc() should read up to mbs_length -bytes and not wcs_length. This avoids out-of-bounds reads. - -mbrtowc() and mbtowc() return (size_t)-1 wit errno EILSEQ when -they encounter an invalid multibyte character and (size_t)-2 when -they they encounter an incomplete multibyte character. As we return -failure and all our callers error out it makes no sense to continue -parsing mbs. - -As we allocate `len` wchars at the beginning and each wchar has -at least one byte, there will never be need to grow the buffer, -so the code can be left out. On the other hand, we are always -allocatng more memory than we need. - -As long as wcs_length == mbs_length == len we can omit wcs_length. -We keep the old code commented if we decide to save memory and -use autoexpanding wcs_length in the future. - -Fixes #1276 - -Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/22b1db9d46654afc6f0c28f90af8cdc84a199f41] -CVE: CVE-2019-19221 -Signed-off-by: Anuj Mittal ---- - libarchive/archive_string.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c -index 979a418b6..bd39c96f1 100644 ---- a/libarchive/archive_string.c -+++ b/libarchive/archive_string.c -@@ -591,7 +591,7 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * No single byte will be more than one wide character, - * so this length estimate will always be big enough. - */ -- size_t wcs_length = len; -+ // size_t wcs_length = len; - size_t mbs_length = len; - const char *mbs = p; - wchar_t *wcs; -@@ -600,7 +600,11 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - - memset(&shift_state, 0, sizeof(shift_state)); - #endif -- if (NULL == archive_wstring_ensure(dest, dest->length + wcs_length + 1)) -+ /* -+ * As we decided to have wcs_length == mbs_length == len -+ * we can use len here instead of wcs_length -+ */ -+ if (NULL == archive_wstring_ensure(dest, dest->length + len + 1)) - return (-1); - wcs = dest->s + dest->length; - /* -@@ -609,6 +613,12 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * multi bytes. - */ - while (*mbs && mbs_length > 0) { -+ /* -+ * The buffer we allocated is always big enough. -+ * Keep this code path in a comment if we decide to choose -+ * smaller wcs_length in the future -+ */ -+/* - if (wcs_length == 0) { - dest->length = wcs - dest->s; - dest->s[dest->length] = L'\0'; -@@ -618,24 +628,20 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - return (-1); - wcs = dest->s + dest->length; - } -+*/ - #if HAVE_MBRTOWC -- r = mbrtowc(wcs, mbs, wcs_length, &shift_state); -+ r = mbrtowc(wcs, mbs, mbs_length, &shift_state); - #else -- r = mbtowc(wcs, mbs, wcs_length); -+ r = mbtowc(wcs, mbs, mbs_length); - #endif - if (r == (size_t)-1 || r == (size_t)-2) { - ret_val = -1; -- if (errno == EILSEQ) { -- ++mbs; -- --mbs_length; -- continue; -- } else -- break; -+ break; - } - if (r == 0 || r > mbs_length) - break; - wcs++; -- wcs_length--; -+ // wcs_length--; - mbs += r; - mbs_length -= r; - } diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.0.bb b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb similarity index 91% rename from meta/recipes-extended/libarchive/libarchive_3.4.0.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.1.bb index 755a9c7..2d33dd8 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.0.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb @@ -31,12 +31,10 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," EXTRA_OECONF += "--enable-largefile" -SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ - file://CVE-2019-19221.patch \ -" +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "6046396255bd7cf6d0f6603a9bda39ac" -SRC_URI[sha256sum] = "8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e" +SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" +SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" inherit autotools update-alternatives pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:41 +0000 Subject: [oe-commits] [openembedded-core] 01/05: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158073508084.11035.6339228983756982256@git.openembedded.org> References: <158073508084.11035.6339228983756982256@git.openembedded.org> Message-ID: <20200203130441.00B9E23294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a23f3e1e20eea3abe49778700ad47ac3e2058805 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:40 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (a41d77c -> a6d88da) Message-ID: <158073508084.11035.6339228983756982256@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard a41d77c libpcre2: upgrade 10.33 -> 10.34 discard 201ad23 sed: upgrade 4.7 -> 4.8 discard 3bd43da python3-six: upgrade 1.13.0 -> 1.14.0 discard eb75a3a libarchive: upgrade 3.4.0 -> 3.4.1 discard adb6061 gnu-config: upgrade to latest revision discard 9aba70a python3-git: upgrade 3.0.2 -> 3.0.5 discard 5bfa795 python3-setuptools: upgrade 42.0.2 -> 45.0.0 discard 99de4b7 libedit: upgrade 20191025-3.1 -> 20191231-3.1 discard 42705b1 python3-gitdb: upgrade 2.0.5 -> 2.0.6 discard 2a5024e ncurses: upgrade 6.1+20190803 -> 6.1+20191019 discard 9cbc6e4 kmscube: upgrade to latest revision discard 85a703d piglit: upgrade to latest revision discard 17d2d1e ccache: upgrade 3.7.3 -> 3.7.7 discard 936d41c libxpm: upgrade 3.5.12 -> 3.5.13 discard 6f6ecc8 linux-firmware: upgrade to latest revision discard 8a36785 socat: upgrade 1.7.3.3 -> 1.7.3.4 discard f0b4115 puzzles: upgrade to latest revision discard b8525d0 bison: upgrade 3.4.2 -> 3.5 discard 5fe6df6 shared-mime-info: fix (sort of) upstream version check discard 65ef6ed speexdsp: fix upstream version check discard 094ff2f libva-utils: fix upstream version check discard 3c958d8 findutils: drop upstream-version-is-even discard f9b2925 sstatesig: Log timestamps for hashequiv in reprodubile builds discard bb84d46 HACK: signing: Add extra test debug discard 0a42994 glew/curl: specify exclusive package configs discard 885baf0 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 1ca4b04 oescripts.py: use unittest.SkipUnless for class skip add 3b41a55 findutils: drop upstream-version-is-even add 3a881ca libva-utils: fix upstream version check add f6b84c1 speexdsp: fix upstream version check add fe38a5d shared-mime-info: fix (sort of) upstream version check add b784115 bison: upgrade 3.4.2 -> 3.5 add 4c6b294 puzzles: upgrade to latest revision add 37b11d0 socat: upgrade 1.7.3.3 -> 1.7.3.4 add 573267b linux-firmware: upgrade to latest revision add aea7f19 libxpm: upgrade 3.5.12 -> 3.5.13 add 4e852a1 ccache: upgrade 3.7.3 -> 3.7.7 add 02df1c2 piglit: upgrade to latest revision add 17eee40 kmscube: upgrade to latest revision add 325fe5f ncurses: upgrade 6.1+20190803 -> 6.1+20191019 add cb2bebf python3-gitdb: upgrade 2.0.5 -> 2.0.6 add 97045a0 libedit: upgrade 20191025-3.1 -> 20191231-3.1 add ed1d8e2 python3-setuptools: upgrade 42.0.2 -> 45.0.0 add d19ba66 python3-git: upgrade 3.0.2 -> 3.0.5 add de31c1e gnu-config: upgrade to latest revision add 8b58523 libarchive: upgrade 3.4.0 -> 3.4.1 add d524945 python3-six: upgrade 1.13.0 -> 1.14.0 add 9dc9107 sed: upgrade 4.7 -> 4.8 add a18d8be libpcre2: upgrade 10.33 -> 10.34 new a23f3e1 oescripts.py: use unittest.SkipUnless for class skip new 92a1199 base.bbclass: extend PACKAGECONFIG for conflict package configs new fd17f5e glew/curl: specify exclusive package configs new 6e1bc08 HACK: signing: Add extra test debug new a6d88da sstatesig: Log timestamps for hashequiv in reprodubile builds This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a41d77c) \ N -- N -- N refs/heads/master-next (a6d88da) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:44 +0000 Subject: [oe-commits] [openembedded-core] 04/05: HACK: signing: Add extra test debug In-Reply-To: <158073508084.11035.6339228983756982256@git.openembedded.org> References: <158073508084.11035.6339228983756982256@git.openembedded.org> Message-ID: <20200203130441.224DF23294E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e1bc0818986d21f277ef1ac5015309e407a6989 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:42 +0000 Subject: [oe-commits] [openembedded-core] 02/05: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158073508084.11035.6339228983756982256@git.openembedded.org> References: <158073508084.11035.6339228983756982256@git.openembedded.org> Message-ID: <20200203130441.0B09323294B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 92a1199b3a2913dbab1b45d9f123a99dc33a5e7a Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:43 +0000 Subject: [oe-commits] [openembedded-core] 03/05: glew/curl: specify exclusive package configs In-Reply-To: <158073508084.11035.6339228983756982256@git.openembedded.org> References: <158073508084.11035.6339228983756982256@git.openembedded.org> Message-ID: <20200203130441.15FEF23294C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fd17f5ea990b1115dc624bbfdd61e2b7945ec8cc Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 13:04:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 13:04:45 +0000 Subject: [oe-commits] [openembedded-core] 05/05: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158073508084.11035.6339228983756982256@git.openembedded.org> References: <158073508084.11035.6339228983756982256@git.openembedded.org> Message-ID: <20200203130441.2ECC923294F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a6d88da535670c4dc37df696e8e5412d64164ab3 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:40:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:40:48 +0000 Subject: [oe-commits] [openembedded-core] 01/03: sudo: Set vardir deterministically In-Reply-To: <158076244738.24284.9639660341907563570@git.openembedded.org> References: <158076244738.24284.9639660341907563570@git.openembedded.org> Message-ID: <20200203204047.A5BFF232867@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4bac8acb01902b000447a869a4251ceba20e5280 Author: Richard Purdie AuthorDate: Mon Feb 3 14:13:31 2020 +0000 sudo: Set vardir deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13775] Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo_1.8.29.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sudo/sudo_1.8.29.bb b/meta/recipes-extended/sudo/sudo_1.8.29.bb index 8da2d64..7089e1a 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.29.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.29.bb @@ -17,6 +17,7 @@ EXTRA_OECONF += " \ ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-vardir=/var/lib/sudo \ " do_install_append () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:40:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:40:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (a6d88da -> e1b5f7a) Message-ID: <158076244738.24284.9639660341907563570@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from a6d88da sstatesig: Log timestamps for hashequiv in reprodubile builds new 4bac8ac sudo: Set vardir deterministically new 4fe0c1b libxshmfence: Set shm directory deterministically new e1b5f7a opkg-utils: Fix reproducibility The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../opkg-utils/opkg-utils/fix-reproducibility.patch | 15 +++++++++++++++ meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 1 + meta/recipes-extended/sudo/sudo_1.8.29.bb | 1 + meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 4 files changed, 19 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:40:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:40:50 +0000 Subject: [oe-commits] [openembedded-core] 03/03: opkg-utils: Fix reproducibility In-Reply-To: <158076244738.24284.9639660341907563570@git.openembedded.org> References: <158076244738.24284.9639660341907563570@git.openembedded.org> Message-ID: <20200203204047.BB127232872@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e1b5f7aafffed2f0db6258434337828aea4fe04e Author: Richard Purdie AuthorDate: Mon Feb 3 20:39:14 2020 +0000 opkg-utils: Fix reproducibility Signed-off-by: Richard Purdie --- .../opkg-utils/opkg-utils/fix-reproducibility.patch | 15 +++++++++++++++ meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 16 insertions(+) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000..fca5e66 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,15 @@ +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,8 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 8e7ef00..eda73db 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:40:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:40:49 +0000 Subject: [oe-commits] [openembedded-core] 02/03: libxshmfence: Set shm directory deterministically In-Reply-To: <158076244738.24284.9639660341907563570@git.openembedded.org> References: <158076244738.24284.9639660341907563570@git.openembedded.org> Message-ID: <20200203204047.B0E04232871@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4fe0c1b0a86f44e74449b47d74f7086911017773 Author: Richard Purdie AuthorDate: Mon Feb 3 14:14:31 2020 +0000 libxshmfence: Set shm directory deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13778] Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 85a48e4..cc45696 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:54:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:54:22 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3eaed6f -> 80514e1) Message-ID: <158076326216.27368.15693479837344858400@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 3eaed6f recipes: Inherit perlnative for pod2man new 9cc9bd0 hiawatha: upgrade 10.7 -> 10.10 new 80514e1 libwebsockets: upgrade 3.2.0 -> 3.2.2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../libwebsockets/{libwebsockets_3.2.0.bb => libwebsockets_3.2.2.bb} | 2 +- .../recipes-httpd/hiawatha/{hiawatha_10.7.bb => hiawatha_10.10.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-connectivity/libwebsockets/{libwebsockets_3.2.0.bb => libwebsockets_3.2.2.bb} (95%) rename meta-webserver/recipes-httpd/hiawatha/{hiawatha_10.7.bb => hiawatha_10.10.bb} (94%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:54:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:54:23 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: hiawatha: upgrade 10.7 -> 10.10 In-Reply-To: <158076326216.27368.15693479837344858400@git.openembedded.org> References: <158076326216.27368.15693479837344858400@git.openembedded.org> Message-ID: <20200203205422.8AB7A2328D2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9cc9bd0bd62e73eeabcf836a86d52bb49ccd5d10 Author: Pierre-Jean Texier AuthorDate: Tue Jan 28 09:02:16 2020 +0000 hiawatha: upgrade 10.7 -> 10.10 See full changelog https://www.hiawatha-webserver.org/changelog Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../recipes-httpd/hiawatha/{hiawatha_10.7.bb => hiawatha_10.10.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb similarity index 94% rename from meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb rename to meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb index d6c449b..ed3df19 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb @@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ file://hiawatha-init \ file://hiawatha.service " -SRC_URI[md5sum] = "581aa71c831172ba06910deda717302f" -SRC_URI[sha256sum] = "363e99d84a85dafbb74bcc30b3e30286053ec2abbc7afe08cd87193611735f74" +SRC_URI[md5sum] = "3bf2c12c7037ecc3dfdbec72e7a2f04f" +SRC_URI[sha256sum] = "b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9" INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 20:54:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 20:54:24 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: libwebsockets: upgrade 3.2.0 -> 3.2.2 In-Reply-To: <158076326216.27368.15693479837344858400@git.openembedded.org> References: <158076326216.27368.15693479837344858400@git.openembedded.org> Message-ID: <20200203205422.94733232902@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 80514e173bb7c6e07e8ab9f10d73ba4142d49200 Author: Pierre-Jean Texier AuthorDate: Mon Feb 3 20:30:55 2020 +0000 libwebsockets: upgrade 3.2.0 -> 3.2.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../libwebsockets/{libwebsockets_3.2.0.bb => libwebsockets_3.2.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.2.bb similarity index 95% rename from meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.0.bb rename to meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.2.bb index 9c55033..5a2244d 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.0.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.2.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ce87f3facb6f911c142c8bef9bfb380" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "94931cad003faf9d316e698b557bbb6d245f1f91" +SRCREV = "d880fe233020b74e058cbca95b5fb67823bbf258" SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v3.2-stable" inherit cmake pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 21:23:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 21:23:39 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (463f9a3 -> 3eaed6f) Message-ID: <158076501947.5976.11110459817122421055@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from 463f9a3 pkcs11-helper: upgrade 1.25.1 -> 1.26 add 3b3de3f libgpiod: update v1.4.1 -> v1.4.2 add 3049c65 modemmanager: upgrade 1.10.8 -> 1.12.4 add 6e936c4 kernel-selftest: Disable bpf tests on mips add 23eb065 mozjs: port build to python3 add 6cdb73d xfce4-whiskermenu-plugin: upgrade 2.3.4 -> 2.3.5 add a900299 thunar: upgrade 1.8.10 -> 1.8.12 add d7179a6 poppler: upgrade 0.84.0 -> 0.85.0 add 19d1fd1 python3-pexpect: upgrade 4.7.0 -> 4.8.0 add 2e6a5f3 gpsd: Only require and build for Python3 add 6aab1a8 openbox: use python 3 add bb253b2 sdbus-c++: upgrade 0.7.6 -> 0.8.1 add 59e3d74 recipes: Inherit perlnative for pod2man add 3eaed6f recipes: Inherit perlnative for pod2man No new revisions were added by this update. Summary of changes: .../pptp-linux/pptp-linux_1.10.0.bb | 2 + .../recipes-support/netcf/netcf_0.2.8.bb | 2 +- ...demmanager_1.10.8.bb => modemmanager_1.12.4.bb} | 4 +- .../{sdbus-c++-0.7.6 => sdbus-c++-0.8.1}/run-ptest | 0 ...ve_0.7.6.bb => sdbus-c++-tools-native_0.8.1.bb} | 2 +- .../{sdbus-c++_0.7.6.bb => sdbus-c++_0.8.1.bb} | 2 +- .../mozjs/mozjs/0001-Port-build-to-python3.patch | 6888 ++++++++++++++++++++ ...not-include-RequiredDefines.h-for-depend.patch} | 0 ...03-fix-cross-compilation-on-i586-targets.patch} | 0 ...=> 0004-do-not-create-python-environment.patch} | 0 ...-link.patch => 0005-fix-cannot-find-link.patch} | 0 ...orkaround-autoconf-2.13-detection-failed.patch} | 0 ...ch => 0007-fix-do_compile-failed-on-mips.patch} | 0 ...-support.patch => 0008-add-riscv-support.patch} | 0 ...0009-mozjs-fix-coredump-caused-by-getenv.patch} | 0 ...t-overflow.patch => 0010-format-overflow.patch} | 0 ...ch => 0011-To-fix-build-error-on-arm32BE.patch} | 0 ...S_PUBLIC_API.patch => 0012-JS_PUBLIC_API.patch} | 0 ... => 0013-riscv-Disable-atomic-operations.patch} | 0 ...ch => 0014-fallback-to-2011-C++-standard.patch} | 0 ...1-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../0001-support-musl.patch} | 0 .../0002-js-Fix-build-with-musl.patch} | 0 meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 56 +- .../pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- .../triggerhappy/triggerhappy_git.bb | 2 +- ...-openbox-xdg-autostart-convert-to-python3.patch | 138 + meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 3 +- .../xdotool/xdotool_1.20100416.2809.bb | 2 +- .../kernel-selftest/kernel-selftest.bb | 6 +- meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 24 +- .../{libgpiod_1.4.1.bb => libgpiod_1.4.2.bb} | 4 +- .../recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb | 2 +- .../{poppler_0.84.0.bb => poppler_0.85.0.bb} | 4 +- meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb | 2 +- .../recipes-devtools/python/python-pexpect.inc | 4 +- ...3-pexpect_4.7.0.bb => python3-pexpect_4.8.0.bb} | 0 ..._2.3.4.bb => xfce4-whiskermenu-plugin_2.3.5.bb} | 4 +- .../thunar/{thunar_1.8.10.bb => thunar_1.8.12.bb} | 4 +- 39 files changed, 7096 insertions(+), 61 deletions(-) rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.10.8.bb => modemmanager_1.12.4.bb} (92%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.7.6 => sdbus-c++-0.8.1}/run-ptest (100%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-tools-native_0.7.6.bb => sdbus-c++-tools-native_0.8.1.bb} (87%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++_0.7.6.bb => sdbus-c++_0.8.1.bb} (95%) create mode 100644 meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch rename meta-oe/recipes-extended/mozjs/mozjs/{0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch => 0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0010-fix-cross-compilation-on-i586-targets.patch => 0003-fix-cross-compilation-on-i586-targets.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-do-not-create-python-environment.patch => 0004-do-not-create-python-environment.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0002-fix-cannot-find-link.patch => 0005-fix-cannot-find-link.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0003-workaround-autoconf-2.13-detection-failed.patch => 0006-workaround-autoconf-2.13-detection-failed.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0005-fix-do_compile-failed-on-mips.patch => 0007-fix-do_compile-failed-on-mips.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{add-riscv-support.patch => 0008-add-riscv-support.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-mozjs-fix-coredump-caused-by-getenv.patch => 0009-mozjs-fix-coredump-caused-by-getenv.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{format-overflow.patch => 0010-format-overflow.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-To-fix-build-error-on-arm32BE.patch => 0011-To-fix-build-error-on-arm32BE.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{JS_PUBLIC_API.patch => 0012-JS_PUBLIC_API.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-riscv-Disable-atomic-operations.patch => 0013-riscv-Disable-atomic-operations.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{fallback-to-2011-C++-standard.patch => 0014-fallback-to-2011-C++-standard.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{ => mipsarchn32}/0001-fix-compiling-failure-on-mips64-n32-bsp.patch (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0006-support-musl.patch => musl/0001-support-musl.patch} (100%) rename meta-oe/recipes-extended/mozjs/mozjs/{0001-js-Fix-build-with-musl.patch => musl/0002-js-Fix-build-with-musl.patch} (100%) create mode 100644 meta-oe/recipes-graphics/openbox/files/0001-openbox-xdg-autostart-convert-to-python3.patch rename meta-oe/recipes-support/libgpiod/{libgpiod_1.4.1.bb => libgpiod_1.4.2.bb} (80%) rename meta-oe/recipes-support/poppler/{poppler_0.84.0.bb => poppler_0.85.0.bb} (93%) rename meta-python/recipes-devtools/python/{python3-pexpect_4.7.0.bb => python3-pexpect_4.8.0.bb} (100%) rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.3.4.bb => xfce4-whiskermenu-plugin_2.3.5.bb} (66%) rename meta-xfce/recipes-xfce/thunar/{thunar_1.8.10.bb => thunar_1.8.12.bb} (84%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (e1b5f7a -> df5d2c4) Message-ID: <158077278594.12355.10377392529095800703@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from e1b5f7a opkg-utils: Fix reproducibility new 85fb7b6 glibc: don't ignore global LDFLAGS settings new 39f7cbf stress-ng: upgrade 0.10.15 -> 0.10.16 new 7ae6d78 glib-networking: upgrade 2.62.2 -> 2.62.3 new f922d3b assimp: upgrade 5.0.0 -> 5.0.1 new 1bc9ae6 sudo: upgrade 1.8.29 -> 1.8.30 new a12660a libtirpc: upgrade 1.1.4 -> 1.2.5 new ed8e300 procps: enable optional systemd support new 3a7c509 cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL new 4cad166 buildhistory: Allow customising buildhistory tags new 5045c6d lib/oe/path: try hardlinking instead of guessing when it might fail new b80bf49 gstreamer1.0-plugins-common.inc: disable orc on mips new c4d78f1 bash: include patch 8-11 new df5d2c4 rsync: whitelist CVE-2017-16548 The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/buildhistory.bbclass | 7 +++-- meta/classes/cmake.bbclass | 5 ++-- meta/lib/oe/path.py | 24 +++++++++++---- meta/lib/oe/utils.py | 11 ++++--- ...working_2.62.2.bb => glib-networking_2.62.3.bb} | 4 +-- meta/recipes-core/glibc/glibc_2.31.bb | 3 +- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 ++ meta/recipes-extended/bash/bash_5.0.bb | 12 ++++++++ ...01-xdr_float-do-not-include-bits-endian.h.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc/musl.patch | 30 ------------------- .../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 ++-- meta/recipes-extended/procps/procps_3.3.15.bb | 3 ++ .../{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} | 4 +-- .../sudo/{sudo_1.8.29.bb => sudo_1.8.30.bb} | 4 +-- ...-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 ++++---- .../vulkan/{assimp_5.0.0.bb => assimp_5.0.1.bb} | 4 +-- .../gstreamer/gstreamer1.0-plugins-common.inc | 5 +++- 17 files changed, 105 insertions(+), 66 deletions(-) rename meta/recipes-core/glib-networking/{glib-networking_2.62.2.bb => glib-networking_2.62.3.bb} (88%) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/musl.patch rename meta/recipes-extended/libtirpc/{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} (81%) rename meta/recipes-extended/stress-ng/{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} (83%) rename meta/recipes-extended/sudo/{sudo_1.8.29.bb => sudo_1.8.30.bb} (92%) rename meta/recipes-graphics/vulkan/{assimp_5.0.0.bb => assimp_5.0.1.bb} (84%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:06 +0000 Subject: [oe-commits] [openembedded-core] 01/13: glibc: don't ignore global LDFLAGS settings In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.4742A232953@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85fb7b65b88ef03e56b697b670b665813ab22101 Author: Rasmus Villemoes AuthorDate: Mon Jan 20 09:23:06 2020 +0000 glibc: don't ignore global LDFLAGS settings Two things: The -Wl,-rpath-link comment is stale (due to per-recipe staging), so we no longer need to set our own LDFLAGS to avoid -Wl,-rpath-link being in there. Second, overriding LDFLAGS should be done at the recipe level so "bitbake -e" can show what is going on. Otherwise debugging why one's global LDFLAGS tweaks are being ignored is needlessly painful. So pull out the LDFLAGS setting from do_compile, and change it to an append instead of assignment. For the benefit of future git blame: the -fuse-ld=bfd setting was added by ac64c3b96b (glibc: always use bfd linker). Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc_2.31.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb index 9f299a7..2032311 100644 --- a/meta/recipes-core/glibc/glibc_2.31.bb +++ b/meta/recipes-core/glibc/glibc_2.31.bb @@ -91,9 +91,8 @@ do_configure () { CPPFLAGS="" oe_runconf } +LDFLAGS += "-fuse-ld=bfd" do_compile () { - # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging - LDFLAGS="-fuse-ld=bfd" base_do_compile echo "Adjust ldd script" if [ -n "${RTLDLIST}" ] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:07 +0000 Subject: [oe-commits] [openembedded-core] 02/13: stress-ng: upgrade 0.10.15 -> 0.10.16 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.5342F23296B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 39f7cbfcce08a032ce547032fab3947df283b9a7 Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:32 2020 +0800 stress-ng: upgrade 0.10.15 -> 0.10.16 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb b/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb index 5402130..e67b82a 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ " -SRC_URI[md5sum] = "303a7276e3a9e3dd03be6cabc9e84a75" -SRC_URI[sha256sum] = "1d0ca8a2f287e13c2d36c01e874d16d67bcb368d8d26563324c9aaf0ddb100c1" +SRC_URI[md5sum] = "a337cd5b1412c53c580e95ee2a9fc77b" +SRC_URI[sha256sum] = "eabfffcffcf53e67765181280456c204ad00214339cfdb3ee2769d58b4a7e304" DEPENDS = "coreutils-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:08 +0000 Subject: [oe-commits] [openembedded-core] 03/13: glib-networking: upgrade 2.62.2 -> 2.62.3 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.5FA32232970@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7ae6d781b317b2b00d1519c50309636c55a02f70 Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:33 2020 +0800 glib-networking: upgrade 2.62.2 -> 2.62.3 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{glib-networking_2.62.2.bb => glib-networking_2.62.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.62.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb similarity index 88% rename from meta/recipes-core/glib-networking/glib-networking_2.62.2.bb rename to meta/recipes-core/glib-networking/glib-networking_2.62.3.bb index 026d870..e9596ce 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.62.2.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "a8b669ae54c7178848ce7a9b596a471c" -SRC_URI[archive.sha256sum] = "0644b8dc042bab8c9d2892aee5716513280c8773dbef43a038149f24cae15544" +SRC_URI[archive.md5sum] = "a758ca62bd54982a798b39c744cbf783" +SRC_URI[archive.sha256sum] = "8ca1f86f23a76b5c7640624f7d5490705c78e81375e1741c9a1c41ce7f8f7ff7" PACKAGECONFIG ??= "gnutls" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:12 +0000 Subject: [oe-commits] [openembedded-core] 07/13: procps: enable optional systemd support In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.8BFBF2329BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ed8e300faf4969a3ada80efaec77e1161e10e95c Author: Daniel McGregor AuthorDate: Thu Jan 23 15:44:41 2020 -0600 procps: enable optional systemd support procps includes support for listing the owning unit of a process, but this support is disabled by default. Enable support using a PACKAGECONFIG that depends on the systemd DISTRO_FEATURE. Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.3.15.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.15.bb index f240e54..17abd96 100644 --- a/meta/recipes-extended/procps/procps_3.3.15.bb +++ b/meta/recipes-extended/procps/procps_3.3.15.bb @@ -24,6 +24,9 @@ S = "${WORKDIR}/procps-ng-${PV}" EXTRA_OECONF = "--enable-skill --disable-modern-top" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" + do_install_append () { install -d ${D}${base_bindir} [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:09 +0000 Subject: [oe-commits] [openembedded-core] 04/13: assimp: upgrade 5.0.0 -> 5.0.1 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.6B614232974@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f922d3bb51df6a20bdf867541f2dbe9755778edf Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:35 2020 +0800 assimp: upgrade 5.0.0 -> 5.0.1 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 +++++------- .../vulkan/{assimp_5.0.0.bb => assimp_5.0.1.bb} | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch index 3e9fbec..34c5bfa 100644 --- a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch +++ b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch @@ -1,4 +1,4 @@ -From dd5c10f660716a2fab513714245be1932003306b Mon Sep 17 00:00:00 2001 +From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 12 Dec 2019 22:16:15 -0800 Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library @@ -8,12 +8,13 @@ Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia + --- assimpTargets-release.cmake.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in -index b09b881f..5c6999fe 100644 +index f3db8f1..b8a066a 100644 --- a/assimpTargets-release.cmake.in +++ b/assimpTargets-release.cmake.in @@ -42,11 +42,11 @@ if(MSVC) @@ -43,8 +44,8 @@ index b09b881f..5c6999fe 100644 endif() else() -@@ -66,17 +66,17 @@ else() - set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX at .@ASSIMP_VERSION_MAJOR@") +@@ -70,17 +70,17 @@ else() + endif() set_target_properties(assimp::assimp PROPERTIES IMPORTED_SONAME_RELEASE "${sharedLibraryName}" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" @@ -65,6 +66,3 @@ index b09b881f..5c6999fe 100644 endif() endif() --- -2.21.0 - diff --git a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb similarity index 84% rename from meta/recipes-graphics/vulkan/assimp_5.0.0.bb rename to meta/recipes-graphics/vulkan/assimp_5.0.1.bb index a42494a..5a8c62e 100644 --- a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb +++ b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271" DEPENDS = "zlib" -SRC_URI = "git://github.com/assimp/assimp.git \ +SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release \ file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \ file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" -SRCREV = "2d2889f73fa1b2ca09ba9f43c9785402d3a7fdd0" +SRCREV = "8f0c6b04b2257a520aaab38421b2e090204b69df" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:10 +0000 Subject: [oe-commits] [openembedded-core] 05/13: sudo: upgrade 1.8.29 -> 1.8.30 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.76E582329A0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1bc9ae6720ba747ac70541ff1526040161e1d047 Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:36 2020 +0800 sudo: upgrade 1.8.29 -> 1.8.30 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/{sudo_1.8.29.bb => sudo_1.8.30.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo_1.8.29.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.29.bb rename to meta/recipes-extended/sudo/sudo_1.8.30.bb index 7089e1a..6ea06a9 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.29.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "b28dabff9c460f115fe74de4d6a6f79d" -SRC_URI[sha256sum] = "ce53ffac9604e23321334d8ba8ac59ded2bcf624fdb9dbde097ab2049bf29c7c" +SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" +SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:15 +0000 Subject: [oe-commits] [openembedded-core] 10/13: lib/oe/path: try hardlinking instead of guessing when it might fail In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.AD69E2329C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5045c6d185f7440e7e41ede577d300666551cc93 Author: Henning Schild AuthorDate: Fri Jan 24 14:48:47 2020 +0100 lib/oe/path: try hardlinking instead of guessing when it might fail The comparison of the stat st_dev is not enough to judge whether hardlinking will work. One example would be where you try and hardlink across two bind-mounts of a directory. The st_dev will be the same and the operation will still fail. Instead of implementing a check to try and figure out hardlink support just try hardlinking and fall back to a copy when running into an exception. Signed-off-by: Henning Schild Signed-off-by: Richard Purdie --- meta/lib/oe/path.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index fa209b9..0829724 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -99,7 +99,22 @@ def copyhardlinktree(src, dst): if os.path.isdir(src) and not len(os.listdir(src)): return - if (os.stat(src).st_dev == os.stat(dst).st_dev): + canhard = False + testfile = None + for root, dirs, files in os.walk(src): + if len(files): + testfile = os.path.join(root, files[0]) + break + + if testfile is not None: + try: + os.link(testfile, os.path.join(dst, 'testfile')) + os.unlink(os.path.join(dst, 'testfile')) + canhard = True + except Exception as e: + bb.debug(2, "Hardlink test failed with " + str(e)) + + if (canhard): # Need to copy directories only with tar first since cp will error if two # writers try and create a directory at the same time cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst) @@ -121,12 +136,9 @@ def copyhardlinktree(src, dst): def copyhardlink(src, dst): """Make a hard link when possible, otherwise copy.""" - # We need to stat the destination directory as the destination file probably - # doesn't exist yet. - dstdir = os.path.dirname(dst) - if os.stat(src).st_dev == os.stat(dstdir).st_dev: + try: os.link(src, dst) - else: + except OSError: shutil.copy(src, dst) def remove(path, recurse=True): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:14 +0000 Subject: [oe-commits] [openembedded-core] 09/13: buildhistory: Allow customising buildhistory tags In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.A32332329BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4cad1660f1d05428b18c173bc340f09f5e733dd7 Author: Daniel McGregor AuthorDate: Thu Jan 23 15:44:43 2020 -0600 buildhistory: Allow customising buildhistory tags Allow setting custom buildhistory tag prefixes. This allows multiple build directories to share one buildhistory git repository with multiple worktrees. Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index affdf27..eb72955 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -40,6 +40,7 @@ BUILDHISTORY_SDK_FILES ?= "conf/local.conf conf/bblayers.conf conf/auto.conf con BUILDHISTORY_COMMIT ?= "1" BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory " BUILDHISTORY_PUSH_REPO ?= "" +BUILDHISTORY_TAG ?= "build" SSTATEPOSTINSTFUNCS_append = " buildhistory_emit_pkghistory" # We want to avoid influencing the signatures of sstate tasks - first the function itself: @@ -824,9 +825,9 @@ END if [ ! -e .git ] ; then git init -q else - git tag -f build-minus-3 build-minus-2 > /dev/null 2>&1 || true - git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true - git tag -f build-minus-1 > /dev/null 2>&1 || true + git tag -f ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true + git tag -f ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true + git tag -f ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true fi check_git_config -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:17 +0000 Subject: [oe-commits] [openembedded-core] 12/13: bash: include patch 8-11 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.C233D2329C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c4d78f19d0221b4b27da3882a4ca0f06d78dd522 Author: Lee Chee Yang AuthorDate: Tue Jan 21 13:26:46 2020 +0800 bash: include patch 8-11 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash_5.0.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index eadc822..0c7b234 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -12,6 +12,10 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-008;apply=yes;striplevel=0;name=patch008 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -38,6 +42,14 @@ SRC_URI[patch006.md5sum] = "4a8ee95adb72c3aba03d9e8c9f96ece6" SRC_URI[patch006.sha256sum] = "d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420" SRC_URI[patch007.md5sum] = "411560d81fde2dc5b17b83c3f3b58c6f" SRC_URI[patch007.sha256sum] = "17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b" +SRC_URI[patch008.md5sum] = "dd7cf7a784d1838822cad8d419315991" +SRC_URI[patch008.sha256sum] = "eec64588622a82a5029b2776e218a75a3640bef4953f09d6ee1f4199670ad7e3" +SRC_URI[patch009.md5sum] = "c1b3e937cd6dccbb7fd772f32812a0da" +SRC_URI[patch009.sha256sum] = "ed3ca21767303fc3de93934aa524c2e920787c506b601cc40a4897d4b094d903" +SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" +SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" +SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" +SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:13 +0000 Subject: [oe-commits] [openembedded-core] 08/13: cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.986CB2329BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a7c5095401304d24ed4aa0d8f30c572097c7d33 Author: Daniel McGregor AuthorDate: Thu Jan 23 15:44:42 2020 -0600 cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL cmake 3.12 introduced this environment variable. Prefer it to passing PARALLEL_MAKE and PARALLEL_MAKEINST on the cmake command line, because it gets passed to second stage cmake invocations while command-line arguments do not (for example, multi-stage clang builds) Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/classes/cmake.bbclass | 5 +++-- meta/lib/oe/utils.py | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a046daa..d91cf20 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -63,8 +63,9 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH" EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" -EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} " -EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " +export CMAKE_BUILD_PARALLEL_LEVEL +CMAKE_BUILD_PARALLEL_LEVEL_task-compile = "${@oe.utils.parallel_make(d, False)}" +CMAKE_BUILD_PARALLEL_LEVEL_task-install = "${@oe.utils.parallel_make(d, True)}" OECMAKE_TARGET_COMPILE ?= "all" OECMAKE_TARGET_INSTALL ?= "install" diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 652b2be..e350b05 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -169,7 +169,7 @@ def any_distro_features(d, features, truevalue="1", falsevalue=""): """ return bb.utils.contains_any("DISTRO_FEATURES", features, truevalue, falsevalue, d) -def parallel_make(d): +def parallel_make(d, makeinst=False): """ Return the integer value for the number of parallel threads to use when building, scraped out of PARALLEL_MAKE. If no parallelization option is @@ -177,7 +177,10 @@ def parallel_make(d): e.g. if PARALLEL_MAKE = "-j 10", this will return 10 as an integer. """ - pm = (d.getVar('PARALLEL_MAKE') or '').split() + if makeinst: + pm = (d.getVar('PARALLEL_MAKEINST') or '').split() + else: + pm = (d.getVar('PARALLEL_MAKE') or '').split() # look for '-j' and throw other options (e.g. '-l') away while pm: opt = pm.pop(0) @@ -192,7 +195,7 @@ def parallel_make(d): return None -def parallel_make_argument(d, fmt, limit=None): +def parallel_make_argument(d, fmt, limit=None, makeinst=False): """ Helper utility to construct a parallel make argument from the number of parallel threads specified in PARALLEL_MAKE. @@ -205,7 +208,7 @@ def parallel_make_argument(d, fmt, limit=None): e.g. if PARALLEL_MAKE = "-j 10", parallel_make_argument(d, "-n %d") will return "-n 10" """ - v = parallel_make(d) + v = parallel_make(d, makeinst) if v: if limit: v = min(limit, v) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:11 +0000 Subject: [oe-commits] [openembedded-core] 06/13: libtirpc: upgrade 1.1.4 -> 1.2.5 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.814FE2329BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a12660a1460c7bc48098b820f00c35fd07393602 Author: Anuj Mittal AuthorDate: Thu Jan 23 14:27:46 2020 +0800 libtirpc: upgrade 1.1.4 -> 1.2.5 Drop musl patch and backport a fix from upstream instead. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...01-xdr_float-do-not-include-bits-endian.h.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc/musl.patch | 30 ------------------- .../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 ++-- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch new file mode 100644 index 0000000..3797cdf --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch @@ -0,0 +1,34 @@ +From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Tue, 21 Jan 2020 11:51:16 -0500 +Subject: [PATCH] xdr_float: do not include bits/endian.h + +bits/endian.h is an internal header. endian.h should be included. + +Fixes compilation with recent musl. + +Signed-off-by: Rosen Penev +Signed-off-by: Steve Dickson + +Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1] +Signed-off-by: Anuj Mittal +--- + src/xdr_float.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xdr_float.c b/src/xdr_float.c +index 26bc865..349d48f 100644 +--- a/src/xdr_float.c ++++ b/src/xdr_float.c +@@ -83,7 +83,7 @@ static struct sgl_limits { + }; + #else + +-#include ++#include + #define IEEEFP + + #endif /* vax */ +-- +2.21.1 + diff --git a/meta/recipes-extended/libtirpc/libtirpc/musl.patch b/meta/recipes-extended/libtirpc/libtirpc/musl.patch deleted file mode 100644 index 21cd9f9..0000000 --- a/meta/recipes-extended/libtirpc/libtirpc/musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -Consider musl provided built-in defines - -Helps compile libtirpc with musl -bits/endian.h is not supposed to be included directly - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/tirpc/rpc/types.h -+++ b/tirpc/rpc/types.h -@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif ---- a/src/xdr_float.c -+++ b/src/xdr_float.c -@@ -83,7 +83,7 @@ static struct sgl_limits { - }; - #else - --#include -+#include - #define IEEEFP - - #endif /* vax */ diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb similarity index 81% rename from meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb rename to meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb index 53ed5e8..fc66821 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ PROVIDES = "virtual/librpc" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ - file://musl.patch \ + file://0001-xdr_float-do-not-include-bits-endian.h.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a" -SRC_URI[sha256sum] = "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d" +SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1" +SRC_URI[sha256sum] = "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:16 +0000 Subject: [oe-commits] [openembedded-core] 11/13: gstreamer1.0-plugins-common.inc: disable orc on mips In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.B82FC2329C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b80bf495326077c682b6dfdd2461087dd61c2f99 Author: Mingli Yu AuthorDate: Wed Jan 22 00:35:47 2020 -0800 gstreamer1.0-plugins-common.inc: disable orc on mips After transiton to meson build for gstreamer series, for gstreamer1.0-plugins-base, with below two commits introduced: 238080ed89 gstreamer: Remove unused common files and patches 20614408dc gstreamer1.0-plugins-base: Transition to meson based builds With below config in local.conf MACHINE ??= "qemumips64" require conf/multilib.conf MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" there comes below failure: $ bitbake lib32-gstreamer1.0-plugins-base [snip] mips-pokymllib32-linux-gcc -meb -mabi=32 -mhard-float -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot -Itests/check/7d01337@@orc_video at exe -Itests/check -I../gst-plugins-base-1.16.1/tests/check -I/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot/usr/include/orc-0.4 -fdiagn [...] sr/src/debug/lib32-gstreamer1.0-plugins-base/1.16.1-r0 -fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0=/usr/src/debug/lib32-gstreamer1.0-plugins-base/1.16.1-r0 -fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot= -fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/recipe-sysroot-native= -MD -MQ 'tests/check/7d01 [...] FAILED: tests/check/7d01337@@orc_video at exe/meson-generated_.._orc_video.c.o {standard input}: Assembler messages: {standard input}:46587: Error: branch out of range {standard input}:46613: Error: branch out of range [snip] BTW, gstreamer1.0-plugins-good also occurs the same build failure as above. Disable orc as workaround to fix the above issue Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc index ccf5550..dba96e0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc @@ -18,7 +18,10 @@ require gstreamer1.0-plugins-packaging.inc # This value is used in the PACKAGECONFIG values for each plugin set recipe. # By modifying it, Orc can be enabled/disabled in all of these recipes at once. GSTREAMER_ORC ?= "orc" - +# workaround to disable orc on mips to fix the build failure +# {standard input}: Assembler messages: +# {standard input}:46587: Error: branch out of range +GSTREAMER_ORC_mips = "" PACKAGECONFIG[orc] = "-Dorc=enabled,-Dorc=disabled,orc orc-native" # TODO: put this in a gettext.bbclass patch (with variables to allow for -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:33:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:33:18 +0000 Subject: [oe-commits] [openembedded-core] 13/13: rsync: whitelist CVE-2017-16548 In-Reply-To: <158077278594.12355.10377392529095800703@git.openembedded.org> References: <158077278594.12355.10377392529095800703@git.openembedded.org> Message-ID: <20200203233306.CC0D22329C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df5d2c4c65dc57c4901fbc0cc2af20e0cb485ecd Author: Lee Chee Yang AuthorDate: Tue Jan 21 13:26:47 2020 +0800 rsync: whitelist CVE-2017-16548 patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d06..152ff02 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:31 +0000 Subject: [oe-commits] [openembedded-core] 01/10: lttng-modules: update to 2.11.1 In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.281E4232970@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cc4b0ff4c2f64a6d1c8911efe2547e82962b7abc Author: He Zhe AuthorDate: Mon Feb 3 15:47:42 2020 +0800 lttng-modules: update to 2.11.1 Fix build failure with kernel v5.5. Remove patches as issues fixed upstream. Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- ...Fix-oops-when-trace-sunrpc_task-events-in.patch | 94 --------------- ...null-rpc_clnt-dereference-in-rpc_task_que.patch | 44 ------- ...x-sunrpc-use-signed-integer-for-client-id.patch | 105 ----------------- ...04-sunrpc-introduce-lttng_get_clid-helper.patch | 130 --------------------- ...g-modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 +-- 5 files changed, 6 insertions(+), 383 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch deleted file mode 100644 index bdbc4f8..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1ff7013bcf7f068cf4371d12d758f9c0fd16a619 Mon Sep 17 00:00:00 2001 -From: Quanyang Wang -Date: Thu, 5 Dec 2019 15:35:32 +0800 -Subject: [PATCH 1/4] Fix: SUNRPC: Fix oops when trace sunrpc_task events in - nfs client - -See upstream commit : - - commit 2ca310fc4160ed0420da65534a21ae77b24326a8 - Author: Ditang Chen - Date: Fri, 7 Mar 2014 13:27:57 +0800 - Subject: SUNRPC: Fix oops when trace sunrpc_task events in nfs client - - When tracking sunrpc_task events in nfs client, the clnt pointer may be NULL. - - [ 139.269266] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 - [ 139.269915] IP: [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] PGD 1d293067 PUD 1d294067 PMD 0 - [ 139.269915] Oops: 0000 [#1] SMP - [ 139.269915] Modules linked in: nfsv4 dns_resolver nfs lockd sunrpc fscache sg ppdev e1000 - serio_raw pcspkr parport_pc parport i2c_piix4 i2c_core microcode xfs libcrc32c sd_mod sr_mod - cdrom ata_generic crc_t10dif crct10dif_common pata_acpi ahci libahci ata_piix libata dm_mirror - dm_region_hash dm_log dm_mod - [ 139.269915] CPU: 0 PID: 59 Comm: kworker/0:2 Not tainted 3.10.0-84.el7.x86_64 #1 - [ 139.269915] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 - [ 139.269915] Workqueue: rpciod rpc_async_schedule [sunrpc] - [ 139.269915] task: ffff88001b598000 ti: ffff88001b632000 task.ti: ffff88001b632000 - [ 139.269915] RIP: 0010:[] [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] RSP: 0018:ffff88001b633d70 EFLAGS: 00010206 - [ 139.269915] RAX: ffff88001dfc5338 RBX: ffff88001cc37a00 RCX: ffff88001dfc5334 - [ 139.269915] RDX: ffff88001dfc5338 RSI: 0000000000000000 RDI: ffff88001dfc533c - [ 139.269915] RBP: ffff88001b633db0 R08: 000000000000002c R09: 000000000000000a - [ 139.269915] R10: 0000000000062180 R11: 00000020759fb9dc R12: ffffffffa0292c20 - [ 139.269915] R13: ffff88001dfc5334 R14: 0000000000000000 R15: 0000000000000000 - [ 139.269915] FS: 0000000000000000(0000) GS:ffff88001fc00000(0000) knlGS:0000000000000000 - [ 139.269915] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b - [ 139.269915] CR2: 0000000000000004 CR3: 000000001d290000 CR4: 00000000000006f0 - [ 139.269915] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 - [ 139.269915] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 - [ 139.269915] Stack: - [ 139.269915] 000000001b633d98 0000000000000246 ffff88001df1dc00 ffff88001cc37a00 - [ 139.269915] ffff88001bc35e60 0000000000000000 ffff88001ffa0a48 ffff88001bc35ee0 - [ 139.269915] ffff88001b633e08 ffffffffa02704b5 0000000000010000 ffff88001cc37a70 - [ 139.269915] Call Trace: - [ 139.269915] [] __rpc_execute+0x1d5/0x400 [sunrpc] - [ 139.269915] [] rpc_async_schedule+0x26/0x30 [sunrpc] - [ 139.269915] [] process_one_work+0x17b/0x460 - [ 139.269915] [] worker_thread+0x11b/0x400 - [ 139.269915] [] ? rescuer_thread+0x3e0/0x3e0 - [ 139.269915] [] kthread+0xc0/0xd0 - [ 139.269915] [] ? kthread_create_on_node+0x110/0x110 - [ 139.269915] [] ret_from_fork+0x7c/0xb0 - [ 139.269915] [] ? kthread_create_on_node+0x110/0x110 - [ 139.269915] Code: 4c 8b 45 c8 48 8d 7d d0 89 4d c4 41 89 c9 b9 28 00 00 00 e8 9d b4 e9 - e0 48 85 c0 49 89 c5 74 a2 48 89 c7 e8 9d 3f e9 e0 48 89 c2 <41> 8b 46 04 48 8b 7d d0 4c - 89 e9 4c 89 e6 89 42 0c 0f b7 83 d4 - [ 139.269915] RIP [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] RSP - [ 139.269915] CR2: 0000000000000004 - [ 140.946406] ---[ end trace ba486328b98d7622 ]--- - -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2b228b503cad10bf0c5a99b42a908ca906eab5b9] - -Signed-off-by: Quanyang Wang -Signed-off-by: Mathieu Desnoyers ---- - instrumentation/events/lttng-module/rpc.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 3798e8e..fb13106 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -139,7 +139,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -208,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch deleted file mode 100644 index 03264ba..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 032a74d83b263c4faead8e4c25d497fb8ea07b6e Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:29:02 -0500 -Subject: [PATCH 2/4] Fix: sunrpc: null rpc_clnt dereference in rpc_task_queued - tracepoint - -Based on upstream Linux commit: - -commit 0be283f676a1e7b208db0c992283197ef8b52158 -Author: Benjamin Coddington -Date: Tue Jan 23 09:32:35 2018 -0500 - - SUNRPC: Fix null rpc_clnt dereference in rpc_task_queued tracepoint - - Backchannel tasks will not have a reference to the rpc_clnt. Return -1 for - cl_clid in that case. - - Signed-off-by: Benjamin Coddington - Signed-off-by: Trond Myklebust - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/8f83a9103dcdf4f6b73783427fc5ded4869309d5] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index fb13106..68c622c 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -176,7 +176,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch deleted file mode 100644 index c7529f1..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 70389e422dd3146161089d454f525367c9046ecd Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:29:37 -0500 -Subject: [PATCH 3/4] Fix: sunrpc: use signed integer for client id - -Within include/linux/sunrpc/clnt.h:struct rpc_cltn, the cl_clid field -is an unsigned integer, which is the type expected by the tracepoint -signature. - -However, looking into net/sunrpc/clnt.c:rpc_alloc_clid(), its allocation -considers negative signed integer as errors. - -Therefore, in order to properly show "-1" in the trace output (rather -than MAX_INT) when called with a NULL task->tk_client, move to a -signed integer as backing type for the client_id field. - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/cc7bb0aa52cae22255581d67841449bb8ea36fda] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 68c622c..2d06e55 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -18,7 +18,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -43,7 +43,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -100,7 +100,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -112,7 +112,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, status) - ) - ) -@@ -139,7 +139,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -176,7 +177,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? -+ ctf_integer(int, client_id, task->tk_client ? - task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) -@@ -209,7 +210,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -246,7 +248,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch deleted file mode 100644 index 4dd726c..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch +++ /dev/null @@ -1,130 +0,0 @@ -From b6903d57e4c3234ec5b1c7f72e232023cdee0fab Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:39:38 -0500 -Subject: [PATCH 4/4] sunrpc: introduce lttng_get_clid helper - -Introduce the lttng_get_clid helper to always check for NULL pointer -when getting the client id. While not always strictly needed depending -on the tracepoint callsite, prefer robustness of instrumentation and -always check for NULL rather than play whack-a-mole. - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/1330a091a687a406513c3a326c2fc2a0dbe75536] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 43 ++++++++++++++++------- - 1 file changed, 31 insertions(+), 12 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 2d06e55..ceaf9db 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -9,6 +9,29 @@ - #include - #include - -+#ifndef ONCE_LTTNG_RPC_H -+#define ONCE_LTTNG_RPC_H -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) -+static inline -+int lttng_get_clid(const struct rpc_task *task) -+{ -+ struct rpc_clnt *tk_client; -+ -+ tk_client = task->tk_client; -+ if (!tk_client) -+ return -1; -+ /* -+ * The cl_clid field is always initialized to positive signed -+ * integers. Negative signed integer values are treated as -+ * errors. -+ */ -+ return (int) tk_client->cl_clid; -+} -+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -+ -+#endif /* ONCE_LTTNG_RPC_H */ -+ - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - -@@ -18,7 +41,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -43,7 +66,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -100,7 +123,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -112,7 +135,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, status) - ) - ) -@@ -139,8 +162,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -177,8 +199,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -210,8 +231,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -248,8 +268,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb similarity index 68% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index 3465a43..c833ff7 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -35,13 +31,13 @@ python do_package_prepend() { } BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" -PV_class-devupstream = "2.10.10+git${SRCPV}" +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV_class-devupstream = "2.11.1+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:33 +0000 Subject: [oe-commits] [openembedded-core] 03/10: podfix: remove In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.3F03D2329A0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit efabe1f25a74b1a599072bb22762fe16a987d4f2 Author: Ross Burton AuthorDate: Mon Feb 3 10:19:55 2020 +0000 podfix: remove Now that we don't use the host pod2man (oe-core deda455) the podfix class is redundant and can be removed. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/podfix.bbclass | 35 -------------------------- meta/classes/reproducible_build_simple.bbclass | 2 -- 2 files changed, 37 deletions(-) diff --git a/meta/classes/podfix.bbclass b/meta/classes/podfix.bbclass deleted file mode 100644 index cc8210a..0000000 --- a/meta/classes/podfix.bbclass +++ /dev/null @@ -1,35 +0,0 @@ -python pod_strip_version() { - import re - - def opener(filename, mode): - if filename.endswith(".gz"): - import gzip - return gzip.open(filename, mode) - elif filename.endswith(".bz2"): - import bz2 - return bz2.open(filename, mode) - else: - return open(filename, mode) - - bad_re = re.compile(rb"Automatically generated by Pod::Man( [0-9]+.+)") - - for root, dirs, files in os.walk(d.expand("${D}${mandir}")): - for filename in files: - filename = os.path.join(root, filename) - if not os.path.isfile(filename): - continue - - with opener(filename, "rb") as manfile: - manpage = manfile.read() - m = bad_re.search(manpage) - if not m: - continue - - bb.note("podfix: stripping version from %s" % filename) - os.unlink(filename) - with opener(filename, "wb") as manfile: - manfile.write(manpage[:m.start(1)]) - manfile.write(manpage[m.end(1):]) -} - -do_install[postfuncs] += "pod_strip_version" diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 153a076..3e5fd82 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -8,5 +8,3 @@ export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" - -inherit podfix -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:30 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (df5d2c4 -> 8a86e97) Message-ID: <158077293079.13331.750789092914847070@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from df5d2c4 rsync: whitelist CVE-2017-16548 new cc4b0ff lttng-modules: update to 2.11.1 new ed145d7 ifupdown: add ptest new efabe1f podfix: remove new 2a563a5 piglit: don't stage the test suite new d99ef30 oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True new 9a5f65e rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True new fd9553b kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled new 8ccef8c python3-six: Move src_uri checks to recipe main new f516cf3 systemd: Upgrade 243.2 -> 243.4-latest new 8a86e97 kernel-yocto.bbclass: export LD in the environment used by kconf_check The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel-yocto.bbclass | 1 + meta/classes/kernel.bbclass | 2 +- meta/classes/podfix.bbclass | 35 ----- meta/classes/reproducible_build_simple.bbclass | 2 - meta/lib/oeqa/controllers/masterimage.py | 2 +- meta/lib/oeqa/core/target/ssh.py | 2 +- meta/lib/oeqa/utils/sshcontrol.py | 2 +- .../{kbd/kbd => ifupdown/files}/run-ptest | 2 +- .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 ++++-------- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/0004-rules-whitelist-hd-devices.patch | 34 ----- ...les-watch-metadata-changes-in-ide-devices.patch | 45 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 4 - meta/recipes-devtools/python/python-six.inc | 3 - meta/recipes-devtools/python/python3-six_1.14.0.bb | 2 + meta/recipes-graphics/piglit/piglit_git.bb | 5 + ...Fix-oops-when-trace-sunrpc_task-events-in.patch | 94 ------------- ...null-rpc_clnt-dereference-in-rpc_task_que.patch | 44 ------ ...x-sunrpc-use-signed-integer-for-client-id.patch | 105 -------------- ...04-sunrpc-introduce-lttng_get_clid-helper.patch | 130 ------------------ ...g-modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 +-- meta/recipes-rt/rt-tests/files/rt_bmark.py | 4 +- 28 files changed, 124 insertions(+), 785 deletions(-) delete mode 100644 meta/classes/podfix.bbclass copy meta/recipes-core/{kbd/kbd => ifupdown/files}/run-ptest (54%) create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch rename meta/recipes-core/systemd/{systemd-boot_243.2.bb => systemd-boot_243.4.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch delete mode 100644 meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch delete mode 100644 meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch rename meta/recipes-core/systemd/{systemd_243.2.bb => systemd_243.4.bb} (99%) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:32 +0000 Subject: [oe-commits] [openembedded-core] 02/10: ifupdown: add ptest In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.365A3232974@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ed145d7da5622d0937657048f8d8ae6d57dc4344 Author: Kai Kang AuthorDate: Mon Feb 3 17:33:11 2020 +0800 ifupdown: add ptest Add ptest for ifupdown with its own test cases. [Yocto #13736] Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 ++++++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 ++++- 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/ifupdown/files/run-ptest b/meta/recipes-core/ifupdown/files/run-ptest new file mode 100644 index 0000000..8694042 --- /dev/null +++ b/meta/recipes-core/ifupdown/files/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linux diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file mode 100644 index 0000000..d7600cf --- /dev/null +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -e + +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test + + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test + + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then +- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "==========" diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb index 0de97fe..53cb971 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb @@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" S = "${WORKDIR}/git" -inherit update-alternatives +inherit ptest update-alternatives do_compile () { chmod a+rx *.pl *.sh @@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} + ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "ifup ifdown" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:34 +0000 Subject: [oe-commits] [openembedded-core] 04/10: piglit: don't stage the test suite In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.49D632329BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2a563a5bd1cb59d9e494461dc94f7c2b364d9aad Author: Ross Burton AuthorDate: Mon Feb 3 12:32:25 2020 +0000 piglit: don't stage the test suite The Piglit test suite is approximately 2GB and because it's installed into $libdir is added to the sysroot archive. Nothing links against Piglit so there's no reason for this, so remove $libdir from Piglit's sysroot. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/piglit/piglit_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index d0d8331..58d10d6 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -44,6 +44,7 @@ do_configure_prepend() { fi } +# Forcibly strip because Piglit is *huge* OECMAKE_TARGET_INSTALL = "install/strip" RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ @@ -55,5 +56,9 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ INSANE_SKIP_${PN} += "dev-so already-stripped" +# As nothing builds against Piglit we don't need to have anything in the +# sysroot, especially when this is ~2GB of test suite +SYSROOT_DIRS_remove = "${libdir}" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:36 +0000 Subject: [oe-commits] [openembedded-core] 06/10: rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.5F4E02329BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9a5f65e5356a195e7865549156e7251b1e1010c3 Author: Andr? Draszik AuthorDate: Mon Feb 3 17:28:13 2020 +0000 rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True start_new_session was added to python3 subprocess in v3.2 and is meant to take the place of the common use of preexec_fn to call os.setsid() in the child - as done here. Update to use the new equivalent. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-rt/rt-tests/files/rt_bmark.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py index 57b39b5..3b84447 100755 --- a/meta/recipes-rt/rt-tests/files/rt_bmark.py +++ b/meta/recipes-rt/rt-tests/files/rt_bmark.py @@ -166,12 +166,12 @@ def start_stress(*args): log(" Command: '", stress_cmd_str, "'") log() - # preexec_fn=os.setsid causes stress to be executed in a separate + # start_new_session causes stress to be executed in a separate # session, => it gets a new process group (incl. children). It # can then be terminated using os.killpg in end_stress without # terminating this script. - p = subprocess.Popen(stress_cmd, preexec_fn=os.setsid) + p = subprocess.Popen(stress_cmd, start_new_session=True) return p -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:35 +0000 Subject: [oe-commits] [openembedded-core] 05/10: oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.540A12329BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d99ef3005033beb93323dad13abab9a8d6e94161 Author: Andr? Draszik AuthorDate: Mon Feb 3 17:28:12 2020 +0000 oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True start_new_session was added to python3 subprocess in v3.2 and is meant to take the place of the common use of preexec_fn to call os.setsid() in the child - as done here. Update to use the new equivalent. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/lib/oeqa/controllers/masterimage.py | 2 +- meta/lib/oeqa/core/target/ssh.py | 2 +- meta/lib/oeqa/utils/sshcontrol.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index 0435dfa..0bf5917 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/masterimage.py @@ -97,7 +97,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta if self.powercontrol_cmd: cmd = "%s %s" % (self.powercontrol_cmd, msg) try: - commands.runCmd(cmd, assert_error=False, preexec_fn=os.setsid, env=self.origenv) + commands.runCmd(cmd, assert_error=False, start_new_session=True, env=self.origenv) except CommandError as e: bb.fatal(str(e)) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 63fc946..090b40a 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -247,7 +247,7 @@ def SSHCall(command, logger, timeout=None, **opts): "stdin": None, "shell": False, "bufsize": -1, - "preexec_fn": os.setsid, + "start_new_session": True, } options.update(opts) output = '' diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index 49a0726..36c2ecb 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py @@ -23,7 +23,7 @@ class SSHProcess(object): "stdin": None, "shell": False, "bufsize": -1, - "preexec_fn": os.setsid, + "start_new_session": True, } self.options = dict(self.defaultopts) self.options.update(options) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:37 +0000 Subject: [oe-commits] [openembedded-core] 07/10: kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.6BE7E2329BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fd9553bc7555919700503bcc8a8f124f704b3451 Author: Martin Jansa AuthorDate: Mon Feb 3 19:11:50 2020 +0100 kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled * with 5.4 kernel the do_configure fails when gold is enabled (with ld-is-gold in DISTRO_FEATURES) * bfd is already being set in KERNEL_LD: kernel-arch.bbclass:KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" but KERNEL_LD is currently respected only by do_compile and do_compile_kernel modules and new kernel which contains a check for gold in Kbuild: https://lore.kernel.org/lkml/alpine.DEB.2.21.1907161434260.1767 at nanos.tec.linutronix.de/ more details: https://lore.kernel.org/r/CAMe9rOqMqkQ0LNpm25yE_Yt0FKp05WmHOrwc0aRDb53miFKM+w at mail.gmail.com will fail during the configuration even when gold wouldn't be used to build it in the end, add LD setting to KERNEL_CONFIG_COMMAND to prevent premature error when configuring scripts/kconfig/conf --olddefconfig Kconfig scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 750988f..15219c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -508,7 +508,7 @@ sysroot_stage_all () { : } -KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" oldnoconfig" +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" LD="${KERNEL_LD}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" LD="${KERNEL_LD}" oldnoconfig" python check_oldest_kernel() { oldest_kernel = d.getVar('OLDEST_KERNEL') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:38 +0000 Subject: [oe-commits] [openembedded-core] 08/10: python3-six: Move src_uri checks to recipe main In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.787B52329C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ccef8c209bb1caba01e260114e2beb6d9aaf841 Author: Khem Raj AuthorDate: Mon Feb 3 12:50:49 2020 -0800 python3-six: Move src_uri checks to recipe main .inc is used by other versions of recipe as well, therefore putting checksums in .inc will break them unless the version is same as in oe-core Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-six.inc | 3 --- meta/recipes-devtools/python/python3-six_1.14.0.bb | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index bbbddbe..05b3281 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -4,9 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" -SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" -SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" - inherit pypi RDEPENDS_${PN} = "${PYTHON_PN}-io" diff --git a/meta/recipes-devtools/python/python3-six_1.14.0.bb b/meta/recipes-devtools/python/python3-six_1.14.0.bb index 99e6629..151c366 100644 --- a/meta/recipes-devtools/python/python3-six_1.14.0.bb +++ b/meta/recipes-devtools/python/python3-six_1.14.0.bb @@ -1,3 +1,5 @@ inherit setuptools3 require python-six.inc +SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" +SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:40 +0000 Subject: [oe-commits] [openembedded-core] 10/10: kernel-yocto.bbclass: export LD in the environment used by kconf_check In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.95B1B2329C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8a86e971b7690e2cd36e9b46ba82c8c7a9d05750 Author: Martin Jansa AuthorDate: Mon Feb 3 23:44:20 2020 +0100 kernel-yocto.bbclass: export LD in the environment used by kconf_check * resolves following exceptions in log.do_kernel_configcheck: DEBUG: Executing python function do_kernel_configcheck Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ self._init(filename, warn, warn_to_stderr, encoding) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init self._parse_block(None, self.top_node, self.top_node).next = None File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block prev = self._parse_block(None, parent, prev) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block while self._next_line(): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line self._tokens = self._tokenize(line) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize self._parse_assignment(s) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment s, i = self._expand_macro(s, i, ()) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro res += self._fn_val(new_args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val return py_fn(self, *args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn kconf.filename, kconf.linenr, msg)) kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' * there is still 291 mismatched options in default 5.4.15 builds, but at least the 11804 lines long log doesn't start with 9022 lines of above exceptions DEBUG: Executing python function do_kernel_configcheck [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt There were hardware options requested that do not have a corresponding value present in the final ".config" file. This probably means you aren't getting the config you wanted. WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: ... Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 87c681f..141eeaf 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -370,6 +370,7 @@ python do_kernel_configcheck() { env = os.environ.copy() env['PATH'] = "%s:%s%s" % (d.getVar('PATH'), s, "/scripts/util/") + env['LD'] = "${KERNEL_LD}" try: configs = subprocess.check_output(['scc', '--configs', '-o', s + '/.kernel-meta'], env=env).decode('utf-8') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:35:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:35:39 +0000 Subject: [oe-commits] [openembedded-core] 09/10: systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: <158077293079.13331.750789092914847070@git.openembedded.org> References: <158077293079.13331.750789092914847070@git.openembedded.org> Message-ID: <20200203233531.897172329C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f516cf3fff54efffd53a28069b483702ffde2a8e Author: Alex Kiernan AuthorDate: Mon Feb 3 22:35:26 2020 +0000 systemd: Upgrade 243.2 -> 243.4-latest Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. Refresh: 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0001-do-not-disable-buffer-in-writing-files.patch Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Drop 0004-rules-whitelist-hd-devices.patch and 0005-rules-watch-metadata-changes-in-ide-devices.patch which cause ide-cd to flap with tray open messages (and don't appear to be required any more) Commits from v243-stable: 70e8c1978a9a seccomp: real syscall numbers are >= 0 a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change b59d88cc62a4 man: fix typo in net-naming-scheme man page c5e5ac095821 man: fix typos (#14304) 9a2f26564d5a ipv4ll: do not reset conflict counter on restart bc9e1ebfdd3b Fix typo (duplicate "or") c6cb71b7e741 network: if /sys is rw, then udev should be around 67dcdfd95629 nspawn: do not fail if udev is not running a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative b1cf452ff5f6 systemctl: enhance message about kexec missing kernel 07a0e5b42523 man: use mkswap@ instead of makeswap@ 57dc017c6bac journald: don't ask for the machine ID if we don't need it ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field 471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61a0 man: drop reference to machined, add one for journald instead fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b2378 shared/ask-password-api: modify keyctl break value a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed 4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit() d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be* a67a3ae04b89 man: document all pager variables for systemctl and systemd 3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug 733e7f19d3cf travis: add missing closing quote sign 0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter= aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules b9a619bb6738 udevadm: ignore EROFS and return earlier 1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree 7fa7080248aa umount: be happy if /proc/swaps doesn't exist 71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools b50ca0152681 core: do not propagate polkit error to caller 99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list 37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault 3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC 2139d58652bb bpf: fix off-by-one in class whitelisting cb7693595db9 bpf: fix device type filter 56e1ba304b00 core: constify bpf program arrays b06b7ace92c1 run: propagate return code/status from the child 5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection 8d88a2ecd7ce udev: fix error code in the log message c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node f218b65b3246 udev: do not append newline when write attributes ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone 8b888d236007 seccomp: add all *time64 syscalls 53d8feeb2334 libblkid: open device in nonblock mode. b9478046b03d man: describe ordering in case of Conflicts= fa3e5bd2bbb4 man: put description of Wants= above Requires= bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page 9c12127e3d2e man: save pull-raw example file without underscores 4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page 03cc374fca74 shared/format-table: disable ellipsization when piped 0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too fc0451bc0a3f allow an empty DefaultInstance= in configuration files 587266c24aae man/systemd.net-naming-scheme: fix typo e0e63f0f9bb9 nspawn: respect quiet on capabilities warning 37e50c05b564 nspawn: mangle slice name 4fefc493541e mkosi: Find hostname command on Arch Linux c430e8affba4 Fix mkosi on Arch Linux 1765b8d803dd Update to Fedora31 0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2 24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available 14e377ef3519 sd-boot: Only disable optimization on debug builds a39008ddecb9 meson: correct man page deps 4c1dcc06fa30 sd-event: don't invalidate source type on disconnect fb89ee34cedc analyze: fix minor memleak a449299bc087 analyze: sort list of unknown syscalls kernel implements 51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists 819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq d2b4d7ee17de network-generator: Add missing help for --root f1b18c206208 modules-load: do not fail service if modules are not present 606de6626714 pid1: order .automount units after local-fs-pre.target 1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command 00af6c447f25 resolved: set stream type during DnsStream creation 66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function 34fa67bbe732 machine-id-setup: avoid unexpected aborting 24c99fa2ef3d test-socket-util: avoid writing past the defined buffer ce82233f99b3 test: drop duplicated 's' 75a0e7209114 nspawn: fix handling of --console=help f41a282875fc Revert "sysusers: properly mark generated accounts as locked" fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users 6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS 961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure 19590e289ace ceph is a network filesystem 339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func 47d0e23d26af udev: fix memleak caused by wrong cleanup function a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.* cb1d892f1780 parse_hwdb: process files in order ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range 25bb377a73e7 cgroup: fix typo in BPF firewall support warning message 6d97aca0d503 fix build with compilers with default stack-protector enabled fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p 20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV 6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment 9d8e889810b5 nspawn: consistenly fail if parsing the environment fails 40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min ea248e53bf76 cgroup: Check ancestor memory min for unified memory config de1d25a506db cgroup: docs: memory.high doc fixups 2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem 5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly 8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments a0577353f191 man: Add a missing space in machinectl(1) 693e98398869 log: Add missing "%" in "%m" log format strings ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 ++++-------- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/0004-rules-whitelist-hd-devices.patch | 34 ----- ...les-watch-metadata-changes-in-ide-devices.patch | 45 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 4 - 9 files changed, 45 insertions(+), 354 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.2.bb b/meta/recipes-core/systemd/systemd-boot_243.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.2.bb rename to meta/recipes-core/systemd/systemd-boot_243.4.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 18f17d2..2fca6dc 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" +SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +PV = "243.4+git${SRCPV}" + S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff..ea37680 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/units/meson.build b/units/meson.build -index e1ee9f86c3..6bb7771b36 100644 ---- a/units/meson.build -+++ b/units/meson.build +Index: systemd-stable/units/meson.build +=================================================================== +--- systemd-stable.orig/units/meson.build ++++ systemd-stable/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 30a6bc9918..4231f3b70f 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount +Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount ++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index e940c7c9ad..6be7f5cc9b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +Index: systemd-stable/units/systemd-binfmt.service.in +=================================================================== +--- systemd-stable.orig/units/systemd-binfmt.service.in ++++ systemd-stable/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount + After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target - ConditionPathIsReadWrite=/proc/sys/ -@@ -28,3 +29,6 @@ Type=oneshot +@@ -29,3 +30,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt TimeoutSec=90s diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 2f4daf8..d6d68a0 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -38,11 +38,9 @@ Signed-off-by: Scott Murray src/vconsole/vconsole-setup.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -51,7 +49,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -105,11 +103,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,11 +121,9 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -138,8 +132,6 @@ index 123d00e13e..e7ea78f349 100644 if (r < 0) return r; -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -294,7 +294,7 @@ void disable_coredumps(void) { @@ -151,11 +143,9 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) if (!fn) return log_oom(); @@ -164,7 +154,7 @@ index aa9d811f2e..8c7f2dae7a 100644 } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) (void) delete_rule(rule); @@ -182,11 +172,9 @@ index aa9d811f2e..8c7f2dae7a 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -195,7 +183,7 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -204,11 +192,9 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) } #ifdef SMACK_RUN_LABEL @@ -230,8 +216,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,11 +227,9 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -256,11 +238,9 @@ index c4a7f2f3d3..bcac758284 100644 if (r < 0) { if (r == -ELOOP) return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { +@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd if (!t) return -ENOMEM; @@ -269,11 +249,9 @@ index 30b9a66334..cc1d577933 100644 } return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +260,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,7 +271,7 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -311,11 +287,9 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c +@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con log_debug("Setting '%s' to '%s'", p, value); @@ -324,11 +298,9 @@ index 93bdcf11bf..68cddb7a9f 100644 } int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +@@ -54,7 +54,7 @@ static int write_hibernate_location_info /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { @@ -337,7 +309,7 @@ index b9fe96635d..f168d7f890 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +@@ -98,14 +98,14 @@ static int write_hibernate_location_info offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); @@ -363,7 +335,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,24 +344,20 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 + bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { +@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -398,11 +366,9 @@ index cb5123042a..ea309a9e7f 100644 if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch b/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted file mode 100644 index f359d28..0000000 --- a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Nov 2019 17:51:30 +0100 -Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's - __NR_xyz namespace invasion - -A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the -same conditioning for all cases of our __NR_xyz use. - -Fixes: #14031 - -Reference: -https://github.com/systemd/systemd/pull/14032/commits/62f66fdbcc33580467c01b1f149474b6c973df5a - -Upstream-Status: Backport - -Signed-off-by: Ming Liu ---- - src/basic/missing_syscall.h | 10 +++++----- - src/test/test-seccomp.c | 19 ++++++++++--------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 6d9b125..1255d8b 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c - - #if !HAVE_KCMP - static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { --# ifdef __NR_kcmp -+# if defined __NR_kcmp && __NR_kcmp > 0 - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else - errno = ENOSYS; -@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i - - #if !HAVE_KEYCTL - static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { --# ifdef __NR_keyctl -+# if defined __NR_keyctl && __NR_keyctl > 0 - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; -@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg - } - - static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { --# ifdef __NR_add_key -+# if defined __NR_add_key && __NR_add_key > 0 - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; -@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip - } - - static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { --# ifdef __NR_request_key -+# if defined __NR_request_key && __NR_request_key > 0 - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; -@@ -496,7 +496,7 @@ enum { - static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, - unsigned long maxnode) { - long i; --# ifdef __NR_set_mempolicy -+# if defined __NR_set_mempolicy && __NR_set_mempolicy > 0 - i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); - # else - errno = ENOSYS; -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 018c20f..c669204 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -28,7 +28,8 @@ - #include "tmpfile-util.h" - #include "virt.h" - --#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) -+/* __NR_socket may be invalid due to libseccomp */ -+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) - /* On these archs, socket() is implemented via the socketcall() syscall multiplexer, - * and we can't restrict it hence via seccomp. */ - # define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1 -@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) { - assert_se(pid >= 0); - - if (pid == 0) { --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); - #endif - - assert_se(seccomp_protect_sysctl() >= 0); - --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0); - assert_se(errno == EPERM); - #endif -@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(poll(NULL, 0, 0) == 0); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0); -@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); -@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) { - * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On - * other architectures, let's just fall back to the glibc call. */ - --#ifdef SYS_open -- return (int) syscall(SYS_open, path, flags, mode); -+#if defined __NR_open && __NR_open > 0 -+ return (int) syscall(__NR_open, path, flags, mode); - #else - return open(path, flags, mode); - #endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch b/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted file mode 100644 index ba20a0b..0000000 --- a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d0122c077d2d8fd0fd29b463c501e7ddf9177ff3 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 24 Sep 2019 17:04:50 +0800 -Subject: [PATCH] unit-file.c: consider symlink on filesystems like NFS - -Some filesystems do not fully support readdir, according to the manual, -so we should also consider DT_UNKNOWN to correctly handle symlinks. - -Signed-off-by: Chen Qi - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/13637] ---- - src/shared/unit-file.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c -index 4a5f23e6c1..8373103000 100644 ---- a/src/shared/unit-file.c -+++ b/src/shared/unit-file.c -@@ -247,6 +247,7 @@ int unit_file_build_name_map( - _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; - const char *suffix, *dst = NULL; - bool valid_unit_name; -+ struct stat sb; - - valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY); - -@@ -279,7 +280,10 @@ int unit_file_build_name_map( - if (hashmap_contains(ids, de->d_name)) - continue; - -- if (de->d_type == DT_LNK) { -+ if (de->d_type == DT_LNK || -+ (de->d_type == DT_UNKNOWN && -+ lstat(filename, &sb) == 0 && -+ (sb.st_mode & S_IFMT) == S_IFLNK)) { - /* We don't explicitly check for alias loops here. unit_ids_map_get() which - * limits the number of hops should be used to access the map. */ - --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch deleted file mode 100644 index f9c5996..0000000 --- a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dc0a6a9fe4da9738efaba942233ad39da625a918 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 21 Feb 2019 16:28:21 +0800 -Subject: [PATCH 4/5] rules: whitelist hd* devices - -qemu by default emulates IDE and the linux-yocto kernel(s) use -CONFIG_IDE instead of the more modern libsata, so disks appear as -/dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. - -Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] - -Signed-off-by: Patrick Ohly -Signed-off-by: Khem Raj -[rebased for systemd 241] -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - rules/60-persistent-storage.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index 7802b1c94f..c0534ae26a 100644 ---- a/rules/60-persistent-storage.rules -+++ b/rules/60-persistent-storage.rules -@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" - ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" - - SUBSYSTEM!="block", GOTO="persistent_storage_end" --KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end" -+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end" - - # ignore partitions that span the entire disk - TEST=="whole_disk", GOTO="persistent_storage_end" diff --git a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch deleted file mode 100644 index 96175b5..0000000 --- a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1bccc721dd8f43fee29c5df0e9b78345e69f4b6 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 21 Feb 2019 16:38:38 +0800 -Subject: [PATCH 5/5] rules: watch metadata changes in ide devices - -Formatting IDE storage does not trigger "change" uevents. As a result -clients using udev API don't get any updates afterwards and get outdated -information about the device. -... -root at qemux86-64:~# mkfs.ext4 -F /dev/hda1 -Creating filesystem with 262144 4k blocks and 65536 inodes -Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 - -root at qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 -ls: cannot access '/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory -... -Include hd* in a match for watch option assignment. - -Upstream-Status: Denied - -qemu by default emulates IDE and the linux-yocto kernel(s) use -CONFIG_IDE instead of the more modern libsata, so disks appear as -/dev/hd*. A similar patch rejected by upstream because CONFIG_IDE -is deprecated. - -Signed-off-by: Hongxu Jia -[rebased for systemd 241] -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - rules/60-block.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/60-block.rules b/rules/60-block.rules -index 3134ab995e..cd72a494a1 100644 ---- a/rules/60-block.rules -+++ b/rules/60-block.rules -@@ -9,5 +9,5 @@ ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", - - # watch metadata changes, caused by tools closing the device node which was opened for writing - ACTION!="remove", SUBSYSTEM=="block", \ -- KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", \ -+ KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", \ - OPTIONS+="watch" diff --git a/meta/recipes-core/systemd/systemd_243.2.bb b/meta/recipes-core/systemd/systemd_243.4.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.2.bb rename to meta/recipes-core/systemd/systemd_243.4.bb index e31fac8..a0d10e0 100644 --- a/meta/recipes-core/systemd/systemd_243.2.bb +++ b/meta/recipes-core/systemd/systemd_243.4.bb @@ -20,10 +20,6 @@ SRC_URI += "file://touchscreen.rules \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://0004-rules-whitelist-hd-devices.patch \ - file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ - file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \ file://99-default.preset \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:40:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:40:19 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: oeqa/reproducible: Improve test output and ensure deb+ipk compared Message-ID: <158077321971.15097.11166908817172018858@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 4e03804 oeqa/reproducible: Improve test output and ensure deb+ipk compared 4e03804 is described below commit 4e038046005b8ba7a34f548e2c74fa208e5b187e Author: Richard Purdie AuthorDate: Mon Feb 3 23:39:29 2020 +0000 oeqa/reproducible: Improve test output and ensure deb+ipk compared Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f..f6433c9 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 3 23:55:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Feb 2020 23:55:48 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: vlc: Link with libatomic on rv64 Message-ID: <158077414884.17914.6009785909574900758@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 5af9b2a vlc: Link with libatomic on rv64 5af9b2a is described below commit 5af9b2a3a9011a2dd7f6abab8ee58a92fe28d60a Author: Khem Raj AuthorDate: Mon Feb 3 15:50:01 2020 -0800 vlc: Link with libatomic on rv64 Fixes vlc-3.0.8/src/misc/picture_pool.c:200: undefined reference to `__atomic_fetch_add_2' vlc-3.0.8/src/audio_output/dec.c:201: undefined reference to `__atomic_exchange_1' Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb index e29ade6..7fadca4 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb @@ -13,6 +13,8 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ tiff" +LDFLAGS_append_riscv64 = " -latomic" + # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 06:51:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 06:51:11 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: nng: Add recipe In-Reply-To: <158079907039.16609.17244907152949403045@git.openembedded.org> References: <158079907039.16609.17244907152949403045@git.openembedded.org> Message-ID: <20200204065110.CC44C2329C5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 14e92f26794fca66b5f7cc7459e2757d9e7bd833 Author: Tom Rini AuthorDate: Mon Feb 3 15:08:32 2020 -0500 nng: Add recipe nng is the nanomsg project's rewrite of their libnanomsg library. Just like nanomsg it is a socket library that provides several common communication patterns. Unlike nanomsg it does not normally provide a number of tools and we do not attempt to add them here. We allow for optional mbedtls support. Signed-off-by: Tom Rini Signed-off-by: Khem Raj --- .../recipes-connectivity/nanomsg/nng_1.2.5.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb b/meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb new file mode 100644 index 0000000..77be27f --- /dev/null +++ b/meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb @@ -0,0 +1,21 @@ +SUMMARY = "nanomsg-next-generation -- light-weight brokerless messaging" +DESCRIPTION = "NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems, such as publish/subscribe, RPC-style request/reply, or service discovery." +HOMEPAGE = "https://github.com/nanomsg/nng" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a19b15be6e844b39a54de2ef665bd6de" + +SECTION = "libs/networking" + +SRCREV = "53ae1a5ab37fdfc9ad5c236df3eaf4dd63f0fee9" + +SRC_URI = "git://github.com/nanomsg/nng.git;branch=v1.2.x" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[mbedtls] = "-DNNG_ENABLE_TLS=ON,-DNNG_ENABLE_TLS=OFF,mbedtls" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 06:51:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 06:51:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (5af9b2a -> bceff42) Message-ID: <158079907039.16609.17244907152949403045@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 5af9b2a vlc: Link with libatomic on rv64 new 14e92f2 nng: Add recipe new d2e570b python3-imageio: add a new package. new 2baea2b phoronix-test-suite: change python to python3-core in RDEPENDS new bceff42 rsyslog: disable ptest as it requires python2 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-connectivity/nanomsg/nng_1.2.5.bb | 21 +++++++++++++++++++++ .../phoronix-test-suite_9.2.1.bb | 2 +- .../recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 4 +++- .../python/python3-imageio_2.6.0.bb | 14 ++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb create mode 100644 meta-python/recipes-devtools/python/python3-imageio_2.6.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 06:51:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 06:51:12 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: python3-imageio: add a new package. In-Reply-To: <158079907039.16609.17244907152949403045@git.openembedded.org> References: <158079907039.16609.17244907152949403045@git.openembedded.org> Message-ID: <20200204065110.D972D2329C6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d2e570b38c9c6a84696206cc14c09a76c3ed25ca Author: Naveen Saini AuthorDate: Tue Feb 4 09:41:10 2020 +0800 python3-imageio: add a new package. ImageIO is a Python library for doing basic I/O operations for images. This recipe is moved from meta-refkit-extra https://layers.openembedded.org/layerindex/recipe/68891/ upgraded from v2.2.0 -> v2.6.0 Signed-off-by: Ismo Puustinen Signed-off-by: Naveen Saini Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-imageio_2.6.0.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-imageio_2.6.0.bb b/meta-python/recipes-devtools/python/python3-imageio_2.6.0.bb new file mode 100644 index 0000000..8fe4b98 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-imageio_2.6.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Python library that provides an easy interface to read and \ +write a wide range of image data, including animated images, video, \ +volumetric data, and scientific formats." +SECTION = "devel/python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d8b7fdd0dff0fd18f35c05365d3d7bf7" + +SRC_URI = "git://github.com/imageio/imageio.git;protocol=https" +SRCREV = "0b161649b3ee108f80bd99466aeab2e65cf82cd8" +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} = "python3-numpy python3-pillow" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 06:51:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 06:51:13 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: phoronix-test-suite: change python to python3-core in RDEPENDS In-Reply-To: <158079907039.16609.17244907152949403045@git.openembedded.org> References: <158079907039.16609.17244907152949403045@git.openembedded.org> Message-ID: <20200204065110.E90952329C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2baea2b5822f117b41c26c6cedf14e118f437ddc Author: Qi.Chen at windriver.com AuthorDate: Mon Feb 3 18:23:10 2020 -0800 phoronix-test-suite: change python to python3-core in RDEPENDS The source codes are actually using python3 instead of python. Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- .../recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb index 52b341b..6525b8e 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb @@ -29,7 +29,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" -RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb-release" +RDEPENDS_${PN} += "bash python3-core php-cli util-linux-lscpu os-release lsb-release" FILES_${PN} += " \ ${datadir}/phoronix-test-suite \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 06:51:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 06:51:14 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: rsyslog: disable ptest as it requires python2 In-Reply-To: <158079907039.16609.17244907152949403045@git.openembedded.org> References: <158079907039.16609.17244907152949403045@git.openembedded.org> Message-ID: <20200204065111.088702329C8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bceff42e42b0fc937d772b2f50d55b44bfe47ff8 Author: Qi.Chen at windriver.com AuthorDate: Mon Feb 3 21:53:20 2020 -0800 rsyslog: disable ptest as it requires python2 Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb index 29bba2d..b109e4d 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb @@ -35,7 +35,9 @@ SRC_URI[sha256sum] = "e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f9 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" -inherit autotools pkgconfig systemd update-rc.d ptest +inherit autotools pkgconfig systemd update-rc.d +# ptest is disabled for now because it requires python2, after upstream solves this problem, re-enable it +# inherit ptest EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" EXTRA_OECONF += "--enable-imfile-tests" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 12:30:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 12:30:26 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: fixup Message-ID: <158081942694.22006.1770431749560383177@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 07433b7 fixup 07433b7 is described below commit 07433b7c5a43ea94a4036b7271b7c667eeda063d Author: Richard Purdie AuthorDate: Tue Feb 4 12:29:52 2020 +0000 fixup Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch index fca5e66..d206020 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -2,12 +2,14 @@ Index: opkg-utils-0.4.2/opkg-build =================================================================== --- opkg-utils-0.4.2.orig/opkg-build +++ opkg-utils-0.4.2/opkg-build -@@ -305,8 +305,8 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then mtime_args="--mtime=@$build_date --clamp-mtime" fi -( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) -( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C +( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) +( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:41:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:41:07 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (bceff42 -> e33a3db) Message-ID: <158083086769.23209.8390821203481600949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from bceff42 rsyslog: disable ptest as it requires python2 new b88a546 fio: Add support for PMDK engines new 89c8b9f Library to aid multi-part form data parsing new e33a3db smem: add a native variant The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + .../libmimetic/libmimetic/config.patch | 25 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 19 ++++++++++++++++ meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++ 4 files changed, 47 insertions(+) create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic/config.patch create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:41:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:41:08 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: fio: Add support for PMDK engines In-Reply-To: <158083086769.23209.8390821203481600949@git.openembedded.org> References: <158083086769.23209.8390821203481600949@git.openembedded.org> Message-ID: <20200204154108.14E722329CB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b88a5467b120722406b43d9eb033ae08dd672254 Author: Yongxin Liu AuthorDate: Tue Feb 4 13:49:22 2020 +0800 fio: Add support for PMDK engines "pmemblk", "dev-dax" and "libpmem" engines are used for persistent memory. In order to enable them, add "pmem" to MACHINE_FEATURES in BSP conf. Signed-off-by: Yongxin Liu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb index 5a9cc83..482928c 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -11,6 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" RDEPENDS_${PN} = "python3-core bash" PACKAGECONFIG_NUMA = "numa" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:41:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:41:10 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: smem: add a native variant In-Reply-To: <158083086769.23209.8390821203481600949@git.openembedded.org> References: <158083086769.23209.8390821203481600949@git.openembedded.org> Message-ID: <20200204154108.2F20B2329CE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e33a3dbfdfbced47bff248556dc5ab581e74ed6d Author: Andr? Draszik AuthorDate: Tue Feb 4 11:14:26 2020 +0000 smem: add a native variant The native variant is useful to e.g. examine captures of a running target on the host system. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb index 702217a..947c47b 100644 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ b/meta-oe/recipes-support/smem/smem_1.4.bb @@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codec PACKAGES =+ "smemcap" FILES_smemcap = "${bindir}/smemcap" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:41:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:41:09 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: Library to aid multi-part form data parsing In-Reply-To: <158083086769.23209.8390821203481600949@git.openembedded.org> References: <158083086769.23209.8390821203481600949@git.openembedded.org> Message-ID: <20200204154108.21B6E2329CD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 89c8b9f075aa22b50536f5eb8fe8749b1e74489b Author: asmitha AuthorDate: Tue Feb 4 14:51:26 2020 +0530 Library to aid multi-part form data parsing Mimetic library helps parsing the multi-part form data. This library can be used for scenarios that includes multi-part form data file uploads to the BMC. The patch file (config.patch) includes: i) addition of a compilation flag - "no-narrowing" since this has been treated as warning in earlier versions of c++ and now with the higher versions, this is treated as errors. ii) the test directory is removed as there were errors (relocation errors) since the shared object files of libc++ and libc were not taken from the sysroot path but from the system's library path where the required version of the .so is not present. Signed-off-by: asmitha Signed-off-by: Khem Raj --- .../libmimetic/libmimetic/config.patch | 25 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 19 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/config.patch b/meta-oe/recipes-support/libmimetic/libmimetic/config.patch new file mode 100644 index 0000000..52bf7b4 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/config.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 634bd4c..c7cbae7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST=LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc examples win32 + INCLUDES=-I$(top_srcdir) + ACLOCAL_AMFLAGS=-I m4 + +diff --git a/configure.in b/configure.in +index 5e8f3d4..af1018e 100644 +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ debug_enabled=false + dnl CFLAGS and CXXFLAGS default to -O2 -g + + dnl CXXFLAGS="$CXXFLAGS -DNDEBUG -fno-exceptions" +-CXXFLAGS="$CXXFLAGS -DNDEBUG" ++CXXFLAGS="$CXXFLAGS -DNDEBUG -Wno-narrowing" + + AC_ARG_ENABLE(debug, + [ --enable-debug[=LEVEL] enables debug symbols [default=2]], diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb new file mode 100644 index 0000000..a0a7041 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -0,0 +1,19 @@ +# Released under the MIT license. + +SUMMARY = "Mimetic Library for multi-part parsing" +DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." +AUTHOR = "Stefano Barbato " +HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" +BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" + +SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" +SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ + file://config.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:00 +0000 Subject: [oe-commits] [openembedded-core] 01/25: sudo: Set vardir deterministically In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.9ACAD2329CB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 39fe849b56d70689846262c31ab7c182c8443923 Author: Richard Purdie AuthorDate: Mon Feb 3 14:13:31 2020 +0000 sudo: Set vardir deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13775] Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo_1.8.29.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sudo/sudo_1.8.29.bb b/meta/recipes-extended/sudo/sudo_1.8.29.bb index 8da2d64..7089e1a 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.29.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.29.bb @@ -17,6 +17,7 @@ EXTRA_OECONF += " \ ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-vardir=/var/lib/sudo \ " do_install_append () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:01 +0000 Subject: [oe-commits] [openembedded-core] 02/25: libxshmfence: Set shm directory deterministically In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.A4BE82329CD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6217c3a7201b34888aa2fbae8b6e490bea545574 Author: Richard Purdie AuthorDate: Mon Feb 3 14:14:31 2020 +0000 libxshmfence: Set shm directory deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13778] Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 85a48e4..cc45696 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:56:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:56:59 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (a18d8be -> d3083e9) Message-ID: <158083181923.1817.10886420581364957277@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from a18d8be libpcre2: upgrade 10.33 -> 10.34 new 39fe849 sudo: Set vardir deterministically new 6217c3a libxshmfence: Set shm directory deterministically new 4535469 glibc: don't ignore global LDFLAGS settings new be821fd stress-ng: upgrade 0.10.15 -> 0.10.16 new 046851a glib-networking: upgrade 2.62.2 -> 2.62.3 new ea43f8a assimp: upgrade 5.0.0 -> 5.0.1 new 5933efd sudo: upgrade 1.8.29 -> 1.8.30 new 009dbec libtirpc: upgrade 1.1.4 -> 1.2.5 new 54a5dac procps: enable optional systemd support new cdd44c9 cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL new 1bb2aa5 buildhistory: Allow customising buildhistory tags new f5571bd lib/oe/path: try hardlinking instead of guessing when it might fail new 2b65c49 gstreamer1.0-plugins-common.inc: disable orc on mips new 61c3449 bash: include patch 8-11 new 1e2739c rsync: whitelist CVE-2017-16548 new d313e49 lttng-modules: update to 2.11.1 new 2333ef5 ifupdown: add ptest new 46884b1 podfix: remove new 9cc4dc9 piglit: don't stage the test suite new c3bd502 oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True new 0ebb56f rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True new 66c1f4b kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled new 7515a38 python3-six: Move src_uri checks to recipe main new 48a061c systemd: Upgrade 243.2 -> 243.4-latest new d3083e9 kernel-yocto.bbclass: export LD in the environment used by kconf_check The 25 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/buildhistory.bbclass | 7 +- meta/classes/cmake.bbclass | 5 +- meta/classes/kernel-yocto.bbclass | 1 + meta/classes/kernel.bbclass | 2 +- meta/classes/podfix.bbclass | 35 ----- meta/classes/reproducible_build_simple.bbclass | 2 - meta/lib/oe/path.py | 24 +++- meta/lib/oe/utils.py | 11 +- meta/lib/oeqa/controllers/masterimage.py | 2 +- meta/lib/oeqa/core/target/ssh.py | 2 +- meta/lib/oeqa/utils/sshcontrol.py | 2 +- ...working_2.62.2.bb => glib-networking_2.62.3.bb} | 4 +- meta/recipes-core/glibc/glibc_2.31.bb | 3 +- .../{kbd/kbd => ifupdown/files}/run-ptest | 2 +- .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 ++++-------- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/0004-rules-whitelist-hd-devices.patch | 34 ----- ...les-watch-metadata-changes-in-ide-devices.patch | 45 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 4 - meta/recipes-devtools/python/python-six.inc | 3 - meta/recipes-devtools/python/python3-six_1.14.0.bb | 2 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + meta/recipes-extended/bash/bash_5.0.bb | 12 ++ ...01-xdr_float-do-not-include-bits-endian.h.patch | 34 +++++ meta/recipes-extended/libtirpc/libtirpc/musl.patch | 30 ---- .../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 +- meta/recipes-extended/procps/procps_3.3.15.bb | 3 + .../{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} | 4 +- .../sudo/{sudo_1.8.29.bb => sudo_1.8.30.bb} | 5 +- meta/recipes-graphics/piglit/piglit_git.bb | 5 + ...-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 +- .../vulkan/{assimp_5.0.0.bb => assimp_5.0.1.bb} | 4 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 + ...Fix-oops-when-trace-sunrpc_task-events-in.patch | 94 ------------- ...null-rpc_clnt-dereference-in-rpc_task_que.patch | 44 ------ ...x-sunrpc-use-signed-integer-for-client-id.patch | 105 -------------- ...04-sunrpc-introduce-lttng_get_clid-helper.patch | 130 ------------------ ...g-modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 +-- .../gstreamer/gstreamer1.0-plugins-common.inc | 5 +- meta/recipes-rt/rt-tests/files/rt_bmark.py | 4 +- 46 files changed, 232 insertions(+), 851 deletions(-) delete mode 100644 meta/classes/podfix.bbclass rename meta/recipes-core/glib-networking/{glib-networking_2.62.2.bb => glib-networking_2.62.3.bb} (88%) copy meta/recipes-core/{kbd/kbd => ifupdown/files}/run-ptest (54%) create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch rename meta/recipes-core/systemd/{systemd-boot_243.2.bb => systemd-boot_243.4.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch delete mode 100644 meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch delete mode 100644 meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch rename meta/recipes-core/systemd/{systemd_243.2.bb => systemd_243.4.bb} (99%) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/musl.patch rename meta/recipes-extended/libtirpc/{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} (81%) rename meta/recipes-extended/stress-ng/{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} (83%) rename meta/recipes-extended/sudo/{sudo_1.8.29.bb => sudo_1.8.30.bb} (89%) rename meta/recipes-graphics/vulkan/{assimp_5.0.0.bb => assimp_5.0.1.bb} (84%) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:02 +0000 Subject: [oe-commits] [openembedded-core] 03/25: glibc: don't ignore global LDFLAGS settings In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.B58472329CE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4535469d5953b94c9dcad5515be9b807ea7ba621 Author: Rasmus Villemoes AuthorDate: Mon Jan 20 09:23:06 2020 +0000 glibc: don't ignore global LDFLAGS settings Two things: The -Wl,-rpath-link comment is stale (due to per-recipe staging), so we no longer need to set our own LDFLAGS to avoid -Wl,-rpath-link being in there. Second, overriding LDFLAGS should be done at the recipe level so "bitbake -e" can show what is going on. Otherwise debugging why one's global LDFLAGS tweaks are being ignored is needlessly painful. So pull out the LDFLAGS setting from do_compile, and change it to an append instead of assignment. For the benefit of future git blame: the -fuse-ld=bfd setting was added by ac64c3b96b (glibc: always use bfd linker). Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc_2.31.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb index 9f299a7..2032311 100644 --- a/meta/recipes-core/glibc/glibc_2.31.bb +++ b/meta/recipes-core/glibc/glibc_2.31.bb @@ -91,9 +91,8 @@ do_configure () { CPPFLAGS="" oe_runconf } +LDFLAGS += "-fuse-ld=bfd" do_compile () { - # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging - LDFLAGS="-fuse-ld=bfd" base_do_compile echo "Adjust ldd script" if [ -n "${RTLDLIST}" ] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:03 +0000 Subject: [oe-commits] [openembedded-core] 04/25: stress-ng: upgrade 0.10.15 -> 0.10.16 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.C1B382329D1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit be821fda76798095598f60f437e8128e951dd2fb Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:32 2020 +0800 stress-ng: upgrade 0.10.15 -> 0.10.16 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb b/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb index 5402130..e67b82a 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ " -SRC_URI[md5sum] = "303a7276e3a9e3dd03be6cabc9e84a75" -SRC_URI[sha256sum] = "1d0ca8a2f287e13c2d36c01e874d16d67bcb368d8d26563324c9aaf0ddb100c1" +SRC_URI[md5sum] = "a337cd5b1412c53c580e95ee2a9fc77b" +SRC_URI[sha256sum] = "eabfffcffcf53e67765181280456c204ad00214339cfdb3ee2769d58b4a7e304" DEPENDS = "coreutils-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:04 +0000 Subject: [oe-commits] [openembedded-core] 05/25: glib-networking: upgrade 2.62.2 -> 2.62.3 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.CCF3A2329D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 046851a33b749b34eff4f29dacbb11275d8e5540 Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:33 2020 +0800 glib-networking: upgrade 2.62.2 -> 2.62.3 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{glib-networking_2.62.2.bb => glib-networking_2.62.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.62.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb similarity index 88% rename from meta/recipes-core/glib-networking/glib-networking_2.62.2.bb rename to meta/recipes-core/glib-networking/glib-networking_2.62.3.bb index 026d870..e9596ce 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.62.2.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "a8b669ae54c7178848ce7a9b596a471c" -SRC_URI[archive.sha256sum] = "0644b8dc042bab8c9d2892aee5716513280c8773dbef43a038149f24cae15544" +SRC_URI[archive.md5sum] = "a758ca62bd54982a798b39c744cbf783" +SRC_URI[archive.sha256sum] = "8ca1f86f23a76b5c7640624f7d5490705c78e81375e1741c9a1c41ce7f8f7ff7" PACKAGECONFIG ??= "gnutls" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:06 +0000 Subject: [oe-commits] [openembedded-core] 07/25: sudo: upgrade 1.8.29 -> 1.8.30 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.E13C92329DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5933efd44811f97a53952dd72b6d2026ebfa8d39 Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:36 2020 +0800 sudo: upgrade 1.8.29 -> 1.8.30 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/{sudo_1.8.29.bb => sudo_1.8.30.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo_1.8.29.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.29.bb rename to meta/recipes-extended/sudo/sudo_1.8.30.bb index 7089e1a..6ea06a9 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.29.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "b28dabff9c460f115fe74de4d6a6f79d" -SRC_URI[sha256sum] = "ce53ffac9604e23321334d8ba8ac59ded2bcf624fdb9dbde097ab2049bf29c7c" +SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" +SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:08 +0000 Subject: [oe-commits] [openembedded-core] 09/25: procps: enable optional systemd support In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.023EF2329DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 54a5daca450b8be251c45730ae4c0511811b668a Author: Daniel McGregor AuthorDate: Thu Jan 23 15:44:41 2020 -0600 procps: enable optional systemd support procps includes support for listing the owning unit of a process, but this support is disabled by default. Enable support using a PACKAGECONFIG that depends on the systemd DISTRO_FEATURE. Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.3.15.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.15.bb index f240e54..17abd96 100644 --- a/meta/recipes-extended/procps/procps_3.3.15.bb +++ b/meta/recipes-extended/procps/procps_3.3.15.bb @@ -24,6 +24,9 @@ S = "${WORKDIR}/procps-ng-${PV}" EXTRA_OECONF = "--enable-skill --disable-modern-top" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" + do_install_append () { install -d ${D}${base_bindir} [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:10 +0000 Subject: [oe-commits] [openembedded-core] 11/25: buildhistory: Allow customising buildhistory tags In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.159A92329E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1bb2aa53a74e36dc3ba901b9d8ce780e7880cef8 Author: Daniel McGregor AuthorDate: Thu Jan 23 15:44:43 2020 -0600 buildhistory: Allow customising buildhistory tags Allow setting custom buildhistory tag prefixes. This allows multiple build directories to share one buildhistory git repository with multiple worktrees. Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index affdf27..eb72955 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -40,6 +40,7 @@ BUILDHISTORY_SDK_FILES ?= "conf/local.conf conf/bblayers.conf conf/auto.conf con BUILDHISTORY_COMMIT ?= "1" BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory " BUILDHISTORY_PUSH_REPO ?= "" +BUILDHISTORY_TAG ?= "build" SSTATEPOSTINSTFUNCS_append = " buildhistory_emit_pkghistory" # We want to avoid influencing the signatures of sstate tasks - first the function itself: @@ -824,9 +825,9 @@ END if [ ! -e .git ] ; then git init -q else - git tag -f build-minus-3 build-minus-2 > /dev/null 2>&1 || true - git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true - git tag -f build-minus-1 > /dev/null 2>&1 || true + git tag -f ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true + git tag -f ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true + git tag -f ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true fi check_git_config -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:11 +0000 Subject: [oe-commits] [openembedded-core] 12/25: lib/oe/path: try hardlinking instead of guessing when it might fail In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.1E2062329E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f5571bda8327f927feb23b167ab4594b7d0c95bc Author: Henning Schild AuthorDate: Fri Jan 24 14:48:47 2020 +0100 lib/oe/path: try hardlinking instead of guessing when it might fail The comparison of the stat st_dev is not enough to judge whether hardlinking will work. One example would be where you try and hardlink across two bind-mounts of a directory. The st_dev will be the same and the operation will still fail. Instead of implementing a check to try and figure out hardlink support just try hardlinking and fall back to a copy when running into an exception. Signed-off-by: Henning Schild Signed-off-by: Richard Purdie --- meta/lib/oe/path.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index fa209b9..0829724 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -99,7 +99,22 @@ def copyhardlinktree(src, dst): if os.path.isdir(src) and not len(os.listdir(src)): return - if (os.stat(src).st_dev == os.stat(dst).st_dev): + canhard = False + testfile = None + for root, dirs, files in os.walk(src): + if len(files): + testfile = os.path.join(root, files[0]) + break + + if testfile is not None: + try: + os.link(testfile, os.path.join(dst, 'testfile')) + os.unlink(os.path.join(dst, 'testfile')) + canhard = True + except Exception as e: + bb.debug(2, "Hardlink test failed with " + str(e)) + + if (canhard): # Need to copy directories only with tar first since cp will error if two # writers try and create a directory at the same time cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst) @@ -121,12 +136,9 @@ def copyhardlinktree(src, dst): def copyhardlink(src, dst): """Make a hard link when possible, otherwise copy.""" - # We need to stat the destination directory as the destination file probably - # doesn't exist yet. - dstdir = os.path.dirname(dst) - if os.stat(src).st_dev == os.stat(dstdir).st_dev: + try: os.link(src, dst) - else: + except OSError: shutil.copy(src, dst) def remove(path, recurse=True): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:05 +0000 Subject: [oe-commits] [openembedded-core] 06/25: assimp: upgrade 5.0.0 -> 5.0.1 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.D70B32329D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ea43f8af4652d78546fee874606cf4093b11098e Author: Anuj Mittal AuthorDate: Wed Jan 22 13:46:35 2020 +0800 assimp: upgrade 5.0.0 -> 5.0.1 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 +++++------- .../vulkan/{assimp_5.0.0.bb => assimp_5.0.1.bb} | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch index 3e9fbec..34c5bfa 100644 --- a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch +++ b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch @@ -1,4 +1,4 @@ -From dd5c10f660716a2fab513714245be1932003306b Mon Sep 17 00:00:00 2001 +From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 12 Dec 2019 22:16:15 -0800 Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library @@ -8,12 +8,13 @@ Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia + --- assimpTargets-release.cmake.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in -index b09b881f..5c6999fe 100644 +index f3db8f1..b8a066a 100644 --- a/assimpTargets-release.cmake.in +++ b/assimpTargets-release.cmake.in @@ -42,11 +42,11 @@ if(MSVC) @@ -43,8 +44,8 @@ index b09b881f..5c6999fe 100644 endif() else() -@@ -66,17 +66,17 @@ else() - set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX at .@ASSIMP_VERSION_MAJOR@") +@@ -70,17 +70,17 @@ else() + endif() set_target_properties(assimp::assimp PROPERTIES IMPORTED_SONAME_RELEASE "${sharedLibraryName}" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" @@ -65,6 +66,3 @@ index b09b881f..5c6999fe 100644 endif() endif() --- -2.21.0 - diff --git a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb similarity index 84% rename from meta/recipes-graphics/vulkan/assimp_5.0.0.bb rename to meta/recipes-graphics/vulkan/assimp_5.0.1.bb index a42494a..5a8c62e 100644 --- a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb +++ b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271" DEPENDS = "zlib" -SRC_URI = "git://github.com/assimp/assimp.git \ +SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release \ file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \ file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" -SRCREV = "2d2889f73fa1b2ca09ba9f43c9785402d3a7fdd0" +SRCREV = "8f0c6b04b2257a520aaab38421b2e090204b69df" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:13 +0000 Subject: [oe-commits] [openembedded-core] 14/25: bash: include patch 8-11 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.30E952329CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 61c3449b87e5d627134a580bb5298338f389beb1 Author: Lee Chee Yang AuthorDate: Tue Jan 21 13:26:46 2020 +0800 bash: include patch 8-11 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash_5.0.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index eadc822..0c7b234 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -12,6 +12,10 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-008;apply=yes;striplevel=0;name=patch008 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -38,6 +42,14 @@ SRC_URI[patch006.md5sum] = "4a8ee95adb72c3aba03d9e8c9f96ece6" SRC_URI[patch006.sha256sum] = "d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420" SRC_URI[patch007.md5sum] = "411560d81fde2dc5b17b83c3f3b58c6f" SRC_URI[patch007.sha256sum] = "17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b" +SRC_URI[patch008.md5sum] = "dd7cf7a784d1838822cad8d419315991" +SRC_URI[patch008.sha256sum] = "eec64588622a82a5029b2776e218a75a3640bef4953f09d6ee1f4199670ad7e3" +SRC_URI[patch009.md5sum] = "c1b3e937cd6dccbb7fd772f32812a0da" +SRC_URI[patch009.sha256sum] = "ed3ca21767303fc3de93934aa524c2e920787c506b601cc40a4897d4b094d903" +SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" +SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" +SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" +SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:07 +0000 Subject: [oe-commits] [openembedded-core] 08/25: libtirpc: upgrade 1.1.4 -> 1.2.5 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155659.EB47D2329DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 009dbec9058bf43e63eeabdd24ecad990bf22568 Author: Anuj Mittal AuthorDate: Thu Jan 23 14:27:46 2020 +0800 libtirpc: upgrade 1.1.4 -> 1.2.5 Drop musl patch and backport a fix from upstream instead. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...01-xdr_float-do-not-include-bits-endian.h.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc/musl.patch | 30 ------------------- .../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 ++-- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch new file mode 100644 index 0000000..3797cdf --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch @@ -0,0 +1,34 @@ +From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Tue, 21 Jan 2020 11:51:16 -0500 +Subject: [PATCH] xdr_float: do not include bits/endian.h + +bits/endian.h is an internal header. endian.h should be included. + +Fixes compilation with recent musl. + +Signed-off-by: Rosen Penev +Signed-off-by: Steve Dickson + +Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1] +Signed-off-by: Anuj Mittal +--- + src/xdr_float.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xdr_float.c b/src/xdr_float.c +index 26bc865..349d48f 100644 +--- a/src/xdr_float.c ++++ b/src/xdr_float.c +@@ -83,7 +83,7 @@ static struct sgl_limits { + }; + #else + +-#include ++#include + #define IEEEFP + + #endif /* vax */ +-- +2.21.1 + diff --git a/meta/recipes-extended/libtirpc/libtirpc/musl.patch b/meta/recipes-extended/libtirpc/libtirpc/musl.patch deleted file mode 100644 index 21cd9f9..0000000 --- a/meta/recipes-extended/libtirpc/libtirpc/musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -Consider musl provided built-in defines - -Helps compile libtirpc with musl -bits/endian.h is not supposed to be included directly - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/tirpc/rpc/types.h -+++ b/tirpc/rpc/types.h -@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif ---- a/src/xdr_float.c -+++ b/src/xdr_float.c -@@ -83,7 +83,7 @@ static struct sgl_limits { - }; - #else - --#include -+#include - #define IEEEFP - - #endif /* vax */ diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb similarity index 81% rename from meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb rename to meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb index 53ed5e8..fc66821 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ PROVIDES = "virtual/librpc" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ - file://musl.patch \ + file://0001-xdr_float-do-not-include-bits-endian.h.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a" -SRC_URI[sha256sum] = "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d" +SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1" +SRC_URI[sha256sum] = "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:09 +0000 Subject: [oe-commits] [openembedded-core] 10/25: cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.0C53F2329E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cdd44c93f02bb8cc2fa773e13c8ce36e3da23921 Author: Daniel McGregor AuthorDate: Thu Jan 23 15:44:42 2020 -0600 cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL cmake 3.12 introduced this environment variable. Prefer it to passing PARALLEL_MAKE and PARALLEL_MAKEINST on the cmake command line, because it gets passed to second stage cmake invocations while command-line arguments do not (for example, multi-stage clang builds) Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/classes/cmake.bbclass | 5 +++-- meta/lib/oe/utils.py | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a046daa..d91cf20 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -63,8 +63,9 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH" EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" -EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} " -EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " +export CMAKE_BUILD_PARALLEL_LEVEL +CMAKE_BUILD_PARALLEL_LEVEL_task-compile = "${@oe.utils.parallel_make(d, False)}" +CMAKE_BUILD_PARALLEL_LEVEL_task-install = "${@oe.utils.parallel_make(d, True)}" OECMAKE_TARGET_COMPILE ?= "all" OECMAKE_TARGET_INSTALL ?= "install" diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 652b2be..e350b05 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -169,7 +169,7 @@ def any_distro_features(d, features, truevalue="1", falsevalue=""): """ return bb.utils.contains_any("DISTRO_FEATURES", features, truevalue, falsevalue, d) -def parallel_make(d): +def parallel_make(d, makeinst=False): """ Return the integer value for the number of parallel threads to use when building, scraped out of PARALLEL_MAKE. If no parallelization option is @@ -177,7 +177,10 @@ def parallel_make(d): e.g. if PARALLEL_MAKE = "-j 10", this will return 10 as an integer. """ - pm = (d.getVar('PARALLEL_MAKE') or '').split() + if makeinst: + pm = (d.getVar('PARALLEL_MAKEINST') or '').split() + else: + pm = (d.getVar('PARALLEL_MAKE') or '').split() # look for '-j' and throw other options (e.g. '-l') away while pm: opt = pm.pop(0) @@ -192,7 +195,7 @@ def parallel_make(d): return None -def parallel_make_argument(d, fmt, limit=None): +def parallel_make_argument(d, fmt, limit=None, makeinst=False): """ Helper utility to construct a parallel make argument from the number of parallel threads specified in PARALLEL_MAKE. @@ -205,7 +208,7 @@ def parallel_make_argument(d, fmt, limit=None): e.g. if PARALLEL_MAKE = "-j 10", parallel_make_argument(d, "-n %d") will return "-n 10" """ - v = parallel_make(d) + v = parallel_make(d, makeinst) if v: if limit: v = min(limit, v) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:12 +0000 Subject: [oe-commits] [openembedded-core] 13/25: gstreamer1.0-plugins-common.inc: disable orc on mips In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.261C02329E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2b65c49bcaa863d87de6cd8728878768ddeed1b8 Author: Mingli Yu AuthorDate: Wed Jan 22 00:35:47 2020 -0800 gstreamer1.0-plugins-common.inc: disable orc on mips After transiton to meson build for gstreamer series, for gstreamer1.0-plugins-base, with below two commits introduced: 238080ed89 gstreamer: Remove unused common files and patches 20614408dc gstreamer1.0-plugins-base: Transition to meson based builds With below config in local.conf MACHINE ??= "qemumips64" require conf/multilib.conf MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" there comes below failure: $ bitbake lib32-gstreamer1.0-plugins-base [snip] mips-pokymllib32-linux-gcc -meb -mabi=32 -mhard-float -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot -Itests/check/7d01337@@orc_video at exe -Itests/check -I../gst-plugins-base-1.16.1/tests/check -I/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot/usr/include/orc-0.4 -fdiagn [...] sr/src/debug/lib32-gstreamer1.0-plugins-base/1.16.1-r0 -fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0=/usr/src/debug/lib32-gstreamer1.0-plugins-base/1.16.1-r0 -fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot= -fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/recipe-sysroot-native= -MD -MQ 'tests/check/7d01 [...] FAILED: tests/check/7d01337@@orc_video at exe/meson-generated_.._orc_video.c.o {standard input}: Assembler messages: {standard input}:46587: Error: branch out of range {standard input}:46613: Error: branch out of range [snip] BTW, gstreamer1.0-plugins-good also occurs the same build failure as above. Disable orc as workaround to fix the above issue Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc index ccf5550..dba96e0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc @@ -18,7 +18,10 @@ require gstreamer1.0-plugins-packaging.inc # This value is used in the PACKAGECONFIG values for each plugin set recipe. # By modifying it, Orc can be enabled/disabled in all of these recipes at once. GSTREAMER_ORC ?= "orc" - +# workaround to disable orc on mips to fix the build failure +# {standard input}: Assembler messages: +# {standard input}:46587: Error: branch out of range +GSTREAMER_ORC_mips = "" PACKAGECONFIG[orc] = "-Dorc=enabled,-Dorc=disabled,orc orc-native" # TODO: put this in a gettext.bbclass patch (with variables to allow for -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:14 +0000 Subject: [oe-commits] [openembedded-core] 15/25: rsync: whitelist CVE-2017-16548 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.3A3D02329CB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1e2739c821312527010fb0afbde5a20cd3f03d24 Author: Lee Chee Yang AuthorDate: Tue Jan 21 13:26:47 2020 +0800 rsync: whitelist CVE-2017-16548 patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d06..152ff02 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:18 +0000 Subject: [oe-commits] [openembedded-core] 19/25: piglit: don't stage the test suite In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.5D66A2329E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9cc4dc9cc951157e6e374192c88369432ae5cff1 Author: Ross Burton AuthorDate: Mon Feb 3 12:32:25 2020 +0000 piglit: don't stage the test suite The Piglit test suite is approximately 2GB and because it's installed into $libdir is added to the sysroot archive. Nothing links against Piglit so there's no reason for this, so remove $libdir from Piglit's sysroot. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/piglit/piglit_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index d0d8331..58d10d6 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -44,6 +44,7 @@ do_configure_prepend() { fi } +# Forcibly strip because Piglit is *huge* OECMAKE_TARGET_INSTALL = "install/strip" RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ @@ -55,5 +56,9 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ INSANE_SKIP_${PN} += "dev-so already-stripped" +# As nothing builds against Piglit we don't need to have anything in the +# sysroot, especially when this is ~2GB of test suite +SYSROOT_DIRS_remove = "${libdir}" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:20 +0000 Subject: [oe-commits] [openembedded-core] 21/25: rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.6E4492329E9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0ebb56ff192e9c6db2af83c37db3307a27fe822a Author: Andr? Draszik AuthorDate: Mon Feb 3 17:28:13 2020 +0000 rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True start_new_session was added to python3 subprocess in v3.2 and is meant to take the place of the common use of preexec_fn to call os.setsid() in the child - as done here. Update to use the new equivalent. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-rt/rt-tests/files/rt_bmark.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py index 57b39b5..3b84447 100755 --- a/meta/recipes-rt/rt-tests/files/rt_bmark.py +++ b/meta/recipes-rt/rt-tests/files/rt_bmark.py @@ -166,12 +166,12 @@ def start_stress(*args): log(" Command: '", stress_cmd_str, "'") log() - # preexec_fn=os.setsid causes stress to be executed in a separate + # start_new_session causes stress to be executed in a separate # session, => it gets a new process group (incl. children). It # can then be terminated using os.killpg in end_stress without # terminating this script. - p = subprocess.Popen(stress_cmd, preexec_fn=os.setsid) + p = subprocess.Popen(stress_cmd, start_new_session=True) return p -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:21 +0000 Subject: [oe-commits] [openembedded-core] 22/25: kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.76A7D2329EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 66c1f4b0abd3483759f9e4141a80f982eaf8ccfd Author: Martin Jansa AuthorDate: Mon Feb 3 19:11:50 2020 +0100 kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled * with 5.4 kernel the do_configure fails when gold is enabled (with ld-is-gold in DISTRO_FEATURES) * bfd is already being set in KERNEL_LD: kernel-arch.bbclass:KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" but KERNEL_LD is currently respected only by do_compile and do_compile_kernel modules and new kernel which contains a check for gold in Kbuild: https://lore.kernel.org/lkml/alpine.DEB.2.21.1907161434260.1767 at nanos.tec.linutronix.de/ more details: https://lore.kernel.org/r/CAMe9rOqMqkQ0LNpm25yE_Yt0FKp05WmHOrwc0aRDb53miFKM+w at mail.gmail.com will fail during the configuration even when gold wouldn't be used to build it in the end, add LD setting to KERNEL_CONFIG_COMMAND to prevent premature error when configuring scripts/kconfig/conf --olddefconfig Kconfig scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 750988f..15219c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -508,7 +508,7 @@ sysroot_stage_all () { : } -KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" oldnoconfig" +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" LD="${KERNEL_LD}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" LD="${KERNEL_LD}" oldnoconfig" python check_oldest_kernel() { oldest_kernel = d.getVar('OLDEST_KERNEL') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:15 +0000 Subject: [oe-commits] [openembedded-core] 16/25: lttng-modules: update to 2.11.1 In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.442BD2329CD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d313e49e1d1cee4bbc24650e60b8ec56700e9e1f Author: He Zhe AuthorDate: Mon Feb 3 15:47:42 2020 +0800 lttng-modules: update to 2.11.1 Fix build failure with kernel v5.5. Remove patches as issues fixed upstream. Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- ...Fix-oops-when-trace-sunrpc_task-events-in.patch | 94 --------------- ...null-rpc_clnt-dereference-in-rpc_task_que.patch | 44 ------- ...x-sunrpc-use-signed-integer-for-client-id.patch | 105 ----------------- ...04-sunrpc-introduce-lttng_get_clid-helper.patch | 130 --------------------- ...g-modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 +-- 5 files changed, 6 insertions(+), 383 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch deleted file mode 100644 index bdbc4f8..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1ff7013bcf7f068cf4371d12d758f9c0fd16a619 Mon Sep 17 00:00:00 2001 -From: Quanyang Wang -Date: Thu, 5 Dec 2019 15:35:32 +0800 -Subject: [PATCH 1/4] Fix: SUNRPC: Fix oops when trace sunrpc_task events in - nfs client - -See upstream commit : - - commit 2ca310fc4160ed0420da65534a21ae77b24326a8 - Author: Ditang Chen - Date: Fri, 7 Mar 2014 13:27:57 +0800 - Subject: SUNRPC: Fix oops when trace sunrpc_task events in nfs client - - When tracking sunrpc_task events in nfs client, the clnt pointer may be NULL. - - [ 139.269266] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 - [ 139.269915] IP: [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] PGD 1d293067 PUD 1d294067 PMD 0 - [ 139.269915] Oops: 0000 [#1] SMP - [ 139.269915] Modules linked in: nfsv4 dns_resolver nfs lockd sunrpc fscache sg ppdev e1000 - serio_raw pcspkr parport_pc parport i2c_piix4 i2c_core microcode xfs libcrc32c sd_mod sr_mod - cdrom ata_generic crc_t10dif crct10dif_common pata_acpi ahci libahci ata_piix libata dm_mirror - dm_region_hash dm_log dm_mod - [ 139.269915] CPU: 0 PID: 59 Comm: kworker/0:2 Not tainted 3.10.0-84.el7.x86_64 #1 - [ 139.269915] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 - [ 139.269915] Workqueue: rpciod rpc_async_schedule [sunrpc] - [ 139.269915] task: ffff88001b598000 ti: ffff88001b632000 task.ti: ffff88001b632000 - [ 139.269915] RIP: 0010:[] [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] RSP: 0018:ffff88001b633d70 EFLAGS: 00010206 - [ 139.269915] RAX: ffff88001dfc5338 RBX: ffff88001cc37a00 RCX: ffff88001dfc5334 - [ 139.269915] RDX: ffff88001dfc5338 RSI: 0000000000000000 RDI: ffff88001dfc533c - [ 139.269915] RBP: ffff88001b633db0 R08: 000000000000002c R09: 000000000000000a - [ 139.269915] R10: 0000000000062180 R11: 00000020759fb9dc R12: ffffffffa0292c20 - [ 139.269915] R13: ffff88001dfc5334 R14: 0000000000000000 R15: 0000000000000000 - [ 139.269915] FS: 0000000000000000(0000) GS:ffff88001fc00000(0000) knlGS:0000000000000000 - [ 139.269915] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b - [ 139.269915] CR2: 0000000000000004 CR3: 000000001d290000 CR4: 00000000000006f0 - [ 139.269915] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 - [ 139.269915] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 - [ 139.269915] Stack: - [ 139.269915] 000000001b633d98 0000000000000246 ffff88001df1dc00 ffff88001cc37a00 - [ 139.269915] ffff88001bc35e60 0000000000000000 ffff88001ffa0a48 ffff88001bc35ee0 - [ 139.269915] ffff88001b633e08 ffffffffa02704b5 0000000000010000 ffff88001cc37a70 - [ 139.269915] Call Trace: - [ 139.269915] [] __rpc_execute+0x1d5/0x400 [sunrpc] - [ 139.269915] [] rpc_async_schedule+0x26/0x30 [sunrpc] - [ 139.269915] [] process_one_work+0x17b/0x460 - [ 139.269915] [] worker_thread+0x11b/0x400 - [ 139.269915] [] ? rescuer_thread+0x3e0/0x3e0 - [ 139.269915] [] kthread+0xc0/0xd0 - [ 139.269915] [] ? kthread_create_on_node+0x110/0x110 - [ 139.269915] [] ret_from_fork+0x7c/0xb0 - [ 139.269915] [] ? kthread_create_on_node+0x110/0x110 - [ 139.269915] Code: 4c 8b 45 c8 48 8d 7d d0 89 4d c4 41 89 c9 b9 28 00 00 00 e8 9d b4 e9 - e0 48 85 c0 49 89 c5 74 a2 48 89 c7 e8 9d 3f e9 e0 48 89 c2 <41> 8b 46 04 48 8b 7d d0 4c - 89 e9 4c 89 e6 89 42 0c 0f b7 83 d4 - [ 139.269915] RIP [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] RSP - [ 139.269915] CR2: 0000000000000004 - [ 140.946406] ---[ end trace ba486328b98d7622 ]--- - -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2b228b503cad10bf0c5a99b42a908ca906eab5b9] - -Signed-off-by: Quanyang Wang -Signed-off-by: Mathieu Desnoyers ---- - instrumentation/events/lttng-module/rpc.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 3798e8e..fb13106 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -139,7 +139,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -208,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch deleted file mode 100644 index 03264ba..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 032a74d83b263c4faead8e4c25d497fb8ea07b6e Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:29:02 -0500 -Subject: [PATCH 2/4] Fix: sunrpc: null rpc_clnt dereference in rpc_task_queued - tracepoint - -Based on upstream Linux commit: - -commit 0be283f676a1e7b208db0c992283197ef8b52158 -Author: Benjamin Coddington -Date: Tue Jan 23 09:32:35 2018 -0500 - - SUNRPC: Fix null rpc_clnt dereference in rpc_task_queued tracepoint - - Backchannel tasks will not have a reference to the rpc_clnt. Return -1 for - cl_clid in that case. - - Signed-off-by: Benjamin Coddington - Signed-off-by: Trond Myklebust - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/8f83a9103dcdf4f6b73783427fc5ded4869309d5] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index fb13106..68c622c 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -176,7 +176,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch deleted file mode 100644 index c7529f1..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 70389e422dd3146161089d454f525367c9046ecd Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:29:37 -0500 -Subject: [PATCH 3/4] Fix: sunrpc: use signed integer for client id - -Within include/linux/sunrpc/clnt.h:struct rpc_cltn, the cl_clid field -is an unsigned integer, which is the type expected by the tracepoint -signature. - -However, looking into net/sunrpc/clnt.c:rpc_alloc_clid(), its allocation -considers negative signed integer as errors. - -Therefore, in order to properly show "-1" in the trace output (rather -than MAX_INT) when called with a NULL task->tk_client, move to a -signed integer as backing type for the client_id field. - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/cc7bb0aa52cae22255581d67841449bb8ea36fda] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 68c622c..2d06e55 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -18,7 +18,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -43,7 +43,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -100,7 +100,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -112,7 +112,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, status) - ) - ) -@@ -139,7 +139,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -176,7 +177,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? -+ ctf_integer(int, client_id, task->tk_client ? - task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) -@@ -209,7 +210,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -246,7 +248,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch deleted file mode 100644 index 4dd726c..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch +++ /dev/null @@ -1,130 +0,0 @@ -From b6903d57e4c3234ec5b1c7f72e232023cdee0fab Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:39:38 -0500 -Subject: [PATCH 4/4] sunrpc: introduce lttng_get_clid helper - -Introduce the lttng_get_clid helper to always check for NULL pointer -when getting the client id. While not always strictly needed depending -on the tracepoint callsite, prefer robustness of instrumentation and -always check for NULL rather than play whack-a-mole. - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/1330a091a687a406513c3a326c2fc2a0dbe75536] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 43 ++++++++++++++++------- - 1 file changed, 31 insertions(+), 12 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 2d06e55..ceaf9db 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -9,6 +9,29 @@ - #include - #include - -+#ifndef ONCE_LTTNG_RPC_H -+#define ONCE_LTTNG_RPC_H -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) -+static inline -+int lttng_get_clid(const struct rpc_task *task) -+{ -+ struct rpc_clnt *tk_client; -+ -+ tk_client = task->tk_client; -+ if (!tk_client) -+ return -1; -+ /* -+ * The cl_clid field is always initialized to positive signed -+ * integers. Negative signed integer values are treated as -+ * errors. -+ */ -+ return (int) tk_client->cl_clid; -+} -+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -+ -+#endif /* ONCE_LTTNG_RPC_H */ -+ - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - -@@ -18,7 +41,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -43,7 +66,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -100,7 +123,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -112,7 +135,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, status) - ) - ) -@@ -139,8 +162,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -177,8 +199,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -210,8 +231,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -248,8 +268,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb similarity index 68% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index 3465a43..c833ff7 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -35,13 +31,13 @@ python do_package_prepend() { } BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" -PV_class-devupstream = "2.10.10+git${SRCPV}" +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV_class-devupstream = "2.11.1+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:22 +0000 Subject: [oe-commits] [openembedded-core] 23/25: python3-six: Move src_uri checks to recipe main In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.7EA742329EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7515a38d4c2dec6117c1184dab4fbf1e9c02a993 Author: Khem Raj AuthorDate: Mon Feb 3 12:50:49 2020 -0800 python3-six: Move src_uri checks to recipe main .inc is used by other versions of recipe as well, therefore putting checksums in .inc will break them unless the version is same as in oe-core Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-six.inc | 3 --- meta/recipes-devtools/python/python3-six_1.14.0.bb | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index bbbddbe..05b3281 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -4,9 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" -SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" -SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" - inherit pypi RDEPENDS_${PN} = "${PYTHON_PN}-io" diff --git a/meta/recipes-devtools/python/python3-six_1.14.0.bb b/meta/recipes-devtools/python/python3-six_1.14.0.bb index 99e6629..151c366 100644 --- a/meta/recipes-devtools/python/python3-six_1.14.0.bb +++ b/meta/recipes-devtools/python/python3-six_1.14.0.bb @@ -1,3 +1,5 @@ inherit setuptools3 require python-six.inc +SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" +SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:17 +0000 Subject: [oe-commits] [openembedded-core] 18/25: podfix: remove In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.53FC72329D1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 46884b1443d92cea877201296bd480b6cbd71cca Author: Ross Burton AuthorDate: Mon Feb 3 10:19:55 2020 +0000 podfix: remove Now that we don't use the host pod2man (oe-core deda455) the podfix class is redundant and can be removed. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/podfix.bbclass | 35 -------------------------- meta/classes/reproducible_build_simple.bbclass | 2 -- 2 files changed, 37 deletions(-) diff --git a/meta/classes/podfix.bbclass b/meta/classes/podfix.bbclass deleted file mode 100644 index cc8210a..0000000 --- a/meta/classes/podfix.bbclass +++ /dev/null @@ -1,35 +0,0 @@ -python pod_strip_version() { - import re - - def opener(filename, mode): - if filename.endswith(".gz"): - import gzip - return gzip.open(filename, mode) - elif filename.endswith(".bz2"): - import bz2 - return bz2.open(filename, mode) - else: - return open(filename, mode) - - bad_re = re.compile(rb"Automatically generated by Pod::Man( [0-9]+.+)") - - for root, dirs, files in os.walk(d.expand("${D}${mandir}")): - for filename in files: - filename = os.path.join(root, filename) - if not os.path.isfile(filename): - continue - - with opener(filename, "rb") as manfile: - manpage = manfile.read() - m = bad_re.search(manpage) - if not m: - continue - - bb.note("podfix: stripping version from %s" % filename) - os.unlink(filename) - with opener(filename, "wb") as manfile: - manfile.write(manpage[:m.start(1)]) - manfile.write(manpage[m.end(1):]) -} - -do_install[postfuncs] += "pod_strip_version" diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 153a076..3e5fd82 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -8,5 +8,3 @@ export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" - -inherit podfix -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:19 +0000 Subject: [oe-commits] [openembedded-core] 20/25: oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.64CDB2329E5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c3bd502f31a621394a2f6ea3ae90443ff4ac98a4 Author: Andr? Draszik AuthorDate: Mon Feb 3 17:28:12 2020 +0000 oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True start_new_session was added to python3 subprocess in v3.2 and is meant to take the place of the common use of preexec_fn to call os.setsid() in the child - as done here. Update to use the new equivalent. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/lib/oeqa/controllers/masterimage.py | 2 +- meta/lib/oeqa/core/target/ssh.py | 2 +- meta/lib/oeqa/utils/sshcontrol.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index 0435dfa..0bf5917 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/masterimage.py @@ -97,7 +97,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta if self.powercontrol_cmd: cmd = "%s %s" % (self.powercontrol_cmd, msg) try: - commands.runCmd(cmd, assert_error=False, preexec_fn=os.setsid, env=self.origenv) + commands.runCmd(cmd, assert_error=False, start_new_session=True, env=self.origenv) except CommandError as e: bb.fatal(str(e)) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 63fc946..090b40a 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -247,7 +247,7 @@ def SSHCall(command, logger, timeout=None, **opts): "stdin": None, "shell": False, "bufsize": -1, - "preexec_fn": os.setsid, + "start_new_session": True, } options.update(opts) output = '' diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index 49a0726..36c2ecb 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py @@ -23,7 +23,7 @@ class SSHProcess(object): "stdin": None, "shell": False, "bufsize": -1, - "preexec_fn": os.setsid, + "start_new_session": True, } self.options = dict(self.defaultopts) self.options.update(options) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:23 +0000 Subject: [oe-commits] [openembedded-core] 24/25: systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.8CFE12329F0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 48a061c1da0745ca2263cfcfb9041d67cd018193 Author: Alex Kiernan AuthorDate: Mon Feb 3 22:35:26 2020 +0000 systemd: Upgrade 243.2 -> 243.4-latest Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. Refresh: 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0001-do-not-disable-buffer-in-writing-files.patch Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Drop 0004-rules-whitelist-hd-devices.patch and 0005-rules-watch-metadata-changes-in-ide-devices.patch which cause ide-cd to flap with tray open messages (and don't appear to be required any more) Commits from v243-stable: 70e8c1978a9a seccomp: real syscall numbers are >= 0 a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change b59d88cc62a4 man: fix typo in net-naming-scheme man page c5e5ac095821 man: fix typos (#14304) 9a2f26564d5a ipv4ll: do not reset conflict counter on restart bc9e1ebfdd3b Fix typo (duplicate "or") c6cb71b7e741 network: if /sys is rw, then udev should be around 67dcdfd95629 nspawn: do not fail if udev is not running a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative b1cf452ff5f6 systemctl: enhance message about kexec missing kernel 07a0e5b42523 man: use mkswap@ instead of makeswap@ 57dc017c6bac journald: don't ask for the machine ID if we don't need it ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field 471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61a0 man: drop reference to machined, add one for journald instead fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b2378 shared/ask-password-api: modify keyctl break value a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed 4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit() d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be* a67a3ae04b89 man: document all pager variables for systemctl and systemd 3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug 733e7f19d3cf travis: add missing closing quote sign 0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter= aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules b9a619bb6738 udevadm: ignore EROFS and return earlier 1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree 7fa7080248aa umount: be happy if /proc/swaps doesn't exist 71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools b50ca0152681 core: do not propagate polkit error to caller 99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list 37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault 3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC 2139d58652bb bpf: fix off-by-one in class whitelisting cb7693595db9 bpf: fix device type filter 56e1ba304b00 core: constify bpf program arrays b06b7ace92c1 run: propagate return code/status from the child 5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection 8d88a2ecd7ce udev: fix error code in the log message c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node f218b65b3246 udev: do not append newline when write attributes ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone 8b888d236007 seccomp: add all *time64 syscalls 53d8feeb2334 libblkid: open device in nonblock mode. b9478046b03d man: describe ordering in case of Conflicts= fa3e5bd2bbb4 man: put description of Wants= above Requires= bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page 9c12127e3d2e man: save pull-raw example file without underscores 4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page 03cc374fca74 shared/format-table: disable ellipsization when piped 0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too fc0451bc0a3f allow an empty DefaultInstance= in configuration files 587266c24aae man/systemd.net-naming-scheme: fix typo e0e63f0f9bb9 nspawn: respect quiet on capabilities warning 37e50c05b564 nspawn: mangle slice name 4fefc493541e mkosi: Find hostname command on Arch Linux c430e8affba4 Fix mkosi on Arch Linux 1765b8d803dd Update to Fedora31 0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2 24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available 14e377ef3519 sd-boot: Only disable optimization on debug builds a39008ddecb9 meson: correct man page deps 4c1dcc06fa30 sd-event: don't invalidate source type on disconnect fb89ee34cedc analyze: fix minor memleak a449299bc087 analyze: sort list of unknown syscalls kernel implements 51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists 819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq d2b4d7ee17de network-generator: Add missing help for --root f1b18c206208 modules-load: do not fail service if modules are not present 606de6626714 pid1: order .automount units after local-fs-pre.target 1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command 00af6c447f25 resolved: set stream type during DnsStream creation 66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function 34fa67bbe732 machine-id-setup: avoid unexpected aborting 24c99fa2ef3d test-socket-util: avoid writing past the defined buffer ce82233f99b3 test: drop duplicated 's' 75a0e7209114 nspawn: fix handling of --console=help f41a282875fc Revert "sysusers: properly mark generated accounts as locked" fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users 6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS 961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure 19590e289ace ceph is a network filesystem 339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func 47d0e23d26af udev: fix memleak caused by wrong cleanup function a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.* cb1d892f1780 parse_hwdb: process files in order ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range 25bb377a73e7 cgroup: fix typo in BPF firewall support warning message 6d97aca0d503 fix build with compilers with default stack-protector enabled fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p 20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV 6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment 9d8e889810b5 nspawn: consistenly fail if parsing the environment fails 40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min ea248e53bf76 cgroup: Check ancestor memory min for unified memory config de1d25a506db cgroup: docs: memory.high doc fixups 2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem 5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly 8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments a0577353f191 man: Add a missing space in machinectl(1) 693e98398869 log: Add missing "%" in "%m" log format strings ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...t-install-dependency-links-at-install-tim.patch | 30 ++-- ...01-do-not-disable-buffer-in-writing-files.patch | 88 ++++-------- ...e-comprehensive-protection-against-libsec.patch | 152 --------------------- ...-consider-symlink-on-filesystems-like-NFS.patch | 42 ------ .../systemd/0004-rules-whitelist-hd-devices.patch | 34 ----- ...les-watch-metadata-changes-in-ide-devices.patch | 45 ------ .../systemd/{systemd_243.2.bb => systemd_243.4.bb} | 4 - 9 files changed, 45 insertions(+), 354 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.2.bb b/meta/recipes-core/systemd/systemd-boot_243.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.2.bb rename to meta/recipes-core/systemd/systemd-boot_243.4.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 18f17d2..2fca6dc 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" +SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +PV = "243.4+git${SRCPV}" + S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff..ea37680 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/units/meson.build b/units/meson.build -index e1ee9f86c3..6bb7771b36 100644 ---- a/units/meson.build -+++ b/units/meson.build +Index: systemd-stable/units/meson.build +=================================================================== +--- systemd-stable.orig/units/meson.build ++++ systemd-stable/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 30a6bc9918..4231f3b70f 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount +Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount ++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index e940c7c9ad..6be7f5cc9b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +Index: systemd-stable/units/systemd-binfmt.service.in +=================================================================== +--- systemd-stable.orig/units/systemd-binfmt.service.in ++++ systemd-stable/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount + After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target - ConditionPathIsReadWrite=/proc/sys/ -@@ -28,3 +29,6 @@ Type=oneshot +@@ -29,3 +30,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt TimeoutSec=90s diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 2f4daf8..d6d68a0 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -38,11 +38,9 @@ Signed-off-by: Scott Murray src/vconsole/vconsole-setup.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -51,7 +49,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -105,11 +103,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,11 +121,9 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -138,8 +132,6 @@ index 123d00e13e..e7ea78f349 100644 if (r < 0) return r; -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -294,7 +294,7 @@ void disable_coredumps(void) { @@ -151,11 +143,9 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) if (!fn) return log_oom(); @@ -164,7 +154,7 @@ index aa9d811f2e..8c7f2dae7a 100644 } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) (void) delete_rule(rule); @@ -182,11 +172,9 @@ index aa9d811f2e..8c7f2dae7a 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -195,7 +183,7 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -204,11 +192,9 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) } #ifdef SMACK_RUN_LABEL @@ -230,8 +216,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,11 +227,9 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -256,11 +238,9 @@ index c4a7f2f3d3..bcac758284 100644 if (r < 0) { if (r == -ELOOP) return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { +@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd if (!t) return -ENOMEM; @@ -269,11 +249,9 @@ index 30b9a66334..cc1d577933 100644 } return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +260,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,7 +271,7 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -311,11 +287,9 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c +@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con log_debug("Setting '%s' to '%s'", p, value); @@ -324,11 +298,9 @@ index 93bdcf11bf..68cddb7a9f 100644 } int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +@@ -54,7 +54,7 @@ static int write_hibernate_location_info /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { @@ -337,7 +309,7 @@ index b9fe96635d..f168d7f890 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +@@ -98,14 +98,14 @@ static int write_hibernate_location_info offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); @@ -363,7 +335,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,24 +344,20 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 + bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { +@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -398,11 +366,9 @@ index cb5123042a..ea309a9e7f 100644 if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch b/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted file mode 100644 index f359d28..0000000 --- a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Nov 2019 17:51:30 +0100 -Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's - __NR_xyz namespace invasion - -A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the -same conditioning for all cases of our __NR_xyz use. - -Fixes: #14031 - -Reference: -https://github.com/systemd/systemd/pull/14032/commits/62f66fdbcc33580467c01b1f149474b6c973df5a - -Upstream-Status: Backport - -Signed-off-by: Ming Liu ---- - src/basic/missing_syscall.h | 10 +++++----- - src/test/test-seccomp.c | 19 ++++++++++--------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 6d9b125..1255d8b 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c - - #if !HAVE_KCMP - static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { --# ifdef __NR_kcmp -+# if defined __NR_kcmp && __NR_kcmp > 0 - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else - errno = ENOSYS; -@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i - - #if !HAVE_KEYCTL - static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { --# ifdef __NR_keyctl -+# if defined __NR_keyctl && __NR_keyctl > 0 - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; -@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg - } - - static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { --# ifdef __NR_add_key -+# if defined __NR_add_key && __NR_add_key > 0 - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; -@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip - } - - static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { --# ifdef __NR_request_key -+# if defined __NR_request_key && __NR_request_key > 0 - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; -@@ -496,7 +496,7 @@ enum { - static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, - unsigned long maxnode) { - long i; --# ifdef __NR_set_mempolicy -+# if defined __NR_set_mempolicy && __NR_set_mempolicy > 0 - i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); - # else - errno = ENOSYS; -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 018c20f..c669204 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -28,7 +28,8 @@ - #include "tmpfile-util.h" - #include "virt.h" - --#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) -+/* __NR_socket may be invalid due to libseccomp */ -+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) - /* On these archs, socket() is implemented via the socketcall() syscall multiplexer, - * and we can't restrict it hence via seccomp. */ - # define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1 -@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) { - assert_se(pid >= 0); - - if (pid == 0) { --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); - #endif - - assert_se(seccomp_protect_sysctl() >= 0); - --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0); - assert_se(errno == EPERM); - #endif -@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(poll(NULL, 0, 0) == 0); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0); -@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); -@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) { - * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On - * other architectures, let's just fall back to the glibc call. */ - --#ifdef SYS_open -- return (int) syscall(SYS_open, path, flags, mode); -+#if defined __NR_open && __NR_open > 0 -+ return (int) syscall(__NR_open, path, flags, mode); - #else - return open(path, flags, mode); - #endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch b/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted file mode 100644 index ba20a0b..0000000 --- a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d0122c077d2d8fd0fd29b463c501e7ddf9177ff3 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 24 Sep 2019 17:04:50 +0800 -Subject: [PATCH] unit-file.c: consider symlink on filesystems like NFS - -Some filesystems do not fully support readdir, according to the manual, -so we should also consider DT_UNKNOWN to correctly handle symlinks. - -Signed-off-by: Chen Qi - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/13637] ---- - src/shared/unit-file.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c -index 4a5f23e6c1..8373103000 100644 ---- a/src/shared/unit-file.c -+++ b/src/shared/unit-file.c -@@ -247,6 +247,7 @@ int unit_file_build_name_map( - _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; - const char *suffix, *dst = NULL; - bool valid_unit_name; -+ struct stat sb; - - valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY); - -@@ -279,7 +280,10 @@ int unit_file_build_name_map( - if (hashmap_contains(ids, de->d_name)) - continue; - -- if (de->d_type == DT_LNK) { -+ if (de->d_type == DT_LNK || -+ (de->d_type == DT_UNKNOWN && -+ lstat(filename, &sb) == 0 && -+ (sb.st_mode & S_IFMT) == S_IFLNK)) { - /* We don't explicitly check for alias loops here. unit_ids_map_get() which - * limits the number of hops should be used to access the map. */ - --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch deleted file mode 100644 index f9c5996..0000000 --- a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dc0a6a9fe4da9738efaba942233ad39da625a918 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 21 Feb 2019 16:28:21 +0800 -Subject: [PATCH 4/5] rules: whitelist hd* devices - -qemu by default emulates IDE and the linux-yocto kernel(s) use -CONFIG_IDE instead of the more modern libsata, so disks appear as -/dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. - -Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] - -Signed-off-by: Patrick Ohly -Signed-off-by: Khem Raj -[rebased for systemd 241] -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - rules/60-persistent-storage.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index 7802b1c94f..c0534ae26a 100644 ---- a/rules/60-persistent-storage.rules -+++ b/rules/60-persistent-storage.rules -@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" - ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" - - SUBSYSTEM!="block", GOTO="persistent_storage_end" --KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end" -+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end" - - # ignore partitions that span the entire disk - TEST=="whole_disk", GOTO="persistent_storage_end" diff --git a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch deleted file mode 100644 index 96175b5..0000000 --- a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1bccc721dd8f43fee29c5df0e9b78345e69f4b6 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 21 Feb 2019 16:38:38 +0800 -Subject: [PATCH 5/5] rules: watch metadata changes in ide devices - -Formatting IDE storage does not trigger "change" uevents. As a result -clients using udev API don't get any updates afterwards and get outdated -information about the device. -... -root at qemux86-64:~# mkfs.ext4 -F /dev/hda1 -Creating filesystem with 262144 4k blocks and 65536 inodes -Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 - -root at qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 -ls: cannot access '/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory -... -Include hd* in a match for watch option assignment. - -Upstream-Status: Denied - -qemu by default emulates IDE and the linux-yocto kernel(s) use -CONFIG_IDE instead of the more modern libsata, so disks appear as -/dev/hd*. A similar patch rejected by upstream because CONFIG_IDE -is deprecated. - -Signed-off-by: Hongxu Jia -[rebased for systemd 241] -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - rules/60-block.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/60-block.rules b/rules/60-block.rules -index 3134ab995e..cd72a494a1 100644 ---- a/rules/60-block.rules -+++ b/rules/60-block.rules -@@ -9,5 +9,5 @@ ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", - - # watch metadata changes, caused by tools closing the device node which was opened for writing - ACTION!="remove", SUBSYSTEM=="block", \ -- KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", \ -+ KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", \ - OPTIONS+="watch" diff --git a/meta/recipes-core/systemd/systemd_243.2.bb b/meta/recipes-core/systemd/systemd_243.4.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.2.bb rename to meta/recipes-core/systemd/systemd_243.4.bb index e31fac8..a0d10e0 100644 --- a/meta/recipes-core/systemd/systemd_243.2.bb +++ b/meta/recipes-core/systemd/systemd_243.4.bb @@ -20,10 +20,6 @@ SRC_URI += "file://touchscreen.rules \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://0004-rules-whitelist-hd-devices.patch \ - file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ - file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \ file://99-default.preset \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:16 +0000 Subject: [oe-commits] [openembedded-core] 17/25: ifupdown: add ptest In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.4C0062329CE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2333ef5bb40132f05f69a5f6abaa3d086ecf9f6c Author: Kai Kang AuthorDate: Mon Feb 3 17:33:11 2020 +0800 ifupdown: add ptest Add ptest for ifupdown with its own test cases. [Yocto #13736] Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 ++++++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 ++++- 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/ifupdown/files/run-ptest b/meta/recipes-core/ifupdown/files/run-ptest new file mode 100644 index 0000000..8694042 --- /dev/null +++ b/meta/recipes-core/ifupdown/files/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linux diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file mode 100644 index 0000000..d7600cf --- /dev/null +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -e + +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test + + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test + + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then +- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "==========" diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb index 0de97fe..53cb971 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb @@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" S = "${WORKDIR}/git" -inherit update-alternatives +inherit ptest update-alternatives do_compile () { chmod a+rx *.pl *.sh @@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} + ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "ifup ifdown" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:24 +0000 Subject: [oe-commits] [openembedded-core] 25/25: kernel-yocto.bbclass: export LD in the environment used by kconf_check In-Reply-To: <158083181923.1817.10886420581364957277@git.openembedded.org> References: <158083181923.1817.10886420581364957277@git.openembedded.org> Message-ID: <20200204155700.94EC22329F9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d3083e941578fb343454e106eba349adcc525ad3 Author: Martin Jansa AuthorDate: Mon Feb 3 23:44:20 2020 +0100 kernel-yocto.bbclass: export LD in the environment used by kconf_check * resolves following exceptions in log.do_kernel_configcheck: DEBUG: Executing python function do_kernel_configcheck Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ self._init(filename, warn, warn_to_stderr, encoding) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init self._parse_block(None, self.top_node, self.top_node).next = None File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block prev = self._parse_block(None, parent, prev) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block while self._next_line(): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line self._tokens = self._tokenize(line) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize self._parse_assignment(s) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment s, i = self._expand_macro(s, i, ()) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro res += self._fn_val(new_args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val return py_fn(self, *args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn kconf.filename, kconf.linenr, msg)) kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' * there is still 291 mismatched options in default 5.4.15 builds, but at least the 11804 lines long log doesn't start with 9022 lines of above exceptions DEBUG: Executing python function do_kernel_configcheck [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt There were hardware options requested that do not have a corresponding value present in the final ".config" file. This probably means you aren't getting the config you wanted. WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: ... Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 87c681f..141eeaf 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -370,6 +370,7 @@ python do_kernel_configcheck() { env = os.environ.copy() env['PATH'] = "%s:%s%s" % (d.getVar('PATH'), s, "/scripts/util/") + env['LD'] = "${KERNEL_LD}" try: configs = subprocess.check_output(['scc', '--configs', '-o', s + '/.kernel-meta'], env=env).decode('utf-8') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:48 +0000 Subject: [oe-commits] [openembedded-core] 01/11: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.2813C2329D1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e78d7717a4669172aae4569086502604245732e6 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (07433b7 -> 0714bd5) Message-ID: <158083186783.2897.15549724420568643936@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 07433b7 fixup discard 4e03804 oeqa/reproducible: Improve test output and ensure deb+ipk compared discard 8a86e97 kernel-yocto.bbclass: export LD in the environment used by kconf_check discard f516cf3 systemd: Upgrade 243.2 -> 243.4-latest discard 8ccef8c python3-six: Move src_uri checks to recipe main discard fd9553b kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled discard 9a5f65e rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True discard d99ef30 oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True discard 2a563a5 piglit: don't stage the test suite discard efabe1f podfix: remove discard ed145d7 ifupdown: add ptest discard cc4b0ff lttng-modules: update to 2.11.1 discard df5d2c4 rsync: whitelist CVE-2017-16548 discard c4d78f1 bash: include patch 8-11 discard b80bf49 gstreamer1.0-plugins-common.inc: disable orc on mips discard 5045c6d lib/oe/path: try hardlinking instead of guessing when it might fail discard 4cad166 buildhistory: Allow customising buildhistory tags discard 3a7c509 cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL discard ed8e300 procps: enable optional systemd support discard a12660a libtirpc: upgrade 1.1.4 -> 1.2.5 discard 1bc9ae6 sudo: upgrade 1.8.29 -> 1.8.30 discard f922d3b assimp: upgrade 5.0.0 -> 5.0.1 discard 7ae6d78 glib-networking: upgrade 2.62.2 -> 2.62.3 discard 39f7cbf stress-ng: upgrade 0.10.15 -> 0.10.16 discard 85fb7b6 glibc: don't ignore global LDFLAGS settings discard e1b5f7a opkg-utils: Fix reproducibility discard 4fe0c1b libxshmfence: Set shm directory deterministically discard 4bac8ac sudo: Set vardir deterministically discard a6d88da sstatesig: Log timestamps for hashequiv in reprodubile builds discard 6e1bc08 HACK: signing: Add extra test debug discard fd17f5e glew/curl: specify exclusive package configs discard 92a1199 base.bbclass: extend PACKAGECONFIG for conflict package configs discard a23f3e1 oescripts.py: use unittest.SkipUnless for class skip add 39fe849 sudo: Set vardir deterministically add 6217c3a libxshmfence: Set shm directory deterministically add 4535469 glibc: don't ignore global LDFLAGS settings add be821fd stress-ng: upgrade 0.10.15 -> 0.10.16 add 046851a glib-networking: upgrade 2.62.2 -> 2.62.3 add ea43f8a assimp: upgrade 5.0.0 -> 5.0.1 add 5933efd sudo: upgrade 1.8.29 -> 1.8.30 add 009dbec libtirpc: upgrade 1.1.4 -> 1.2.5 add 54a5dac procps: enable optional systemd support add cdd44c9 cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL add 1bb2aa5 buildhistory: Allow customising buildhistory tags add f5571bd lib/oe/path: try hardlinking instead of guessing when it might fail add 2b65c49 gstreamer1.0-plugins-common.inc: disable orc on mips add 61c3449 bash: include patch 8-11 add 1e2739c rsync: whitelist CVE-2017-16548 add d313e49 lttng-modules: update to 2.11.1 add 2333ef5 ifupdown: add ptest add 46884b1 podfix: remove add 9cc4dc9 piglit: don't stage the test suite add c3bd502 oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True add 0ebb56f rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True add 66c1f4b kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled add 7515a38 python3-six: Move src_uri checks to recipe main add 48a061c systemd: Upgrade 243.2 -> 243.4-latest add d3083e9 kernel-yocto.bbclass: export LD in the environment used by kconf_check new e78d771 oescripts.py: use unittest.SkipUnless for class skip new 1dd7a8d base.bbclass: extend PACKAGECONFIG for conflict package configs new 2e41081 glew/curl: specify exclusive package configs new 05ddb80 HACK: signing: Add extra test debug new 325fc4c sstatesig: Log timestamps for hashequiv in reprodubile builds new f566ebd opkg-utils: Fix reproducibility new c9b4c47 oeqa/reproducible: Improve test output and ensure deb+ipk compared new 3aac5ef fixup new 9c136e7 baremetal-helloworld: Create recipe for baremetal examples on QEMU new ae877d9 netbase: Upgrade to 6.0 new 0714bd5 musl: Update to latest on master This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (07433b7) \ N -- N -- N refs/heads/master-next (0714bd5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../baremetal-examples/baremetal-helloworld_git.bb | 105 +++++++++++++++++++++ meta/recipes-core/musl/musl_git.bb | 2 +- .../netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +- 3 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb rename meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} (61%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:51 +0000 Subject: [oe-commits] [openembedded-core] 04/11: HACK: signing: Add extra test debug In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.4980F2329DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 05ddb80d4e4d3e5cc2741e031241b2d15eef551c Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:49 +0000 Subject: [oe-commits] [openembedded-core] 02/11: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.333CD2329D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1dd7a8d63b0744765199dcb93ead4b26ebcd90b2 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:50 +0000 Subject: [oe-commits] [openembedded-core] 03/11: glew/curl: specify exclusive package configs In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.3DC132329D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2e4108103e3b800e728abb4bd069db6c1aaff17c Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:53 +0000 Subject: [oe-commits] [openembedded-core] 06/11: opkg-utils: Fix reproducibility In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.5E7282329DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f566ebddde07299ab1301b9c76c5c91929a29412 Author: Richard Purdie AuthorDate: Mon Feb 3 20:39:14 2020 +0000 opkg-utils: Fix reproducibility Signed-off-by: Richard Purdie --- .../opkg-utils/opkg-utils/fix-reproducibility.patch | 15 +++++++++++++++ meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 16 insertions(+) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000..fca5e66 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,15 @@ +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,8 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 8e7ef00..eda73db 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:52 +0000 Subject: [oe-commits] [openembedded-core] 05/11: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.542482329DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 325fc4c296fc65dc152f8621ff0777bc125aa8df Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:54 +0000 Subject: [oe-commits] [openembedded-core] 07/11: oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.68D202329E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c9b4c4788333e70ea0fe83ea3b6e6bf1deede738 Author: Richard Purdie AuthorDate: Mon Feb 3 23:39:29 2020 +0000 oeqa/reproducible: Improve test output and ensure deb+ipk compared Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f..f6433c9 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:55 +0000 Subject: [oe-commits] [openembedded-core] 08/11: fixup In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.723C52329E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3aac5ef688ff8bc873bd4a64e3dfc89316a93601 Author: Richard Purdie AuthorDate: Tue Feb 4 12:29:52 2020 +0000 fixup Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch index fca5e66..d206020 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -2,12 +2,14 @@ Index: opkg-utils-0.4.2/opkg-build =================================================================== --- opkg-utils-0.4.2.orig/opkg-build +++ opkg-utils-0.4.2/opkg-build -@@ -305,8 +305,8 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then mtime_args="--mtime=@$build_date --clamp-mtime" fi -( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) -( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C +( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) +( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:57 +0000 Subject: [oe-commits] [openembedded-core] 10/11: netbase: Upgrade to 6.0 In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.864AD2329E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ae877d915eeb54edd1d3861a53857929164bb0c6 Author: Khem Raj AuthorDate: Sun Feb 2 10:34:58 2020 -0800 netbase: Upgrade to 6.0 adjust install to pick new files from S Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/netbase/netbase_5.8.bb b/meta/recipes-core/netbase/netbase_6.0.bb similarity index 61% rename from meta/recipes-core/netbase/netbase_5.8.bb rename to meta/recipes-core/netbase/netbase_6.0.bb index df617f4..2fb5762 100644 --- a/meta/recipes-core/netbase/netbase_5.8.bb +++ b/meta/recipes-core/netbase/netbase_6.0.bb @@ -8,13 +8,13 @@ PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[md5sum] = "ca2e339861b64370779341b9696ee3df" -SRC_URI[sha256sum] = "4a9035eb379c4f7f7d424e5580b219b79566fa366c812542691ae337486cfb8e" +SRC_URI[md5sum] = "3417b0487161f1a2b070a3308cd7f957" +SRC_URI[sha256sum] = "692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { install -d ${D}/${mandir}/man8 ${D}${sysconfdir} - install -m 0644 etc-rpc ${D}${sysconfdir}/rpc - install -m 0644 etc-protocols ${D}${sysconfdir}/protocols - install -m 0644 etc-services ${D}${sysconfdir}/services + install -m 0644 ${S}/etc/rpc ${D}${sysconfdir}/rpc + install -m 0644 ${S}/etc/protocols ${D}${sysconfdir}/protocols + install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:58 +0000 Subject: [oe-commits] [openembedded-core] 11/11: musl: Update to latest on master In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.900E72329E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0714bd58c9e927bbe718518bae297ec31cbb548d Author: Khem Raj AuthorDate: Sun Feb 2 10:34:59 2020 -0800 musl: Update to latest on master Details on commit delta [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=83350eb17b9cb355e3f08b0340c4f1e8c437fac9..e6093b5a870a38ebfb3e54382acd48c698bde15d Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 6298720..f4853b4 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" +SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 15:57:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 15:57:56 +0000 Subject: [oe-commits] [openembedded-core] 09/11: baremetal-helloworld: Create recipe for baremetal examples on QEMU In-Reply-To: <158083186783.2897.15549724420568643936@git.openembedded.org> References: <158083186783.2897.15549724420568643936@git.openembedded.org> Message-ID: <20200204155748.7C8982329E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9c136e78d8ab8774936b803aca67d97cf1b70b5e Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Jan 31 01:54:42 2020 -0800 baremetal-helloworld: Create recipe for baremetal examples on QEMU Create HelloWorld examples that run on several of the QEMU architectures supported by the build system. This recipe can be used by anyone to understand how baremetal applications can be built using OpenEmbedded and how the wiring to set them up could be. This should also facilitate creating/extending the OE testing infrastructure to allow baremetal applications or RTOSs to be tested in the same way that Linux currently is. This can easily be extended to work on other MACHINES in the future. To run this example: $ source oe-init-buildenv $ bitbake-layers add-layer ../meta-skeleton # TCLIBC="baremetal" would work as well $ echo "TCLIBC = \"newlib\"" >> ./conf/local.conf $ echo "MACHINE = \"qemuarm64\"" >> ./conf/local.conf $ bitbake baremetal-helloworld $ runqemu runqemu - INFO - Running bitbake -e ... runqemu - INFO - Continuing with the following parameters: KERNEL: [tmp/deploy/images/qemuarm64/baremetal-helloworld-qemuarm64.bin] MACHINE: [qemuarm64] FSTYPE: [bin] ROOTFS: [tmp/deploy/images/qemuarm64/baremetal-helloworld-qemuarm64.bin] CONFFILE: [tmp/deploy/images/qemuarm64/baremetal-helloworld-qemuarm64.qemuboot.conf] Hello OpenEmbedded! Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- .../baremetal-examples/baremetal-helloworld_git.bb | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb new file mode 100644 index 0000000..d863370 --- /dev/null +++ b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb @@ -0,0 +1,105 @@ +SUMMARY = "Baremetal examples to work with the several QEMU architectures supported on OpenEmbedded" +HOMEPAGE = "https://github.com/aehs29/baremetal-helloqemu" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449" + +SRCREV = "99f4fa4a3b266b42b52af302610b0f4f429ba5e3" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master" + +S = "${WORKDIR}/git/" + +# These examples are not meant to be built when using either musl or glibc +COMPATIBLE_HOST_libc-musl_class-target = "null" +COMPATIBLE_HOST_libc-glibc_class-target = "null" + +# This will be translated automatically to the architecture and +# machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57 +# but the examples can also be run on other architectures/machines +# such as vexpress-a15 by overriding the setting on the machine.conf +COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64" + +BAREMETAL_QEMUARCH ?= "" +BAREMETAL_QEMUARCH_qemuarmv5 = "versatile" +BAREMETAL_QEMUARCH_qemuarm = "arm" +BAREMETAL_QEMUARCH_qemuarm64 = "aarch64" + + +EXTRA_OEMAKE_append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1" + +do_install(){ + install -d ${D}/${datadir} + install -m 755 ${B}build/hello_baremetal_${BAREMETAL_QEMUARCH}.bin ${D}/${datadir}/hello_baremetal_${MACHINE}.bin + install -m 755 ${B}build/hello_baremetal_${BAREMETAL_QEMUARCH}.elf ${D}/${datadir}/hello_baremetal_${MACHINE}.elf +} + +# Borrowed from meta-freertos +inherit rootfs-postcommands +inherit deploy +do_deploy[dirs] = "${DEPLOYDIR} ${DEPLOY_DIR_IMAGE}" +do_rootfs[dirs] = "${DEPLOYDIR} ${DEPLOY_DIR_IMAGE}" +DEPLOYDIR = "${IMGDEPLOYDIR}" +IMAGE_LINK_NAME ?= "baremetal-helloworld-image-${MACHINE}" +IMAGE_NAME_SUFFIX ?= "" + +do_deploy(){ + install ${D}/${datadir}/hello_baremetal_${MACHINE}.bin ${DEPLOYDIR}/${IMAGE_LINK_NAME}.bin + install ${D}/${datadir}/hello_baremetal_${MACHINE}.elf ${DEPLOYDIR}/${IMAGE_LINK_NAME}.elf +} + +do_image(){ + : +} + +FILES_${PN} += " \ + ${datadir}/hello_baremetal_${MACHINE}.bin \ + ${datadir}/hello_baremetal_${MACHINE}.elf \ +" + +python do_rootfs(){ + from oe.utils import execute_pre_post_process + from pathlib import Path + + # Write empty manifest testdate file + deploy_dir = d.getVar('DEPLOYDIR') + link_name = d.getVar('IMAGE_LINK_NAME') + manifest_name = d.getVar('IMAGE_MANIFEST') + + Path(manifest_name).touch() + if os.path.exists(manifest_name) and link_name: + manifest_link = deploy_dir + "/" + link_name + ".manifest" + if os.path.lexists(manifest_link): + os.remove(manifest_link) + os.symlink(os.path.basename(manifest_name), manifest_link) + execute_pre_post_process(d, d.getVar('ROOTFS_POSTPROCESS_COMMAND')) +} + +# QEMU generic FreeRTOS parameters +QB_DEFAULT_KERNEL = "${IMAGE_LINK_NAME}.bin" +QB_MEM = "-m 256" +QB_OPT_APPEND = "-nographic" +QB_DEFAULT_FSTYPE = "bin" +QB_DTB = "" + +# This next part is necessary to trick the build system into thinking +# its building an image recipe so it generates the qemuboot.conf +addtask do_deploy after do_write_qemuboot_conf before do_build +addtask do_rootfs before do_deploy after do_install +addtask do_image after do_rootfs before do_build +inherit qemuboot + +# Based on image.bbclass to make sure we build qemu +python(){ + # do_addto_recipe_sysroot doesnt exist for all recipes, but we need it to have + # /usr/bin on recipe-sysroot (qemu) populated + def extraimage_getdepends(task): + deps = "" + for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): + # Make sure we only add it for qemu + if 'qemu' in dep: + deps += " %s:%s" % (dep, task) + return deps + d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_addto_recipe_sysroot')) + d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_sysroot')) +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 17:28:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 17:28:50 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: fio: Add support for PMDK engines In-Reply-To: <158083732997.26418.1403463833969298805@git.openembedded.org> References: <158083732997.26418.1403463833969298805@git.openembedded.org> Message-ID: <20200204172850.2A0A92329D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d542138365c5fb8cc9e3dd8385c0f6cd2f861c19 Author: Yongxin Liu AuthorDate: Tue Feb 4 13:49:22 2020 +0800 fio: Add support for PMDK engines "pmemblk", "dev-dax" and "libpmem" engines are used for persistent memory. In order to enable them, add "pmem" to MACHINE_FEATURES in BSP conf. Signed-off-by: Yongxin Liu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb index 5a9cc83..482928c 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -11,6 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" RDEPENDS_${PN} = "python3-core bash" PACKAGECONFIG_NUMA = "numa" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 17:28:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 17:28:49 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (e33a3db -> 45eb76a) Message-ID: <158083732997.26418.1403463833969298805@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard e33a3db smem: add a native variant discard 89c8b9f Library to aid multi-part form data parsing discard b88a546 fio: Add support for PMDK engines discard bceff42 rsyslog: disable ptest as it requires python2 new d542138 fio: Add support for PMDK engines new 0aed780 libmimetic: Add recipe new 45eb76a smem: add a native variant This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e33a3db) \ N -- N -- N refs/heads/master-next (45eb76a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 17:28:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 17:28:52 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: smem: add a native variant In-Reply-To: <158083732997.26418.1403463833969298805@git.openembedded.org> References: <158083732997.26418.1403463833969298805@git.openembedded.org> Message-ID: <20200204172850.4CD562329DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 45eb76aab64721950290b8746c38f44b2b0bb220 Author: Andr? Draszik AuthorDate: Tue Feb 4 11:14:26 2020 +0000 smem: add a native variant The native variant is useful to e.g. examine captures of a running target on the host system. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb index 702217a..947c47b 100644 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ b/meta-oe/recipes-support/smem/smem_1.4.bb @@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codec PACKAGES =+ "smemcap" FILES_smemcap = "${bindir}/smemcap" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 17:28:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 17:28:51 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: libmimetic: Add recipe In-Reply-To: <158083732997.26418.1403463833969298805@git.openembedded.org> References: <158083732997.26418.1403463833969298805@git.openembedded.org> Message-ID: <20200204172850.3C2162329D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0aed780b9a2c60a53c7e3de98041c002b8ea175e Author: asmitha AuthorDate: Tue Feb 4 14:51:26 2020 +0530 libmimetic: Add recipe Mimetic library helps parsing the multi-part form data. This library can be used for scenarios that includes multi-part form data file uploads to the BMC. The patch file (config.patch) includes: i) addition of a compilation flag - "no-narrowing" since this has been treated as warning in earlier versions of c++ and now with the higher versions, this is treated as errors. ii) the test directory is removed as there were errors (relocation errors) since the shared object files of libc++ and libc were not taken from the sysroot path but from the system's library path where the required version of the .so is not present. Signed-off-by: asmitha Signed-off-by: Khem Raj --- .../libmimetic/libmimetic/config.patch | 25 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 19 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/config.patch b/meta-oe/recipes-support/libmimetic/libmimetic/config.patch new file mode 100644 index 0000000..52bf7b4 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/config.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 634bd4c..c7cbae7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST=LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc examples win32 + INCLUDES=-I$(top_srcdir) + ACLOCAL_AMFLAGS=-I m4 + +diff --git a/configure.in b/configure.in +index 5e8f3d4..af1018e 100644 +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ debug_enabled=false + dnl CFLAGS and CXXFLAGS default to -O2 -g + + dnl CXXFLAGS="$CXXFLAGS -DNDEBUG -fno-exceptions" +-CXXFLAGS="$CXXFLAGS -DNDEBUG" ++CXXFLAGS="$CXXFLAGS -DNDEBUG -Wno-narrowing" + + AC_ARG_ENABLE(debug, + [ --enable-debug[=LEVEL] enables debug symbols [default=2]], diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb new file mode 100644 index 0000000..a0a7041 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -0,0 +1,19 @@ +# Released under the MIT license. + +SUMMARY = "Mimetic Library for multi-part parsing" +DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." +AUTHOR = "Stefano Barbato " +HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" +BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" + +SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" +SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ + file://config.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:15:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:15:58 +0000 Subject: [oe-commits] [openembedded-core] 03/10: HACK: Intercept broken permissions in build In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.9898A2329E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 436fdc39c6cca54f615b855d90bd84d22f9528b0 Author: Richard Purdie AuthorDate: Tue Feb 4 18:09:56 2020 +0000 HACK: Intercept broken permissions in build Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..bd5b7c3 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -908,6 +908,8 @@ def package_qa_check_host_user(path, name, d, elf, messages): if path == home or path.startswith(home + os.sep): return + import stat as stat2 + try: stat = os.lstat(path) except OSError as exc: @@ -924,6 +926,9 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/usr/src/debug/tcp-wrappers" in path and "weak_symbols" not in path: + if stat2.S_IMODE(stat.st_mode) & stat2.S_IWUSR: + bb.error("Fatal perms for %s %s" % (path, stat2.S_IMODE(stat.st_mode))) return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:15:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:15:57 +0000 Subject: [oe-commits] [openembedded-core] 02/10: mc: Set zipinfo presence determinstically In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.8F3B42329E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ef7a541eebb84f8eab79c8ed68f4bfbfa6604c7 Author: Richard Purdie AuthorDate: Tue Feb 4 13:59:26 2020 +0000 mc: Set zipinfo presence determinstically This value was floating causing differences in generated files. Set it determinstically. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 95fa1da..d8c8f86 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -29,6 +29,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:15:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:15:59 +0000 Subject: [oe-commits] [openembedded-core] 04/10: mc: Fix manpage date indeterminism In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.A227C2329E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b04b864906257a32562346320cd7f50d3812865f Author: Richard Purdie AuthorDate: Tue Feb 4 18:12:15 2020 +0000 mc: Fix manpage date indeterminism The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 0000000..48bd73b --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index d8c8f86..ead348b 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:15:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:15:56 +0000 Subject: [oe-commits] [openembedded-core] 01/10: logrotate.py: improve oeqa test implementation In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.85D102329DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d7c79359a2f075ce8adc90fc22a3c0c579857950 Author: Trevor Gamblin AuthorDate: Thu Jan 23 20:29:28 2020 -0500 logrotate.py: improve oeqa test implementation See bug https://bugzilla.yoctoproject.org/show_bug.cgi?id=13632 Autobuilder tests occasionally fail, reporting that a new logfile could not be created. While this failure did occur multiple times, it could not be manually reproduced. However, there are issues with the implementation of the logrotate.py script that can be fixed. These changes will help make the failures clearer, should they continue to occur. Previously, the test_2_logrotate test would, after running the logrotate tool, use "ls -al $HOME/logrotate_dir | wc -l" to count the number of files in the rotation directory and determine if the rotation was successful. The test to see if there are at least three files is problematic, because depending on the version of ls used, it may report the target value of 3 even when there are only hidden files in the directory, potentially reporting a pass for the test when it should actually fail. An example with coreutils: root at qemux86-64:~# ls -al emptydir/ total 2 drwxr-xr-x 2 root root 1024 Jan 14 19:50 . drwx------ 3 root root 1024 Jan 14 19:50 .. root at qemux86-64:~# Where "total" is the number of blocks used. Compare with busybox ls: root at qemux86-64:~# ls -al emptydir/ drwxr-xr-x 2 root root 1024 Jan 14 19:54 . drwx------ 3 root root 1024 Jan 14 19:54 .. root at qemux86-64:~# Instead of using ls to verify that a certain number of files exists in $HOME/logrotate_dir, the tests have been changed to rotate two specific logs: the log for wtmp and a new logrotate_testfile created during the second test. Both tests check that the logs are correctly rotated into $HOME/logrotate_dir by using find and grep on the expected filename (e.g. "wtmp" when rotated becomes "wtmp.1", so we check to see that wtmp.1 is present in $HOME/logrotate_dir). In addition, should the test fail, the output from logrotate -vf is included in the test log to aid debugging. It has also been seen that in some cases, the logrotate test fails because the /var/log/wtmp file is not yet present. Since the objective of the test is to check the logrotate functionality and not the presence of certain log files, test_logrotate_wtmp uses the touch command to help ensure that the file is present before the call to logrotate is issued. Finally, note that while the autobuilder failures that this patch addresses were only seen during core-image-full-cmdline tests, these changes were successfully tested on core-image-minimal and core-image-sato with the manual addition of logrotate and openssh-sshd to the images. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/logrotate.py | 62 ++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/logrotate.py b/meta/lib/oeqa/runtime/cases/logrotate.py index bfa57c5..3938e91 100644 --- a/meta/lib/oeqa/runtime/cases/logrotate.py +++ b/meta/lib/oeqa/runtime/cases/logrotate.py @@ -18,32 +18,58 @@ class LogrotateTest(OERuntimeTestCase): @classmethod def tearDownClass(cls): cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf $HOME/logrotate_dir') + cls.tc.target.run('rm -rf /var/log/logrotate_testfile && rm -rf /etc/logrotate.d/logrotate_testfile') @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['logrotate']) - def test_1_logrotate_setup(self): + def test_logrotate_wtmp(self): + + # /var/log/wtmp may not always exist initially, so use touch to ensure it is present + status, output = self.target.run('touch /var/log/wtmp') + msg = ('Could not create/update /var/log/wtmp with touch') + self.assertEqual(status, 0, msg = msg) + status, output = self.target.run('mkdir $HOME/logrotate_dir') - msg = 'Could not create logrotate_dir. Output: %s' % output + msg = ('Could not create logrotate_dir. Output: %s' % output) + self.assertEqual(status, 0, msg = msg) + + status, output = self.target.run('echo "create \n olddir $HOME/logrotate_dir \n include /etc/logrotate.d/wtmp" > /tmp/logrotate-test.conf') + msg = ('Could not write to /tmp/logrotate-test.conf') + self.assertEqual(status, 0, msg = msg) + + status, output = self.target.run('echo "/var/log/logrotate_test {\\n missingok \\n monthly \\n rotate 1" > /etc/logrotate.d/logrotate_test') + msg = ('Could not write to /etc/logrotate.d/logrotate_test') + self.assertEqual(status, 0, msg = msg) + + # If logrotate fails to rotate the log, view the verbose output of logrotate to see what prevented it + _, logrotate_output = self.target.run('logrotate -vf /tmp/logrotate-test.conf') + status, _ = self.target.run('find $HOME/logrotate_dir -type f | grep wtmp.1') + msg = ("logrotate did not successfully rotate the wtmp log. Output from logrotate -vf: \n%s" % (logrotate_output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['logrotate.LogrotateTest.test_logrotate_wtmp']) + def test_logrotate_newlog(self): + + status, output = self.target.run('echo "oeqa logrotate test file" > /var/log/logrotate_testfile') + msg = ('Could not create logrotate test file in /var/log') + self.assertEqual(status, 0, msg = msg) + + status, output = self.target.run('echo "/var/log/logrotate_testfile {\n missingok \n monthly \n rotate 1" > /etc/logrotate.d/logrotate_testfile') + msg = ('Could not write to /etc/logrotate.d/logrotate_testfile') self.assertEqual(status, 0, msg = msg) - cmd = ('sed -i "s#wtmp {#wtmp {\\n olddir $HOME/logrotate_dir#"' - ' /etc/logrotate.d/wtmp') - status, output = self.target.run(cmd) - msg = ('Could not write to logrotate.d/wtmp file. Status and output: ' - ' %s and %s' % (status, output)) + status, output = self.target.run('echo "create \n olddir $HOME/logrotate_dir \n include /etc/logrotate.d/logrotate_testfile" > /tmp/logrotate-test2.conf') + msg = ('Could not write to /tmp/logrotate_test2.conf') self.assertEqual(status, 0, msg = msg) - @OETestDepends(['logrotate.LogrotateTest.test_1_logrotate_setup']) - def test_2_logrotate(self): - status, output = self.target.run('echo "create \n include /etc/logrotate.d" > /tmp/logrotate-test.conf') - status, output = self.target.run('logrotate -f /tmp/logrotate-test.conf') + status, output = self.target.run('find $HOME/logrotate_dir -type f | grep logrotate_testfile.1') + msg = ('A rotated log for logrotate_testfile is already present in logrotate_dir') + self.assertEqual(status, 1, msg = msg) - msg = ('logrotate service could not be reloaded. Status and output: ' - '%s and %s' % (status, output)) + # If logrotate fails to rotate the log, view the verbose output of logrotate instead of just listing the files in olddir + _, logrotate_output = self.target.run('logrotate -vf /tmp/logrotate-test2.conf') + status, _ = self.target.run('find $HOME/logrotate_dir -type f | grep logrotate_testfile.1') + msg = ('logrotate did not successfully rotate the logrotate_test log. Output from logrotate -vf: \n%s' % (logrotate_output)) self.assertEqual(status, 0, msg = msg) - _, output = self.target.run('ls -la $HOME/logrotate_dir/ | wc -l') - msg = ('new logfile could not be created. List of files within log ' - 'directory: %s' % ( - self.target.run('ls -la $HOME/logrotate_dir')[1])) - self.assertTrue(int(output)>=3, msg = msg) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:15:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:15:55 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (0714bd5 -> 2175169) Message-ID: <158084015519.8502.17797624801679341774@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 0714bd5 musl: Update to latest on master new d7c7935 logrotate.py: improve oeqa test implementation new 8ef7a54 mc: Set zipinfo presence determinstically new 436fdc3 HACK: Intercept broken permissions in build new b04b864 mc: Fix manpage date indeterminism new 3b09f6f webkitgtk: Prefer -pthread over -lpthread new 5f92fd4 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' new 8b74bdc x264: upgrade to latest revision new 03957e1 ncurses: add CVE_VERSION new 0649254 libxml2: fix CVE-2020-7595 new 2175169 sqlite3: upgrade 3.30.1 -> 3.31.1 The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 5 ++ meta/lib/oeqa/runtime/cases/logrotate.py | 62 ++++++++++---- .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + meta/recipes-core/ncurses/ncurses_6.1+20191019.bb | 2 + meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++++++++++++++++++ meta/recipes-extended/mc/files/nomandate.patch | 21 +++++ meta/recipes-extended/mc/mc_4.8.23.bb | 2 + .../x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 ++-- meta/recipes-multimedia/x264/x264_git.bb | 4 +- .../0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 45 ++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.2.bb | 1 + .../sqlite/sqlite3/CVE-2019-19244.patch | 33 -------- .../sqlite/sqlite3/CVE-2019-19880.patch | 33 -------- .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ------------ .../sqlite/sqlite3/CVE-2019-19924.patch | 65 --------------- .../sqlite/sqlite3/CVE-2019-19925.patch | 33 -------- .../sqlite/sqlite3/CVE-2019-19926.patch | 31 ------- .../sqlite/sqlite3/CVE-2019-19959.patch | 46 ----------- .../sqlite/sqlite3/CVE-2019-20218.patch | 31 ------- meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ----- meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 +++ 23 files changed, 273 insertions(+), 370 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch create mode 100644 meta/recipes-extended/mc/files/nomandate.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.30.1.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.31.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:16:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:16:03 +0000 Subject: [oe-commits] [openembedded-core] 08/10: ncurses: add CVE_VERSION In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.C5E7B2329E9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 03957e1e97ea4041247cd6dd2e911a8ca7831d5e Author: Anuj Mittal AuthorDate: Tue Feb 4 13:47:05 2020 +0800 ncurses: add CVE_VERSION Include the version number in a format that is comparable to what we get from NVD. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses_6.1+20191019.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb index ee7d4be..187777f 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb @@ -9,3 +9,5 @@ SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" + +CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:16:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:16:04 +0000 Subject: [oe-commits] [openembedded-core] 09/10: libxml2: fix CVE-2020-7595 In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.CE7DE2329EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0649254bf5540976c8f9efff12f7b66cc232c98d Author: Anuj Mittal AuthorDate: Tue Feb 4 13:47:06 2020 +0800 libxml2: fix CVE-2020-7595 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 37 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000..facfefd --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 2c833fa..6a4097c 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ + file://CVE-2020-7595.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:16:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:16:01 +0000 Subject: [oe-commits] [openembedded-core] 06/10: gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.B4C8A2329E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5f92fd4b497a18b40efc00ec4f11d0ed079d6787 Author: Taras Kondratiuk via Openembedded-core AuthorDate: Tue Feb 4 02:20:06 2020 +0000 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' Linux kernel compilation for aarch64 triggers ICE if CONFIG_CC_OPTIMIZE_FOR_SIZE=y. The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. Apply the fix to 9.2. Signed-off-by: Taras Kondratiuk Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 926df11..2bae85a 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -69,6 +69,7 @@ SRC_URI = "\ file://CVE-2019-15847_1.patch \ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch new file mode 100644 index 0000000..c37e0bb --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch @@ -0,0 +1,95 @@ +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From: Vladimir Makarov +Date: Wed, 10 Jul 2019 16:07:10 +0000 +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os + starting with r270266) + +2019-07-10 Vladimir Makarov + + PR target/91102 + * lra-constraints.c (process_alt_operands): Don't match user + defined regs only if they are early clobbers. + +2019-07-10 Vladimir Makarov + + PR target/91102 + * gcc.target/aarch64/pr91102.c: New test. + +From-SVN: r273357 +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] +[takondra: dropped conflicting ChangeLog changes] +Signed-off-by: Taras Kondratiuk +--- + gcc/lra-constraints.c | 17 ++++++++++---- + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 4 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index cf33da8013e4..6382dbf852b6 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) + else + { + /* Operands don't match. If the operands are +- different user defined explicit hard registers, +- then we cannot make them match. */ ++ different user defined explicit hard ++ registers, then we cannot make them match ++ when one is early clobber operand. */ + if ((REG_P (*curr_id->operand_loc[nop]) + || SUBREG_P (*curr_id->operand_loc[nop])) + && (REG_P (*curr_id->operand_loc[m]) +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) + && REG_P (m_reg) + && HARD_REGISTER_P (m_reg) + && REG_USERVAR_P (m_reg)) +- break; ++ { ++ int i; ++ ++ for (i = 0; i < early_clobbered_regs_num; i++) ++ if (m == early_clobbered_nops[i]) ++ break; ++ if (i < early_clobbered_regs_num ++ || early_clobber_p) ++ break; ++ } + } +- + /* Both operands must allow a reload register, + otherwise we cannot make them match. */ + if (curr_alt[m] == NO_REGS) +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c +new file mode 100644 +index 000000000000..70b99045a48e +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c +@@ -0,0 +1,26 @@ ++/* PR target/91102 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++int ++foo (long d, long l) ++{ ++ register long e asm ("x1") = d; ++ register long f asm("x2") = l; ++ asm ("" : : "r" (e), "r" (f)); ++ return 3; ++} ++ ++struct T { int i; int j; }; ++union S { long h; struct T t; }; ++ ++void ++bar (union S b) ++{ ++ while (1) ++ { ++ union S c = b; ++ c.t.j++; ++ b.h = foo (b.h, c.h); ++ } ++} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:16:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:16:00 +0000 Subject: [oe-commits] [openembedded-core] 05/10: webkitgtk: Prefer -pthread over -lpthread In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.AC2E62329E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b09f6f11b2f0707c2eacb1868011b3465dcfd6d Author: Khem Raj AuthorDate: Mon Feb 3 17:45:36 2020 -0800 webkitgtk: Prefer -pthread over -lpthread -pthread is compiler driver option which links in needed dependencies for pthreads along with -lpthread, this aids in fixing build failures on rv64 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 45 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.2.bb | 1 + 2 files changed, 46 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch new file mode 100644 index 0000000..268118b --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch @@ -0,0 +1,45 @@ +From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 3 Feb 2020 17:06:27 -0800 +Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG + +Fixes build failures on risv64 + +Taken from https://trac.webkit.org/changeset/231843/webkit + + Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of +-lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to +missing atomic primitives. + +Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] +Signed-off-by: Khem Raj +--- + Source/cmake/OptionsGTK.cmake | 2 ++ + Source/cmake/OptionsJSCOnly.cmake | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake +index d3beef19..6a92856f 100644 +--- a/Source/cmake/OptionsGTK.cmake ++++ b/Source/cmake/OptionsGTK.cmake +@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT + set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") + ++set(THREADS_PREFER_PTHREAD_FLAG ON) ++ + find_package(Cairo 1.14.0 REQUIRED) + find_package(Fontconfig 2.8.0 REQUIRED) + find_package(Freetype 2.4.2 REQUIRED) +diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake +index b2e87418..326ade23 100644 +--- a/Source/cmake/OptionsJSCOnly.cmake ++++ b/Source/cmake/OptionsJSCOnly.cmake +@@ -1,3 +1,4 @@ ++set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + + if (MSVC) +-- +2.25.0 + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb index a223cfd..a184d83 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ + file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ file://x32_support.patch \ file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:16:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:16:02 +0000 Subject: [oe-commits] [openembedded-core] 07/10: x264: upgrade to latest revision In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.BDEF52329E5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8b74bdcba1a07cc607f170db3f68f921a105e8ad Author: Anuj Mittal AuthorDate: Tue Feb 4 13:47:04 2020 +0800 x264: upgrade to latest revision Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 ++++++-------- meta/recipes-multimedia/x264/x264_git.bb | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch index 087a448..cb771fb 100644 --- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +++ b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch @@ -1,4 +1,4 @@ -From 66b120079fb21ed38cab0900c63360b0a7853eaa Mon Sep 17 00:00:00 2001 +From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 13 Dec 2016 14:22:32 -0700 Subject: [PATCH] Fix X32 build by disabling asm @@ -12,15 +12,16 @@ doesn't successfully build at this time, and my assembly is very rusty. Upstream-Status: Pending Signed-off-by: Christopher Larson + --- configure | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 3109ec4..844aeae 100755 +index 51b128d..6ea9469 100755 --- a/configure +++ b/configure -@@ -703,7 +703,13 @@ case $host_cpu in +@@ -754,7 +754,13 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" stack_alignment=16 @@ -33,9 +34,9 @@ index 3109ec4..844aeae 100755 + fi + fi if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" + ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" if cc_check '' "-arch x86_64"; then -@@ -722,7 +728,11 @@ case $host_cpu in +@@ -773,7 +779,11 @@ case $host_cpu in RCFLAGS="--target=pe-x86-64 $RCFLAGS" fi else @@ -48,6 +49,3 @@ index 3109ec4..844aeae 100755 fi ;; powerpc*) --- -2.8.0 - diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index f22930a..39429a8 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "72db437770fd1ce3961f624dd57a8e75ff65ae0b" +SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c" -PV = "r2917+git${SRCPV}" +PV = "r2991+git${SRCPV}" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 18:16:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 18:16:05 +0000 Subject: [oe-commits] [openembedded-core] 10/10: sqlite3: upgrade 3.30.1 -> 3.31.1 In-Reply-To: <158084015519.8502.17797624801679341774@git.openembedded.org> References: <158084015519.8502.17797624801679341774@git.openembedded.org> Message-ID: <20200204181555.D832B2329EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 21751690138c0423afa3fa5b83912d9692b50a21 Author: Anuj Mittal AuthorDate: Tue Feb 4 13:51:45 2020 +0800 sqlite3: upgrade 3.30.1 -> 3.31.1 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ----------- .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ----------- .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ----------------- .../sqlite/sqlite3/CVE-2019-19924.patch | 65 ---------------------- .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ----------- .../sqlite/sqlite3/CVE-2019-19926.patch | 31 ----------- .../sqlite/sqlite3/CVE-2019-19959.patch | 46 --------------- .../sqlite/sqlite3/CVE-2019-20218.patch | 31 ----------- meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ------- meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 ++++ 10 files changed, 12 insertions(+), 342 deletions(-) diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch deleted file mode 100644 index 3f70979..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19244 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 -From: dan -Date: Fri, 22 Nov 2019 10:14:01 +0000 -Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both - DISTINCT and window functions also used an ORDER BY that is the same as its - select list. - -Amalgamation version of the patch: -FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba ---- - sqlite3.c | 5 +++-- - sqlite3.h | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 8fd740b..db1c649 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( - */ - if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct - && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 -+ && p->pWin==0 - ){ - p->selFlags &= ~SF_Distinct; - pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch deleted file mode 100644 index ca5c31c..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19880 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Wed, 18 Dec 2019 00:05:50 +0000 -Subject: [PATCH] When processing constant integer values in ORDER BY clauses - of window definitions (see check-in [7e4 --- - ---- - sqlite3.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sqlite3.c b/sqlite3.c -index db1c649..a83b3d2 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList( - int nInit = pList ? pList->nExpr : 0; - for(i=0; inExpr; i++){ - Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0); -+ assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) ); - if( bIntToNull && pDup && pDup->op==TK_INTEGER ){ - pDup->op = TK_NULL; - pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); -+ pDup->u.zToken = 0; - } - pList = sqlite3ExprListAppend(pParse, pList, pDup); - if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags; --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch deleted file mode 100644 index b1b866b..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch +++ /dev/null @@ -1,50 +0,0 @@ -CVE: CVE-2019-19923 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Wed, 18 Dec 2019 20:51:58 +0000 -Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of - check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer - query is DISTINCT. Without this fix, if an index scan is run on the table - within the view on the right-hand side of the LEFT JOIN, stale result - registers might be accessed yielding incorrect results, and/or an - OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a - NULL-pointer dereference. This problem was found by the Yongheng and Rui - fuzzer. - -FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e ---- - sqlite3.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index d29da07..5bc06c8 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -129216,6 +129216,7 @@ static void substSelect( - ** (3b) the FROM clause of the subquery may not contain a virtual - ** table and - ** (3c) the outer query may not be an aggregate. -+** (3d) the outer query may not be DISTINCT. - ** - ** (4) The subquery can not be DISTINCT. - ** -@@ -129412,8 +129413,11 @@ static int flattenSubquery( - */ - if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ - isLeftJoin = 1; -- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ -- /* (3a) (3c) (3b) */ -+ if( pSubSrc->nSrc>1 /* (3a) */ -+ || isAgg /* (3b) */ -+ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ -+ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ -+ ){ - return 0; - } - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch deleted file mode 100644 index 80d5edb..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch +++ /dev/null @@ -1,65 +0,0 @@ -CVE: CVE-2019-19924 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 854fe21e8a987f84da81f6bb9e90abc5355c6621 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 20:37:32 +0000 -Subject: [PATCH] When an error occurs while rewriting the parser tree for - window functions in the sqlite3WindowRewrite() routine, make sure that - pParse->nErr is set, and make sure that this shuts down any subsequent code - generation that might depend on the transformations that were implemented. - This fixes a problem discovered by the Yongheng and Rui fuzzer. - -Amalgamation format of backported patch -FossilOrigin-Name: e2bddcd4c55ba3cbe0130332679ff4b048630d0ced9a8899982edb5a3569ba7f ---- - sqlite3.c | 16 +++++++++++----- - sqlite3.h | 2 +- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 408ec4c..857c28e 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -77798,7 +77798,8 @@ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){ - */ - static void vdbeVComment(Vdbe *p, const char *zFormat, va_list ap){ - assert( p->nOp>0 || p->aOp==0 ); -- assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ); -+ assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed -+ || p->pParse->nErr>0 ); - if( p->nOp ){ - assert( p->aOp ); - sqlite3DbFree(p->db, p->aOp[p->nOp-1].zComment); -@@ -97872,6 +97873,7 @@ static int codeCompare( - int addr; - CollSeq *p4; - -+ if( pParse->nErr ) return 0; - p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight); - p5 = binaryCompareP5(pLeft, pRight, jumpIfNull); - addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1, -@@ -147627,7 +147629,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ - - pTab = sqlite3DbMallocZero(db, sizeof(Table)); - if( pTab==0 ){ -- return SQLITE_NOMEM; -+ return sqlite3ErrorToParser(db, SQLITE_NOMEM); - } - - p->pSrc = 0; -@@ -147731,6 +147733,10 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ - sqlite3DbFree(db, pTab); - } - -+ if( rc && pParse->nErr==0 ){ -+ assert( pParse->db->mallocFailed ); -+ return sqlite3ErrorToParser(pParse->db, SQLITE_NOMEM); -+ } - return rc; - } - --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch deleted file mode 100644 index ffc2c6a..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19925 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 15:15:40 +0000 -Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the - pathname of the file being inserted is a NULL. Bug discovered by the - Yongheng and Rui fuzzer. - -FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 ---- - shell.c | 1 + - sqlite3.c | 4 ++-- - sqlite3.h | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/shell.c b/shell.c -index 053180c..404a8d4 100644 ---- a/shell.c -+++ b/shell.c -@@ -5827,6 +5827,7 @@ static int zipfileUpdate( - - if( rc==SQLITE_OK ){ - zPath = (const char*)sqlite3_value_text(apVal[2]); -+ if( zPath==0 ) zPath = ""; - nPath = (int)strlen(zPath); - mTime = zipfileGetTime(apVal[4]); - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch deleted file mode 100644 index 92bc790..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch +++ /dev/null @@ -1,31 +0,0 @@ -CVE: CVE-2019-19926 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 22:08:19 +0000 -Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it - is necessary to abort early due to prior errors in sqlite3WindowRewrite(). - -FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 ---- - sqlite3.c | 7 ++++--- - sqlite3.h | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 857c28e..19a474d 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -128427,6 +128427,7 @@ static int multiSelect( - } - #endif - } -+ if( pParse->nErr ) goto multi_select_end; - - /* Compute collating sequences used by - ** temporary tables needed to implement the compound select. --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch deleted file mode 100644 index cba8ec9..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch +++ /dev/null @@ -1,46 +0,0 @@ -CVE: CVE-2019-19959 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Mon, 23 Dec 2019 21:04:33 +0000 -Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that - it is able to deal with goofy filenames that contain embedded zeros. - -FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf ---- - shell.c | 4 ++-- - sqlite3.c | 4 ++-- - sqlite3.h | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/shell.c b/shell.c -index 404a8d4..48065e9 100644 ---- a/shell.c -+++ b/shell.c -@@ -5841,7 +5841,7 @@ static int zipfileUpdate( - zFree = sqlite3_mprintf("%s/", zPath); - if( zFree==0 ){ rc = SQLITE_NOMEM; } - zPath = (const char*)zFree; -- nPath++; -+ nPath = (int)strlen(zPath); - } - } - -@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ - }else{ - if( zName[nName-1]!='/' ){ - zName = zFree = sqlite3_mprintf("%s/", zName); -- nName++; - if( zName==0 ){ - rc = SQLITE_NOMEM; - goto zipfile_step_out; - } -+ nName = (int)strlen(zName); - }else{ - while( nName>1 && zName[nName-2]=='/' ) nName--; - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch deleted file mode 100644 index fb6cd6d..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch +++ /dev/null @@ -1,31 +0,0 @@ -CVE: CVE-2019-20218 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 -From: Dan Kennedy -Date: Fri, 27 Dec 2019 20:54:42 +0000 -Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object - following an error. This fixes a separate case to [de6e6d68]. - -FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 ---- - sqlite3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 5bc06c8..408ec4c 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ - - /* Process NATURAL keywords, and ON and USING clauses of joins. - */ -- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ -+ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ - return WRC_Abort; - } - --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb b/meta/recipes-support/sqlite/sqlite3_3.30.1.bb deleted file mode 100644 index e055aca..0000000 --- a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2019-19244.patch \ - file://CVE-2019-19880.patch \ - file://CVE-2019-19923.patch \ - file://CVE-2019-19924.patch \ - file://CVE-2019-19925.patch \ - file://CVE-2019-19926.patch \ - file://CVE-2019-19959.patch \ - file://CVE-2019-20218.patch \ - " -SRC_URI[md5sum] = "51252dc6bc9094ba11ab151ba650ff3c" -SRC_URI[sha256sum] = "8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file mode 100644 index 0000000..903d66a --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -0,0 +1,12 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + " +SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" +SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_WHITELIST += "CVE-2019-19242" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:03:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:03:42 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (45eb76a -> 94eafc0) Message-ID: <158085382268.6373.2558803440487237997@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 45eb76a smem: add a native variant discard 0aed780 libmimetic: Add recipe discard d542138 fio: Add support for PMDK engines new bceff42 rsyslog: disable ptest as it requires python2 new f7113e2 fio: Add support for PMDK engines new 3e87be4 libmimetic: Add recipe new 751803b smem: add a native variant new 94eafc0 lftp: upgrade 4.9.0 -> 4.9.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (45eb76a) \ N -- N -- N refs/heads/master-next (94eafc0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-connectivity/lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} | 4 ++-- meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) rename meta-networking/recipes-connectivity/lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} (89%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:03:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:03:43 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: rsyslog: disable ptest as it requires python2 In-Reply-To: <158085382268.6373.2558803440487237997@git.openembedded.org> References: <158085382268.6373.2558803440487237997@git.openembedded.org> Message-ID: <20200204220343.060872329E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bceff42e42b0fc937d772b2f50d55b44bfe47ff8 Author: Qi.Chen at windriver.com AuthorDate: Mon Feb 3 21:53:20 2020 -0800 rsyslog: disable ptest as it requires python2 Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb index 29bba2d..b109e4d 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb @@ -35,7 +35,9 @@ SRC_URI[sha256sum] = "e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f9 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" -inherit autotools pkgconfig systemd update-rc.d ptest +inherit autotools pkgconfig systemd update-rc.d +# ptest is disabled for now because it requires python2, after upstream solves this problem, re-enable it +# inherit ptest EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" EXTRA_OECONF += "--enable-imfile-tests" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:03:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:03:44 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: fio: Add support for PMDK engines In-Reply-To: <158085382268.6373.2558803440487237997@git.openembedded.org> References: <158085382268.6373.2558803440487237997@git.openembedded.org> Message-ID: <20200204220343.2357A2329E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f7113e23ff8427e3c3fc9a4fd33919d506dd4d11 Author: Yongxin Liu AuthorDate: Tue Feb 4 13:49:22 2020 +0800 fio: Add support for PMDK engines "pmemblk", "dev-dax" and "libpmem" engines are used for persistent memory. In order to enable them, add "pmem" to MACHINE_FEATURES in BSP conf. Signed-off-by: Yongxin Liu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb index 5a9cc83..482928c 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -11,6 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" RDEPENDS_${PN} = "python3-core bash" PACKAGECONFIG_NUMA = "numa" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:03:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:03:46 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: smem: add a native variant In-Reply-To: <158085382268.6373.2558803440487237997@git.openembedded.org> References: <158085382268.6373.2558803440487237997@git.openembedded.org> Message-ID: <20200204220343.5AEFB2329E5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 751803b05f802ceaadc3aa0122bc96a1d9c772b8 Author: Andr? Draszik AuthorDate: Tue Feb 4 11:14:26 2020 +0000 smem: add a native variant The native variant is useful to e.g. examine captures of a running target on the host system. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb index 702217a..947c47b 100644 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ b/meta-oe/recipes-support/smem/smem_1.4.bb @@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codec PACKAGES =+ "smemcap" FILES_smemcap = "${bindir}/smemcap" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:03:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:03:45 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: libmimetic: Add recipe In-Reply-To: <158085382268.6373.2558803440487237997@git.openembedded.org> References: <158085382268.6373.2558803440487237997@git.openembedded.org> Message-ID: <20200204220343.42D742329E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3e87be423d57faf67900b404e63d135c3f474060 Author: asmitha AuthorDate: Tue Feb 4 14:51:26 2020 +0530 libmimetic: Add recipe Mimetic library helps parsing the multi-part form data. This library can be used for scenarios that includes multi-part form data file uploads to the BMC. The patch file (config.patch) includes: i) addition of a compilation flag - "no-narrowing" since this has been treated as warning in earlier versions of c++ and now with the higher versions, this is treated as errors. ii) the test directory is removed as there were errors (relocation errors) since the shared object files of libc++ and libc were not taken from the sysroot path but from the system's library path where the required version of the .so is not present. Signed-off-by: asmitha Signed-off-by: Khem Raj --- .../libmimetic/libmimetic/config.patch | 25 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 19 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/config.patch b/meta-oe/recipes-support/libmimetic/libmimetic/config.patch new file mode 100644 index 0000000..52bf7b4 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/config.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 634bd4c..c7cbae7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST=LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc examples win32 + INCLUDES=-I$(top_srcdir) + ACLOCAL_AMFLAGS=-I m4 + +diff --git a/configure.in b/configure.in +index 5e8f3d4..af1018e 100644 +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ debug_enabled=false + dnl CFLAGS and CXXFLAGS default to -O2 -g + + dnl CXXFLAGS="$CXXFLAGS -DNDEBUG -fno-exceptions" +-CXXFLAGS="$CXXFLAGS -DNDEBUG" ++CXXFLAGS="$CXXFLAGS -DNDEBUG -Wno-narrowing" + + AC_ARG_ENABLE(debug, + [ --enable-debug[=LEVEL] enables debug symbols [default=2]], diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb new file mode 100644 index 0000000..a0a7041 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -0,0 +1,19 @@ +# Released under the MIT license. + +SUMMARY = "Mimetic Library for multi-part parsing" +DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." +AUTHOR = "Stefano Barbato " +HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" +BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" + +SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" +SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ + file://config.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:03:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:03:47 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: lftp: upgrade 4.9.0 -> 4.9.1 In-Reply-To: <158085382268.6373.2558803440487237997@git.openembedded.org> References: <158085382268.6373.2558803440487237997@git.openembedded.org> Message-ID: <20200204220343.6C4C22329E9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 94eafc01823bf04fc0c16b921b196f4506a235a3 Author: Trevor Gamblin AuthorDate: Tue Feb 4 12:15:47 2020 -0800 lftp: upgrade 4.9.0 -> 4.9.1 Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- .../recipes-connectivity/lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb similarity index 89% rename from meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb rename to meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb index ef047f7..79a380a 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" -SRC_URI[md5sum] = "b05817a2c26463618271730d0f677edb" -SRC_URI[sha256sum] = "309e7e91a7c020625715e85c1726b1e7524da22518683fbe051ac13116dedeac" +SRC_URI[md5sum] = "19ce64012bc722ad61667372fa262382" +SRC_URI[sha256sum] = "a692fd081c19e2cc045869ab721a4fb3d7571040849a4406c4042f735232414c" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:20 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated (2bba005 -> af41a22) Message-ID: <158085512011.12310.6379102317411405494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch zeus in repository openembedded-core. from 2bba005 sstatesig: Improve debug output if getpwuid() fails new 9fd363d libxml2: Fix CVE-2019-19956 new b348e31 bash: Fix CVE-2019-18276 new bb544a4 kbd: configure.ac: Fix logic of vlock configure switch new d003495 kbd: avoid vlock conflict with busybox new aec10c9 bzip2: Fix CVE-2019-12900 new 534b4a6 core: recipes: fix some native tools dependencies new bc31d2d webkitgtk: fix occasional link error new af41a22 python2: add ntpath The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...re.ac-Fix-logic-of-vlock-configure-switch.patch | 31 ++ meta/recipes-core/kbd/kbd_2.0.4.bb | 4 +- .../libxml/libxml2/Fix-CVE-2019-19956.patch | 40 ++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + .../python/python/python2-manifest.json | 1 + .../bash/bash/bash-CVE-2019-18276.patch | 402 +++++++++++++++++++++ meta/recipes-extended/bash/bash_5.0.bb | 1 + .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 ++ meta/recipes-extended/man-db/man-db_2.8.7.bb | 2 +- meta/recipes-extended/psmisc/psmisc.inc | 2 +- meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 +- .../webkit/webkitgtk/fix-link-error.patch | 45 +++ meta/recipes-sato/webkit/webkitgtk_2.24.4.bb | 1 + 13 files changed, 564 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch create mode 100644 meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch create mode 100644 meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch create mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch create mode 100755 meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:21 +0000 Subject: [oe-commits] [openembedded-core] 01/08: libxml2: Fix CVE-2019-19956 In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.8EDD22329E9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 9fd363d21df59fff4488763d62548c936b4d14fb Author: Lee Chee Yang AuthorDate: Tue Feb 4 07:06:01 2020 -0800 libxml2: Fix CVE-2019-19956 see: https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549 Signed-off-by: Lee Chee Yang Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../libxml/libxml2/Fix-CVE-2019-19956.patch | 40 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + 2 files changed, 41 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch new file mode 100644 index 0000000..1c2dff9 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch @@ -0,0 +1,40 @@ +From 5a02583c7e683896d84878bd90641d8d9b0d0549 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Chee Yang Lee + +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index 1ce1ccf1..26d9f4e3 100644 +--- a/parser.c ++++ b/parser.c +@@ -13894,7 +13894,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.24.1 + + diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index c38f883..c44a90b 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ + file://Fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:23 +0000 Subject: [oe-commits] [openembedded-core] 03/08: kbd: configure.ac: Fix logic of vlock configure switch In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.A29E42329EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit bb544a4d9b0b889d6acacdd73e3a790546fe13ba Author: De Huo AuthorDate: Tue Feb 4 07:06:03 2020 -0800 kbd: configure.ac: Fix logic of vlock configure switch Downstream bug report: https://bugs.gentoo.org/661650 Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0] Signed-off-by: Lars Wendler Signed-off-by: De Huo Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- ...re.ac-Fix-logic-of-vlock-configure-switch.patch | 31 ++++++++++++++++++++++ meta/recipes-core/kbd/kbd_2.0.4.bb | 1 + 2 files changed, 32 insertions(+) diff --git a/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch b/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch new file mode 100644 index 0000000..c3f068f --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch @@ -0,0 +1,31 @@ +From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001 +From: Garry Filakhtov +Date: Fri, 20 Jul 2018 15:58:56 +0200 +Subject: [PATCH] configure.ac: Fix logic of vlock configure switch + +Downstream bug report: https://bugs.gentoo.org/661650 + +Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0] + +Signed-off-by: Lars Wendler +Signed-off-by: De Huo +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 87eb63c..07098cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes") + + AC_ARG_ENABLE(vlock, + AS_HELP_STRING(--disable-vlock, [do not build vlock]), +- [VLOCK_PROG=no],[VLOCK_PROG=yes]) ++ [VLOCK_PROG=$enableval],[VLOCK_PROG=yes]) + AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") + + if test "$VLOCK_PROG" = "yes"; then +-- +2.23.0 + diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb index 4af3256..17ce6e7 100644 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ b/meta/recipes-core/kbd/kbd_2.0.4.bb @@ -13,6 +13,7 @@ RCONFLICTS_${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ + file://0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch \ " SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:24 +0000 Subject: [oe-commits] [openembedded-core] 04/08: kbd: avoid vlock conflict with busybox In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.AEAC12329F0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit d00349526f5727fdff9b40c6139d95bd75af213d Author: Hongxu Jia AuthorDate: Tue Feb 4 07:06:04 2020 -0800 kbd: avoid vlock conflict with busybox busybox as well as vlock utility from meta-oe provides vlock utility which can conflict when with kbd if pam is a enabled distro_feature Fixes image build errors update-alternatives: Error: not linking /usr/bin/vlock to /bin/busybox.suid since /usr/bin/vlock exists and is not a link ERROR: yoe-qt5-wayland-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget_${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Signed-off-by: Khem Raj The vlock doesn't exist if PAM isn't enabled. Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie Signed-off-by: De Huo Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-core/kbd/kbd_2.0.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb index 17ce6e7..47e76da 100644 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ b/meta/recipes-core/kbd/kbd_2.0.4.bb @@ -59,7 +59,8 @@ RDEPENDS_${PN}-ptest = "make" inherit update-alternatives -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:22 +0000 Subject: [oe-commits] [openembedded-core] 02/08: bash: Fix CVE-2019-18276 In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.97F132329EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit b348e31c93f08332667df65cd2ecec63631d184e Author: De Huo AuthorDate: Tue Feb 4 07:06:02 2020 -0800 bash: Fix CVE-2019-18276 An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11. By default, if Bash is run with its effective UID not equal to its real UID, it will drop privileges by setting its effective UID to its real UID. However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality, the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore regains privileges. However, binaries running with an effective UID of 0 are unaffected. Backport the CVE patche from https://github.com/bminor/bash/commit/ 951bdaad7a18cc0dc1036bba86b18b90874d39ff to fix CVE-2019-18276 Signed-off-by: Chet Ramey Signed-off-by: De Huo Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../bash/bash/bash-CVE-2019-18276.patch | 402 +++++++++++++++++++++ meta/recipes-extended/bash/bash_5.0.bb | 1 + 2 files changed, 403 insertions(+) diff --git a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch new file mode 100644 index 0000000..78dcc1b --- /dev/null +++ b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch @@ -0,0 +1,402 @@ +From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Mon, 1 Jul 2019 09:03:53 -0400 +Subject: [PATCH] commit bash-20190628 snapshot + +An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11. +By default, if Bash is run with its effective UID not equal to its real UID, +it will drop privileges by setting its effective UID to its real UID. +However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality, +the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for +runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore +regains privileges. However, binaries running with an effective UID of 0 are unaffected. + +Upstream-Status: Backport [https://github.com/bminor/bash/commit/951bdaad7a18cc0dc1036bba86b18b90874d39ff] +CVE: CVE-2019-18276 +Signed-off-by: Chet Ramey +Signed-off-by: De Huo +--- + MANIFEST | 2 ++ + bashline.c | 50 +------------------------------------------------- + builtins/help.def | 2 +- + config.h.in | 10 +++++++++- + configure | 11 +++++++++++ + configure.ac | 1 + + doc/bash.1 | 3 ++- + doc/bashref.texi | 3 ++- + lib/glob/glob.c | 5 ++++- + pathexp.c | 16 ++++++++++++++-- + shell.c | 8 ++++++++ + tests/glob.tests | 2 ++ + tests/glob6.sub | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + tests/glob7.sub | 11 +++++++++++ + 14 files changed, 122 insertions(+), 56 deletions(-) + create mode 100644 tests/glob6.sub + create mode 100644 tests/glob7.sub + +diff --git a/MANIFEST b/MANIFEST +index 03de221..f9ccad7 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -1037,6 +1037,8 @@ tests/extglob3.tests f + tests/extglob3.right f + tests/extglob4.sub f + tests/extglob5.sub f ++tests/glob6.sub f ++tests/glob7.sub f + tests/func.tests f + tests/func.right f + tests/func1.sub f +diff --git a/bashline.c b/bashline.c +index 824ea9d..d86b47d 100644 +--- a/bashline.c ++++ b/bashline.c +@@ -3718,55 +3718,7 @@ static int + completion_glob_pattern (string) + char *string; + { +- register int c; +- char *send; +- int open; +- +- DECLARE_MBSTATE; +- +- open = 0; +- send = string + strlen (string); +- +- while (c = *string++) +- { +- switch (c) +- { +- case '?': +- case '*': +- return (1); +- +- case '[': +- open++; +- continue; +- +- case ']': +- if (open) +- return (1); +- continue; +- +- case '+': +- case '@': +- case '!': +- if (*string == '(') /*)*/ +- return (1); +- continue; +- +- case '\\': +- if (*string++ == 0) +- return (0); +- } +- +- /* Advance one fewer byte than an entire multibyte character to +- account for the auto-increment in the loop above. */ +-#ifdef HANDLE_MULTIBYTE +- string--; +- ADVANCE_CHAR_P (string, send - string); +- string++; +-#else +- ADVANCE_CHAR_P (string, send - string); +-#endif +- } +- return (0); ++ return (glob_pattern_p (string) == 1); + } + + static char *globtext; +diff --git a/builtins/help.def b/builtins/help.def +index 006c4b5..92f9b38 100644 +--- a/builtins/help.def ++++ b/builtins/help.def +@@ -128,7 +128,7 @@ help_builtin (list) + + /* We should consider making `help bash' do something. */ + +- if (glob_pattern_p (list->word->word)) ++ if (glob_pattern_p (list->word->word) == 1) + { + printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1))); + print_word_list (list, ", "); +diff --git a/config.h.in b/config.h.in +index 8554aec..ad4b1e8 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -1,6 +1,6 @@ + /* config.h -- Configuration file for bash. */ + +-/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc. ++/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + +@@ -807,6 +807,14 @@ + #undef HAVE_SETREGID + #undef HAVE_DECL_SETREGID + ++/* Define if you have the setregid function. */ ++#undef HAVE_SETRESGID ++#undef HAVE_DECL_SETRESGID ++ ++/* Define if you have the setresuid function. */ ++#undef HAVE_SETRESUID ++#undef HAVE_DECL_SETRESUID ++ + /* Define if you have the setvbuf function. */ + #undef HAVE_SETVBUF + +diff --git a/configure b/configure +index 2f62662..b3321c9 100755 +--- a/configure ++++ b/configure +@@ -10281,6 +10281,17 @@ cat >>confdefs.h <<_ACEOF + #define HAVE_DECL_SETREGID $ac_have_decl + _ACEOF + ++ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default" ++if test "x$ac_cv_have_decl_" = xyes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 ++fi ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_ $ac_have_decl ++_ACEOF ++(setresuid, setresgid) + ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" "$ac_includes_default" + if test "x$ac_cv_have_decl_strcpy" = xyes; then : + ac_have_decl=1 +diff --git a/configure.ac b/configure.ac +index 52b4cdb..549adef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr]) + AC_CHECK_DECLS([printf]) + AC_CHECK_DECLS([sbrk]) + AC_CHECK_DECLS([setregid]) ++AC_CHECK_DECLS[(setresuid, setresgid]) + AC_CHECK_DECLS([strcpy]) + AC_CHECK_DECLS([strsignal]) + +diff --git a/doc/bash.1 b/doc/bash.1 +index e6cd08d..9e58a0b 100644 +--- a/doc/bash.1 ++++ b/doc/bash.1 +@@ -4681,7 +4681,8 @@ above). + .PD + .SH "SIMPLE COMMAND EXPANSION" + When a simple command is executed, the shell performs the following +-expansions, assignments, and redirections, from left to right. ++expansions, assignments, and redirections, from left to right, in ++the following order. + .IP 1. + The words that the parser has marked as variable assignments (those + preceding the command name) and redirections are saved for later +diff --git a/doc/bashref.texi b/doc/bashref.texi +index d33cd57..3065126 100644 +--- a/doc/bashref.texi ++++ b/doc/bashref.texi +@@ -2964,7 +2964,8 @@ is not specified. If the file does not exist, it is created. + @cindex command expansion + + When a simple command is executed, the shell performs the following +-expansions, assignments, and redirections, from left to right. ++expansions, assignments, and redirections, from left to right, in ++the following order. + + @enumerate + @item +diff --git a/lib/glob/glob.c b/lib/glob/glob.c +index 398253b..2eaa33e 100644 +--- a/lib/glob/glob.c ++++ b/lib/glob/glob.c +@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags) + register unsigned int i; + int mflags; /* Flags passed to strmatch (). */ + int pflags; /* flags passed to sh_makepath () */ ++ int hasglob; /* return value from glob_pattern_p */ + int nalloca; + struct globval *firstmalloc, *tmplink; + char *convfn; +@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags) + patlen = (pat && *pat) ? strlen (pat) : 0; + + /* If the filename pattern (PAT) does not contain any globbing characters, ++ or contains a pattern with only backslash escapes (hasglob == 2), + we can dispense with reading the directory, and just see if there is + a filename `DIR/PAT'. If there is, and we can access it, just make the + vector to return and bail immediately. */ +- if (skip == 0 && glob_pattern_p (pat) == 0) ++ hasglob = 0; ++ if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == 2) + { + int dirlen; + struct stat finfo; +diff --git a/pathexp.c b/pathexp.c +index c1bf2d8..e6c5392 100644 +--- a/pathexp.c ++++ b/pathexp.c +@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT; + /* Control enabling special handling of `**' */ + int glob_star = 0; + +-/* Return nonzero if STRING has any unquoted special globbing chars in it. */ ++/* Return nonzero if STRING has any unquoted special globbing chars in it. ++ This is supposed to be called when pathname expansion is performed, so ++ it implements the rules in Posix 2.13.3, specifically that an unquoted ++ slash cannot appear in a bracket expression. */ + int + unquoted_glob_pattern_p (string) + register char *string; +@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string) + continue; + + case ']': +- if (open) ++ if (open) /* XXX - if --open == 0? */ + return (1); + continue; + ++ case '/': ++ if (open) ++ open = 0; ++ + case '+': + case '@': + case '!': +@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string) + string++; + continue; + } ++ else if (open && *string == '/') ++ { ++ string++; /* quoted slashes in bracket expressions are ok */ ++ continue; ++ } + else if (*string == 0) + return (0); + +diff --git a/shell.c b/shell.c +index a2b2a55..6adabc8 100644 +--- a/shell.c ++++ b/shell.c +@@ -1293,7 +1293,11 @@ disable_priv_mode () + { + int e; + ++#if HAVE_DECL_SETRESUID ++ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0) ++#else + if (setuid (current_user.uid) < 0) ++#endif + { + e = errno; + sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid); +@@ -1302,7 +1306,11 @@ disable_priv_mode () + exit (e); + #endif + } ++#if HAVE_DECL_SETRESGID ++ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0) ++#else + if (setgid (current_user.gid) < 0) ++#endif + sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid); + + current_user.euid = current_user.uid; +diff --git a/tests/glob.tests b/tests/glob.tests +index 01913bb..fb012f7 100644 +--- a/tests/glob.tests ++++ b/tests/glob.tests +@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub + ${THIS_SH} ./glob2.sub + ${THIS_SH} ./glob3.sub + ${THIS_SH} ./glob4.sub ++${THIS_SH} ./glob6.sub ++${THIS_SH} ./glob7.sub + + MYDIR=$PWD # save where we are + +diff --git a/tests/glob6.sub b/tests/glob6.sub +new file mode 100644 +index 0000000..b099811 +--- /dev/null ++++ b/tests/glob6.sub +@@ -0,0 +1,54 @@ ++# tests of the backslash-in-glob-patterns discussion on the austin-group ML ++ ++: ${TMPDIR:=/var/tmp} ++ ++ORIG=$PWD ++GLOBDIR=$TMPDIR/bash-glob-$$ ++mkdir $GLOBDIR && cd $GLOBDIR ++ ++# does the pattern matcher allow backslashes as escape characters and remove ++# them as part of matching? ++touch abcdefg ++pat='ab\cd*' ++printf '<%s>\n' $pat ++pat='\.' ++printf '<%s>\n' $pat ++rm abcdefg ++ ++# how about when escaping pattern characters? ++touch '*abc.c' ++a='\**.c' ++printf '%s\n' $a ++rm -f '*abc.c' ++ ++# how about when making the distinction between readable and searchable path ++# components? ++mkdir -m a=x searchable ++mkdir -m a=r readable ++ ++p='searchable/\.' ++printf "%s\n" $p ++ ++p='searchable/\./.' ++printf "%s\n" $p ++ ++p='readable/\.' ++printf "%s\n" $p ++ ++p='readable/\./.' ++printf "%s\n" $p ++ ++printf "%s\n" 'searchable/\.' ++printf "%s\n" 'readable/\.' ++ ++echo */. ++ ++p='*/\.' ++echo $p ++ ++echo */'.' ++ ++rmdir searchable readable ++ ++cd $ORIG ++rmdir $GLOBDIR +diff --git a/tests/glob7.sub b/tests/glob7.sub +new file mode 100644 +index 0000000..0212b8e +--- /dev/null ++++ b/tests/glob7.sub +@@ -0,0 +1,11 @@ ++# according to Posix 2.13.3, a slash in a bracket expression renders that ++# bracket expression invalid ++shopt -s nullglob ++ ++echo 1: [qwe/qwe] ++echo 2: [qwe/ ++echo 3: [qwe/] ++ ++echo 4: [qwe\/qwe] ++echo 5: [qwe\/ ++echo 6: [qwe\/] +-- +1.9.1 diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index eadc822..1b70587 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-ptest \ file://run-bash-ptests \ file://fix-run-builtins.patch \ + file://bash-CVE-2019-18276.patch \ " SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:25 +0000 Subject: [oe-commits] [openembedded-core] 05/08: bzip2: Fix CVE-2019-12900 In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.B74902329F9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit aec10c9993f04304466e15ea7a5bc4d85a357c5b Author: Sana Kazi AuthorDate: Tue Feb 4 07:06:05 2020 -0800 bzip2: Fix CVE-2019-12900 Added patch for CVE-2019-12900 as backport from upstream. Fixes out of bound access discovered while fuzzying karchive. Tested by: Sana.Kazi at kpit.com Signed-off-by: Saloni Jain Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch new file mode 100644 index 0000000..9859d9d --- /dev/null +++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch @@ -0,0 +1,36 @@ +From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 28 May 2019 19:35:18 +0200 +Subject: [PATCH] Make sure nSelectors is not out of range + +nSelectors is used in a loop from 0 to nSelectors to access selectorMtf +which is +UChar selectorMtf[BZ_MAX_SELECTORS]; +so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory +access +Fixes out of bounds access discovered while fuzzying karchive + +Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch + +Upstream-Status: Backport +CVE: CVE-2019-12900.patch +Signed-off-by: Saloni Jain +--- + decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/decompress.c b/decompress.c +index ab6a624..f3db91d 100644 +--- a/decompress.c ++++ b/decompress.c +@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) + GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); +- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); ++ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); + for (i = 0; i < nSelectors; i++) { + j = 0; + while (True) { +-- +2.22.0 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:28 +0000 Subject: [oe-commits] [openembedded-core] 08/08: python2: add ntpath In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.DA0AD232A06@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit af41a2238beec0c34c1c1e5f25eed55f2a214643 Author: Armin Kuster AuthorDate: Tue Feb 4 07:06:08 2020 -0800 python2: add ntpath python3 has this but python is missing this. [Yocto #13740] Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python/python2-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index eb52e86..fd98774 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -267,6 +267,7 @@ "${libdir}/python2.7/lib-dynload/xreadlines.so", "${libdir}/python2.7/linecache.py", "${libdir}/python2.7/new.py", + "${libdir}/python2.7/ntpath.py", "${libdir}/python2.7/os.py", "${libdir}/python2.7/platform.py", "${libdir}/python2.7/posixpath.py", -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:27 +0000 Subject: [oe-commits] [openembedded-core] 07/08: webkitgtk: fix occasional link error In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.CFC8E232A05@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit bc31d2d68135ce0a856db62519b370d6c05201f1 Author: Joe Slater AuthorDate: Tue Feb 4 07:06:07 2020 -0800 webkitgtk: fix occasional link error Partial backport from WebKit.git. See patch for details. Fixed in webkitgtk 2.26.1. Signed-off-by: Joe Slater Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../webkit/webkitgtk/fix-link-error.patch | 45 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.24.4.bb | 1 + 2 files changed, 46 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch new file mode 100755 index 0000000..9696ddd --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch @@ -0,0 +1,45 @@ +webkitgtk: fix an occasional link error + +Part of ae465a4e... Changelog is not included in the source tarball. + +Upstream-Status: backport [git://git.webkit.org/WebKit.git] + +commit ae465a4e3b1498b6c4038fc7e596e0e3662d116f +Author: Hironori.Fujii at sony.com +Date: Fri Jun 28 07:38:09 2019 +0000 + + [Win] unresolved external symbol "JSC::JSObject::didBecomePrototype(void)" referenced in function "JSC::Structure::create(...)" + https://bugs.webkit.org/show_bug.cgi?id=199312 + + Reviewed by Keith Miller. + + WinCairo port, clang-cl Release builds reported a following linkage error: + + > WebCore.lib(UnifiedSource-4babe430-10.cpp.obj) : error LNK2019: unresolved external symbol "public: void __cdecl JSC::JSObject::didBecomePrototype(void)" (?didBecomePrototype at JSObject@JSC@@QEAAXXZ) referenced in function "public: static class JSC::Structure * __cdecl JSC::Structure::create(class JSC::VM &,class JSC::JSGlobalObject *,class JSC::JSValue,class JSC::TypeInfo const &,struct JSC::ClassInfo const *,unsigned char,unsigned int)" (?create at Structure@JSC@@SAPEAV12 at AEAVVM@2 at PEA [...] + + No new tests because there is no behavior change. + + * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: Include , + and do not include headers which is included by it. + + git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 246922 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +[ modification of Changelog deleted ] + +diff --git a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp +index d1b047c..0899a9a 100644 +--- a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp ++++ b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp +@@ -49,11 +49,8 @@ + #include "SQLiteTransaction.h" + #include "ThreadSafeDataBuffer.h" + #include +-#include +-#include +-#include ++#include + #include +-#include + #include + #include + #include diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb index c090782..1c71762 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb @@ -23,6 +23,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://include_array.patch \ file://narrowing.patch \ file://0001-gstreamer-add-a-missing-format-string.patch \ + file://fix-link-error.patch \ " SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:26 +0000 Subject: [oe-commits] [openembedded-core] 06/08: core: recipes: fix some native tools dependencies In-Reply-To: <158085512011.12310.6379102317411405494@git.openembedded.org> References: <158085512011.12310.6379102317411405494@git.openembedded.org> Message-ID: <20200204222520.C1612232A03@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 534b4a63299c6d74662c9d035238a0adb19cd1c7 Author: Sumit Garg AuthorDate: Tue Feb 4 07:06:06 2020 -0800 core: recipes: fix some native tools dependencies Some native tools dependency issues were seen while building with external GCC tool-set rather than source GCC tool-set. While building with source tool-set these dependencies were implicitly met which is not the case with external tool-set. So explicitly state these native tools dependencies. Signed-off-by: Sumit Garg Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-extended/man-db/man-db_2.8.7.bb | 2 +- meta/recipes-extended/psmisc/psmisc.inc | 2 +- meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/man-db/man-db_2.8.7.bb b/meta/recipes-extended/man-db/man-db_2.8.7.bb index 083b237..0d73b03 100644 --- a/meta/recipes-extended/man-db/man-db_2.8.7.bb +++ b/meta/recipes-extended/man-db/man-db_2.8.7.bb @@ -10,7 +10,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ SRC_URI[md5sum] = "ec0b23c8314a1654c4d059b2c18ce43d" SRC_URI[sha256sum] = "b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326" -DEPENDS = "libpipeline gdbm groff-native base-passwd" +DEPENDS = "libpipeline gdbm groff-native base-passwd flex-native" RDEPENDS_${PN} += "base-passwd" # | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 594a10c..6de5acb 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -7,7 +7,7 @@ command sends a specified signal (SIGTERM if nothing is specified) to \ processes identified by name. The fuser command identifies the PIDs \ of processes that are using specified files or filesystems." SECTION = "base" -DEPENDS = "ncurses virtual/libintl gettext-native" +DEPENDS = "ncurses virtual/libintl gettext-native xz-native" LICENSE = "GPLv2" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 3529cb2..211e399 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc @@ -12,6 +12,6 @@ INC_PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig distro_features_check gettext FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:25:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:25:25 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: patch: Extend to native/nativesdk and depend upon Message-ID: <158085512552.12604.14448891591325080983@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 40324fc patch: Extend to native/nativesdk and depend upon 40324fc is described below commit 40324fc4fa433b3bcf4b43ba3e480cc3f0435f3f Author: Richard Purdie AuthorDate: Tue Feb 4 22:20:35 2020 +0000 patch: Extend to native/nativesdk and depend upon There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1..25ec089 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 95ebda7..aa55cde 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f..b5897b3 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 22:34:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 22:34:18 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: Revert "HACK: Intercept broken permissions in build" Message-ID: <158085565815.17442.16673088083969376937@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 200e11f Revert "HACK: Intercept broken permissions in build" 200e11f is described below commit 200e11f8264bbec31f8dede20bfc86a4d29bd686 Author: Richard Purdie AuthorDate: Tue Feb 4 22:26:52 2020 +0000 Revert "HACK: Intercept broken permissions in build" This reverts commit 436fdc39c6cca54f615b855d90bd84d22f9528b0. --- meta/classes/insane.bbclass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index bd5b7c3..795c7b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -908,8 +908,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if path == home or path.startswith(home + os.sep): return - import stat as stat2 - try: stat = os.lstat(path) except OSError as exc: @@ -926,9 +924,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False - if "/usr/src/debug/tcp-wrappers" in path and "weak_symbols" not in path: - if stat2.S_IMODE(stat.st_mode) & stat2.S_IWUSR: - bb.error("Fatal perms for %s %s" % (path, stat2.S_IMODE(stat.st_mode))) return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 23:30:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 23:30:52 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: lftp: upgrade 4.9.0 -> 4.9.1 In-Reply-To: <158085905097.10216.2673198046663941884@git.openembedded.org> References: <158085905097.10216.2673198046663941884@git.openembedded.org> Message-ID: <20200204233051.2AF5C2329F0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 573f35148335ac4603499f7b88ebc64e51c21d14 Author: Trevor Gamblin AuthorDate: Tue Feb 4 12:15:47 2020 -0800 lftp: upgrade 4.9.0 -> 4.9.1 Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- .../recipes-connectivity/lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb similarity index 89% rename from meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb rename to meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb index ef047f7..79a380a 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" -SRC_URI[md5sum] = "b05817a2c26463618271730d0f677edb" -SRC_URI[sha256sum] = "309e7e91a7c020625715e85c1726b1e7524da22518683fbe051ac13116dedeac" +SRC_URI[md5sum] = "19ce64012bc722ad61667372fa262382" +SRC_URI[sha256sum] = "a692fd081c19e2cc045869ab721a4fb3d7571040849a4406c4042f735232414c" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 23:30:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 23:30:51 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: smem: add a native variant In-Reply-To: <158085905097.10216.2673198046663941884@git.openembedded.org> References: <158085905097.10216.2673198046663941884@git.openembedded.org> Message-ID: <20200204233051.1FE002329EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cd2207c12546edbeb36c9a481614c0198391e8e4 Author: Andr? Draszik AuthorDate: Tue Feb 4 11:14:26 2020 +0000 smem: add a native variant The native variant is useful to e.g. examine captures of a running target on the host system. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb index 702217a..947c47b 100644 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ b/meta-oe/recipes-support/smem/smem_1.4.bb @@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codec PACKAGES =+ "smemcap" FILES_smemcap = "${bindir}/smemcap" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 4 23:30:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 04 Feb 2020 23:30:50 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (94eafc0 -> 573f351) Message-ID: <158085905097.10216.2673198046663941884@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 94eafc0 lftp: upgrade 4.9.0 -> 4.9.1 discard 751803b smem: add a native variant discard 3e87be4 libmimetic: Add recipe new cd2207c smem: add a native variant new 573f351 lftp: upgrade 4.9.0 -> 4.9.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (94eafc0) \ N -- N -- N refs/heads/master-next (573f351) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../libmimetic/libmimetic/config.patch | 25 ---------------------- .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 19 ---------------- 2 files changed, 44 deletions(-) delete mode 100644 meta-oe/recipes-support/libmimetic/libmimetic/config.patch delete mode 100644 meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 02:43:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 02:43:00 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: cpuid: Upgrade to 20200203 and use perlnative for pod2man Message-ID: <158087058019.21483.15403239991296010493@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 1a8e803 cpuid: Upgrade to 20200203 and use perlnative for pod2man 1a8e803 is described below commit 1a8e80313998a9719d68adc0cbf90203045e7b38 Author: Khem Raj AuthorDate: Tue Feb 4 18:41:00 2020 -0800 cpuid: Upgrade to 20200203 and use perlnative for pod2man Fixes /bin/sh: pod2man: command not found Signed-off-by: Khem Raj --- .../recipes-devtools/cpuid/{cpuid_20180519.bb => cpuid_20200203.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb similarity index 83% rename from meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb rename to meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb index 533a000..b0540e5 100644 --- a/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb +++ b/meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb @@ -8,11 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ " -SRC_URI[md5sum] = "b3b4e44ef49575043a91def0207dcc76" -SRC_URI[sha256sum] = "967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a" +SRC_URI[md5sum] = "93e99fd3d0d6cd5401c0f84f2cce1d8f" +SRC_URI[sha256sum] = "ebbd6448a1e416d95889a252f7e03a5429ad4f30bc84c7e8ede8086433e86c55" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" +inherit perlnative + # The install rule from the Makefile has hardcoded paths, so we duplicate # the actions to accommodate different paths. do_install () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 02:45:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 02:45:53 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: fio: Add support for PMDK engines In-Reply-To: <158087075242.23319.6531604741055085458@git.openembedded.org> References: <158087075242.23319.6531604741055085458@git.openembedded.org> Message-ID: <20200205024552.978E2232A05@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 392484ae210034ca2e567c027bc670a49032aaaf Author: Yongxin Liu AuthorDate: Tue Feb 4 13:49:22 2020 +0800 fio: Add support for PMDK engines "pmemblk", "dev-dax" and "libpmem" engines are used for persistent memory. In order to enable them, add "pmem" to MACHINE_FEATURES in BSP conf. Signed-off-by: Yongxin Liu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb index 5a9cc83..482928c 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -11,6 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" RDEPENDS_${PN} = "python3-core bash" PACKAGECONFIG_NUMA = "numa" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 02:45:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 02:45:52 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (1a8e803 -> 27f9b33) Message-ID: <158087075242.23319.6531604741055085458@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 1a8e803 cpuid: Upgrade to 20200203 and use perlnative for pod2man discard 573f351 lftp: upgrade 4.9.0 -> 4.9.1 discard cd2207c smem: add a native variant discard f7113e2 fio: Add support for PMDK engines discard bceff42 rsyslog: disable ptest as it requires python2 new 392484a fio: Add support for PMDK engines new 23d4351 smem: add a native variant new 0f80083 lftp: upgrade 4.9.0 -> 4.9.1 new 27f9b33 cpuid: Upgrade to 20200203 and use perlnative for pod2man This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1a8e803) \ N -- N -- N refs/heads/master-next (27f9b33) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 02:45:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 02:45:54 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: smem: add a native variant In-Reply-To: <158087075242.23319.6531604741055085458@git.openembedded.org> References: <158087075242.23319.6531604741055085458@git.openembedded.org> Message-ID: <20200205024552.A7578232A06@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 23d43514cfb652cd1662f04028e40ca447c58d76 Author: Andr? Draszik AuthorDate: Tue Feb 4 11:14:26 2020 +0000 smem: add a native variant The native variant is useful to e.g. examine captures of a running target on the host system. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb index 702217a..947c47b 100644 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ b/meta-oe/recipes-support/smem/smem_1.4.bb @@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codec PACKAGES =+ "smemcap" FILES_smemcap = "${bindir}/smemcap" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 02:45:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 02:45:55 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: lftp: upgrade 4.9.0 -> 4.9.1 In-Reply-To: <158087075242.23319.6531604741055085458@git.openembedded.org> References: <158087075242.23319.6531604741055085458@git.openembedded.org> Message-ID: <20200205024552.B3B4D232A07@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0f800834d28fc554782eff361b98e41ca9a121ef Author: Trevor Gamblin AuthorDate: Tue Feb 4 12:15:47 2020 -0800 lftp: upgrade 4.9.0 -> 4.9.1 Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- .../recipes-connectivity/lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb similarity index 89% rename from meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb rename to meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb index ef047f7..79a380a 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.1.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" -SRC_URI[md5sum] = "b05817a2c26463618271730d0f677edb" -SRC_URI[sha256sum] = "309e7e91a7c020625715e85c1726b1e7524da22518683fbe051ac13116dedeac" +SRC_URI[md5sum] = "19ce64012bc722ad61667372fa262382" +SRC_URI[sha256sum] = "a692fd081c19e2cc045869ab721a4fb3d7571040849a4406c4042f735232414c" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 02:45:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 02:45:56 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: cpuid: Upgrade to 20200203 and use perlnative for pod2man In-Reply-To: <158087075242.23319.6531604741055085458@git.openembedded.org> References: <158087075242.23319.6531604741055085458@git.openembedded.org> Message-ID: <20200205024552.BFEB8232A08@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 27f9b33243f9d4d41c01c93de8d581f93634cc0e Author: Khem Raj AuthorDate: Tue Feb 4 18:41:00 2020 -0800 cpuid: Upgrade to 20200203 and use perlnative for pod2man Fixes /bin/sh: pod2man: command not found Signed-off-by: Khem Raj --- .../recipes-devtools/cpuid/{cpuid_20180519.bb => cpuid_20200203.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb similarity index 83% rename from meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb rename to meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb index 533a000..b0540e5 100644 --- a/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb +++ b/meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb @@ -8,11 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ " -SRC_URI[md5sum] = "b3b4e44ef49575043a91def0207dcc76" -SRC_URI[sha256sum] = "967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a" +SRC_URI[md5sum] = "93e99fd3d0d6cd5401c0f84f2cce1d8f" +SRC_URI[sha256sum] = "ebbd6448a1e416d95889a252f7e03a5429ad4f30bc84c7e8ede8086433e86c55" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" +inherit perlnative + # The install rule from the Makefile has hardcoded paths, so we duplicate # the actions to accommodate different paths. do_install () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 06:03:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 06:03:20 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (27f9b33 -> 68aa2ea) Message-ID: <158088260057.18459.6314321953985598400@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 27f9b33 cpuid: Upgrade to 20200203 and use perlnative for pod2man new e44ff41 iwd: Update to 1.4 new e2bf7b5 iwd: Add PACKAGECONFIG options new 3db4cc7 iwd: Use manpages class to control documentation new 68aa2ea iwd: Update formatting The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...-Avoid-redirection-of-input-and-output-fi.patch | 12 ++--- .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ++++++++++++++++++++++ meta-oe/recipes-connectivity/iwd/iwd_1.0.bb | 39 -------------- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 58 ++++++++++++++++++++ 4 files changed, 125 insertions(+), 46 deletions(-) create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.0.bb create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 06:03:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 06:03:22 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: iwd: Add PACKAGECONFIG options In-Reply-To: <158088260057.18459.6314321953985598400@git.openembedded.org> References: <158088260057.18459.6314321953985598400@git.openembedded.org> Message-ID: <20200205060321.1B7BE232A0A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e2bf7b572c2e47b838dde2112f4af91f3da10cea Author: Robert Joslyn AuthorDate: Tue Feb 4 20:23:07 2020 -0800 iwd: Add PACKAGECONFIG options Make it easier to disable optional client, monitor, and man page components and their dependencies. A user may want to disable the client to avoid the use of GPLv3 readline. Signed-off-by: Robert Joslyn Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb index ed8f21a..cfced50 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" inherit autotools pkgconfig systemd python3native -DEPENDS = "ell readline python3-docutils-native" +DEPENDS = "ell" SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ @@ -13,7 +13,15 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= " \ + client \ + monitor \ + manual-pages \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" +PACKAGECONFIG[manual-pages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" @@ -27,6 +35,8 @@ do_configure_prepend () { do_install_append() { mkdir --parents ${D}${docdir}/${BPN} install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} + # If client and monitor are disabled, bindir is empty, causing a QA error + rmdir --ignore-fail-on-non-empty ${D}/${bindir} } FILES_${PN} += "${datadir}/dbus-1 ${nonarch_libdir}/modules-load.d ${systemd_unitdir}/network/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 06:03:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 06:03:23 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: iwd: Use manpages class to control documentation In-Reply-To: <158088260057.18459.6314321953985598400@git.openembedded.org> References: <158088260057.18459.6314321953985598400@git.openembedded.org> Message-ID: <20200205060321.301BB232A0B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3db4cc73509f5b624f48603e80e53d7fff0d5fe3 Author: Robert Joslyn AuthorDate: Tue Feb 4 20:23:08 2020 -0800 iwd: Use manpages class to control documentation This class allows the api-documentation distro feature to control man page generation. Remove copying all .txt files from ${S}/doc since these are developer documents and wouldn't be of any use to users on the target device. Signed-off-by: Robert Joslyn Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb index cfced50..9d63e5b 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Wireless daemon for Linux" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -inherit autotools pkgconfig systemd python3native +inherit autotools manpages pkgconfig systemd python3native DEPENDS = "ell" @@ -16,12 +16,11 @@ S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ client \ monitor \ - manual-pages \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manual-pages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" @@ -33,8 +32,6 @@ do_configure_prepend () { } do_install_append() { - mkdir --parents ${D}${docdir}/${BPN} - install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} # If client and monitor are disabled, bindir is empty, causing a QA error rmdir --ignore-fail-on-non-empty ${D}/${bindir} } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 06:03:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 06:03:21 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: iwd: Update to 1.4 In-Reply-To: <158088260057.18459.6314321953985598400@git.openembedded.org> References: <158088260057.18459.6314321953985598400@git.openembedded.org> Message-ID: <20200205060321.09F0D232A09@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e44ff416216f970d18b98ba90eb02d1a6bb18b69 Author: Robert Joslyn AuthorDate: Tue Feb 4 20:23:06 2020 -0800 iwd: Update to 1.4 dbus is not required to compile, but is expected at run time. Move it to RDEPENDS. Backport a patch from upstream to fix build using musl. rawmemchr is a GNU extension that is not supported in musl. >From upstream changelog: ver 1.4: Fix issue with handling Crypto-Binding and invalid MACs. Fix issue with handling change station error results. Fix issue with handling DNS resolving installations. ver 1.3: Fix issue with handling EAP-GTC and password requests. Fix issue with handling Crypto-Binding TLV for PEAPv0. Fix issue with handling key installation and PEAP Phase 2. Fix issue with handling externally triggered scan requests. Fix issue with handling RCPI calculation for RRM requests. ver 1.2: Fix issue with handling scan requests while connecting. Fix issue with handling scan duration for RRM requests. Fix issue with handling parent TSF value for RRM requests. ver 1.1: Fix issue with simple configuration support checks. Fix issue with handling TLS tunnel and PEAPv0. Add support for radio resource management. Signed-off-by: Robert Joslyn Signed-off-by: Khem Raj --- ...-Avoid-redirection-of-input-and-output-fi.patch | 12 ++--- .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ++++++++++++++++++++++ .../iwd/{iwd_1.0.bb => iwd_1.4.bb} | 7 ++- 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch index 93ef007..80126a8 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch @@ -1,4 +1,4 @@ -From f2a2b9f445ab1e31fbb27a74744e9a2ededfce17 Mon Sep 17 00:00:00 2001 +From 46fc0e197598579dc05e42f137e84f86a9b926e9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 4 Nov 2019 16:38:04 -0800 Subject: [PATCH] Makefile.am: Avoid redirection of input and output files @@ -15,26 +15,24 @@ make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1 Upstream-Status: Pending Signed-off-by: Khem Raj + --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 823b7d02..1bd0005c 100644 +index 8c69d9f4..35a25fc0 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -626,8 +626,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ +@@ -629,8 +629,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ < $< > $@ if RUN_RST2MAN -RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \ -- --no-datestamp < $< > $@ +- --no-datestamp $< $@ +RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(AM_V_GEN)$(RST2MAN) --strict --no-raw \ + --no-generator --no-datestamp $< $@ else RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ { echo "Generated manual page $@ does not exist"; false; } --- -2.24.0 - diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch new file mode 100644 index 0000000..733f5fe --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch @@ -0,0 +1,62 @@ +From fcdddf2b726439e049992878f90da607414a1a47 Mon Sep 17 00:00:00 2001 +From: Denis Kenzior +Date: Mon, 3 Feb 2020 11:54:28 -0600 +Subject: [PATCH] build: Support missing rawmemchr + +rawmemchr is a GNU extension in glibc that does not exist in musl. + +Upstream-status: Backport of https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=fcdddf2b726439e049992878f90da607414a1a47 + +Signed-off-by: Robert Joslyn + +--- + configure.ac | 1 + + src/missing.h | 10 ++++++++++ + src/wiphy.c | 1 + + 3 files changed, 12 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 5ae1401cae17..2d373a47ba68 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,6 +128,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}", + [Directory for Ethernet daemon storage files]) + + AC_CHECK_FUNCS(explicit_bzero) ++AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) + +diff --git a/src/missing.h b/src/missing.h +index 2bb210ae3c81..2cc80aee5d38 100644 +--- a/src/missing.h ++++ b/src/missing.h +@@ -27,3 +27,13 @@ static inline void explicit_bzero(void *s, size_t n) + __asm__ __volatile__ ("" : : "r"(s) : "memory"); + } + #endif ++ ++#ifndef HAVE_RAWMEMCHR ++static inline void *rawmemchr(const void *s, int c) ++{ ++_Pragma("GCC diagnostic push") ++_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") ++ return memchr(s, c, (size_t) -1); ++_Pragma("GCC diagnostic pop") ++} ++#endif +diff --git a/src/wiphy.c b/src/wiphy.c +index 1da479db2dab..511bb27f52b8 100644 +--- a/src/wiphy.c ++++ b/src/wiphy.c +@@ -37,6 +37,7 @@ + + #include "linux/nl80211.h" + ++#include "src/missing.h" + #include "src/iwd.h" + #include "src/module.h" + #include "src/ie.h" +-- +2.21.0 + diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb similarity index 86% rename from meta-oe/recipes-connectivity/iwd/iwd_1.0.bb rename to meta-oe/recipes-connectivity/iwd/iwd_1.4.bb index cc34ca2..ed8f21a 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb @@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" inherit autotools pkgconfig systemd python3native -DEPENDS = "ell readline dbus python3-docutils-native" +DEPENDS = "ell readline python3-docutils-native" SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + file://0001-build-Support-missing-rawmemchr.patch \ " -SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db" +SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261" S = "${WORKDIR}/git" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -32,6 +33,8 @@ FILES_${PN} += "${datadir}/dbus-1 ${nonarch_libdir}/modules-load.d ${systemd_uni SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" +RDEPENDS_${PN} = "dbus" + RRECOMMENDS_${PN} = "\ kernel-module-pkcs7-message \ kernel-module-pkcs8-key-parser \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 06:03:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 06:03:24 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: iwd: Update formatting In-Reply-To: <158088260057.18459.6314321953985598400@git.openembedded.org> References: <158088260057.18459.6314321953985598400@git.openembedded.org> Message-ID: <20200205060321.4008C232A0C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 68aa2eab38a0cf9d5eca58ba95ff4ffec7f1457b Author: Robert Joslyn AuthorDate: Tue Feb 4 20:23:09 2020 -0800 iwd: Update formatting Try to conform better to the style guide. Signed-off-by: Robert Joslyn Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 35 ++++++++++++++++++----------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb index 9d63e5b..f758781 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb @@ -1,18 +1,20 @@ -DESCRIPTION = "Wireless daemon for Linux" +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -inherit autotools manpages pkgconfig systemd python3native - DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ - file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ - file://0001-build-Support-missing-rawmemchr.patch \ - " +SRC_URI = " \ + git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + file://0001-build-Support-missing-rawmemchr.patch \ +" SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261" S = "${WORKDIR}/git" +inherit autotools manpages pkgconfig python3native systemd + PACKAGECONFIG ??= " \ client \ monitor \ @@ -25,10 +27,15 @@ PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" -EXTRA_OECONF += "--enable-external-ell" +EXTRA_OECONF = "--enable-external-ell" -do_configure_prepend () { - mkdir -p ${S}/build-aux +SYSTEMD_SERVICE_${PN} = " \ + iwd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ +" + +do_configure_prepend() { + install -d ${S}/build-aux } do_install_append() { @@ -36,9 +43,11 @@ do_install_append() { rmdir --ignore-fail-on-non-empty ${D}/${bindir} } -FILES_${PN} += "${datadir}/dbus-1 ${nonarch_libdir}/modules-load.d ${systemd_unitdir}/network/" - -SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" RDEPENDS_${PN} = "dbus" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:54 +0000 Subject: [oe-commits] [openembedded-core] 02/10: netbase: Upgrade to 6.0 In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.62572232A0C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cdb4b65e1c7d5efeac90feb446ea84a350a18aed Author: Khem Raj AuthorDate: Sun Feb 2 10:34:58 2020 -0800 netbase: Upgrade to 6.0 adjust install to pick new files from S Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/netbase/netbase_5.8.bb b/meta/recipes-core/netbase/netbase_6.0.bb similarity index 61% rename from meta/recipes-core/netbase/netbase_5.8.bb rename to meta/recipes-core/netbase/netbase_6.0.bb index df617f4..2fb5762 100644 --- a/meta/recipes-core/netbase/netbase_5.8.bb +++ b/meta/recipes-core/netbase/netbase_6.0.bb @@ -8,13 +8,13 @@ PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[md5sum] = "ca2e339861b64370779341b9696ee3df" -SRC_URI[sha256sum] = "4a9035eb379c4f7f7d424e5580b219b79566fa366c812542691ae337486cfb8e" +SRC_URI[md5sum] = "3417b0487161f1a2b070a3308cd7f957" +SRC_URI[sha256sum] = "692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { install -d ${D}/${mandir}/man8 ${D}${sysconfdir} - install -m 0644 etc-rpc ${D}${sysconfdir}/rpc - install -m 0644 etc-protocols ${D}${sysconfdir}/protocols - install -m 0644 etc-services ${D}${sysconfdir}/services + install -m 0644 ${S}/etc/rpc ${D}${sysconfdir}/rpc + install -m 0644 ${S}/etc/protocols ${D}${sysconfdir}/protocols + install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:55 +0000 Subject: [oe-commits] [openembedded-core] 03/10: musl: Update to latest on master In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.6E79B232A0D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d4ecf976c446984bd9fb1181e12e02cb9a5829a3 Author: Khem Raj AuthorDate: Sun Feb 2 10:34:59 2020 -0800 musl: Update to latest on master Details on commit delta [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=83350eb17b9cb355e3f08b0340c4f1e8c437fac9..e6093b5a870a38ebfb3e54382acd48c698bde15d Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 6298720..f4853b4 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" +SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:53 +0000 Subject: [oe-commits] [openembedded-core] 01/10: baremetal-helloworld: Create recipe for baremetal examples on QEMU In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.587AF232A0B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b314e9a0923c8aa95a2f2c3f48d956206e9885a7 Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Jan 31 01:54:42 2020 -0800 baremetal-helloworld: Create recipe for baremetal examples on QEMU Create HelloWorld examples that run on several of the QEMU architectures supported by the build system. This recipe can be used by anyone to understand how baremetal applications can be built using OpenEmbedded and how the wiring to set them up could be. This should also facilitate creating/extending the OE testing infrastructure to allow baremetal applications or RTOSs to be tested in the same way that Linux currently is. This can easily be extended to work on other MACHINES in the future. To run this example: $ source oe-init-buildenv $ bitbake-layers add-layer ../meta-skeleton # TCLIBC="baremetal" would work as well $ echo "TCLIBC = \"newlib\"" >> ./conf/local.conf $ echo "MACHINE = \"qemuarm64\"" >> ./conf/local.conf $ bitbake baremetal-helloworld $ runqemu runqemu - INFO - Running bitbake -e ... runqemu - INFO - Continuing with the following parameters: KERNEL: [tmp/deploy/images/qemuarm64/baremetal-helloworld-qemuarm64.bin] MACHINE: [qemuarm64] FSTYPE: [bin] ROOTFS: [tmp/deploy/images/qemuarm64/baremetal-helloworld-qemuarm64.bin] CONFFILE: [tmp/deploy/images/qemuarm64/baremetal-helloworld-qemuarm64.qemuboot.conf] Hello OpenEmbedded! Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- .../baremetal-examples/baremetal-helloworld_git.bb | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb new file mode 100644 index 0000000..d863370 --- /dev/null +++ b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb @@ -0,0 +1,105 @@ +SUMMARY = "Baremetal examples to work with the several QEMU architectures supported on OpenEmbedded" +HOMEPAGE = "https://github.com/aehs29/baremetal-helloqemu" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449" + +SRCREV = "99f4fa4a3b266b42b52af302610b0f4f429ba5e3" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master" + +S = "${WORKDIR}/git/" + +# These examples are not meant to be built when using either musl or glibc +COMPATIBLE_HOST_libc-musl_class-target = "null" +COMPATIBLE_HOST_libc-glibc_class-target = "null" + +# This will be translated automatically to the architecture and +# machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57 +# but the examples can also be run on other architectures/machines +# such as vexpress-a15 by overriding the setting on the machine.conf +COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64" + +BAREMETAL_QEMUARCH ?= "" +BAREMETAL_QEMUARCH_qemuarmv5 = "versatile" +BAREMETAL_QEMUARCH_qemuarm = "arm" +BAREMETAL_QEMUARCH_qemuarm64 = "aarch64" + + +EXTRA_OEMAKE_append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1" + +do_install(){ + install -d ${D}/${datadir} + install -m 755 ${B}build/hello_baremetal_${BAREMETAL_QEMUARCH}.bin ${D}/${datadir}/hello_baremetal_${MACHINE}.bin + install -m 755 ${B}build/hello_baremetal_${BAREMETAL_QEMUARCH}.elf ${D}/${datadir}/hello_baremetal_${MACHINE}.elf +} + +# Borrowed from meta-freertos +inherit rootfs-postcommands +inherit deploy +do_deploy[dirs] = "${DEPLOYDIR} ${DEPLOY_DIR_IMAGE}" +do_rootfs[dirs] = "${DEPLOYDIR} ${DEPLOY_DIR_IMAGE}" +DEPLOYDIR = "${IMGDEPLOYDIR}" +IMAGE_LINK_NAME ?= "baremetal-helloworld-image-${MACHINE}" +IMAGE_NAME_SUFFIX ?= "" + +do_deploy(){ + install ${D}/${datadir}/hello_baremetal_${MACHINE}.bin ${DEPLOYDIR}/${IMAGE_LINK_NAME}.bin + install ${D}/${datadir}/hello_baremetal_${MACHINE}.elf ${DEPLOYDIR}/${IMAGE_LINK_NAME}.elf +} + +do_image(){ + : +} + +FILES_${PN} += " \ + ${datadir}/hello_baremetal_${MACHINE}.bin \ + ${datadir}/hello_baremetal_${MACHINE}.elf \ +" + +python do_rootfs(){ + from oe.utils import execute_pre_post_process + from pathlib import Path + + # Write empty manifest testdate file + deploy_dir = d.getVar('DEPLOYDIR') + link_name = d.getVar('IMAGE_LINK_NAME') + manifest_name = d.getVar('IMAGE_MANIFEST') + + Path(manifest_name).touch() + if os.path.exists(manifest_name) and link_name: + manifest_link = deploy_dir + "/" + link_name + ".manifest" + if os.path.lexists(manifest_link): + os.remove(manifest_link) + os.symlink(os.path.basename(manifest_name), manifest_link) + execute_pre_post_process(d, d.getVar('ROOTFS_POSTPROCESS_COMMAND')) +} + +# QEMU generic FreeRTOS parameters +QB_DEFAULT_KERNEL = "${IMAGE_LINK_NAME}.bin" +QB_MEM = "-m 256" +QB_OPT_APPEND = "-nographic" +QB_DEFAULT_FSTYPE = "bin" +QB_DTB = "" + +# This next part is necessary to trick the build system into thinking +# its building an image recipe so it generates the qemuboot.conf +addtask do_deploy after do_write_qemuboot_conf before do_build +addtask do_rootfs before do_deploy after do_install +addtask do_image after do_rootfs before do_build +inherit qemuboot + +# Based on image.bbclass to make sure we build qemu +python(){ + # do_addto_recipe_sysroot doesnt exist for all recipes, but we need it to have + # /usr/bin on recipe-sysroot (qemu) populated + def extraimage_getdepends(task): + deps = "" + for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): + # Make sure we only add it for qemu + if 'qemu' in dep: + deps += " %s:%s" % (dep, task) + return deps + d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_addto_recipe_sysroot')) + d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_sysroot')) +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:52 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (d3083e9 -> 621ea68) Message-ID: <158091047298.23827.2249494759489664536@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from d3083e9 kernel-yocto.bbclass: export LD in the environment used by kconf_check new b314e9a baremetal-helloworld: Create recipe for baremetal examples on QEMU new cdb4b65 netbase: Upgrade to 6.0 new d4ecf97 musl: Update to latest on master new b939240 logrotate.py: improve oeqa test implementation new 94446ea webkitgtk: Prefer -pthread over -lpthread new 14f34d3 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' new f7cc44c x264: upgrade to latest revision new fdb2a95 ncurses: add CVE_VERSION new f2f7aa9 libxml2: fix CVE-2020-7595 new 621ea68 sqlite3: upgrade 3.30.1 -> 3.31.1 The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../baremetal-examples/baremetal-helloworld_git.bb | 105 +++++++++++++++++++++ meta/lib/oeqa/runtime/cases/logrotate.py | 62 ++++++++---- .../libxml/libxml2/CVE-2020-7595.patch | 36 +++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + meta/recipes-core/musl/musl_git.bb | 2 +- meta/recipes-core/ncurses/ncurses_6.1+20191019.bb | 2 + .../netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++++++++++++++ .../x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 ++- meta/recipes-multimedia/x264/x264_git.bb | 4 +- .../0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 45 +++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.2.bb | 1 + .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ------- .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ------- .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ---------- .../sqlite/sqlite3/CVE-2019-19924.patch | 65 ------------- .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ------- .../sqlite/sqlite3/CVE-2019-19926.patch | 31 ------ .../sqlite/sqlite3/CVE-2019-19959.patch | 46 --------- .../sqlite/sqlite3/CVE-2019-20218.patch | 31 ------ meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ---- meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 +++ 23 files changed, 356 insertions(+), 376 deletions(-) create mode 100644 meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch rename meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} (61%) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.30.1.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.31.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:56 +0000 Subject: [oe-commits] [openembedded-core] 04/10: logrotate.py: improve oeqa test implementation In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.7B541232A0E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b9392403e96c6d880de844b44da2c7300fcf411c Author: Trevor Gamblin AuthorDate: Thu Jan 23 20:29:28 2020 -0500 logrotate.py: improve oeqa test implementation See bug https://bugzilla.yoctoproject.org/show_bug.cgi?id=13632 Autobuilder tests occasionally fail, reporting that a new logfile could not be created. While this failure did occur multiple times, it could not be manually reproduced. However, there are issues with the implementation of the logrotate.py script that can be fixed. These changes will help make the failures clearer, should they continue to occur. Previously, the test_2_logrotate test would, after running the logrotate tool, use "ls -al $HOME/logrotate_dir | wc -l" to count the number of files in the rotation directory and determine if the rotation was successful. The test to see if there are at least three files is problematic, because depending on the version of ls used, it may report the target value of 3 even when there are only hidden files in the directory, potentially reporting a pass for the test when it should actually fail. An example with coreutils: root at qemux86-64:~# ls -al emptydir/ total 2 drwxr-xr-x 2 root root 1024 Jan 14 19:50 . drwx------ 3 root root 1024 Jan 14 19:50 .. root at qemux86-64:~# Where "total" is the number of blocks used. Compare with busybox ls: root at qemux86-64:~# ls -al emptydir/ drwxr-xr-x 2 root root 1024 Jan 14 19:54 . drwx------ 3 root root 1024 Jan 14 19:54 .. root at qemux86-64:~# Instead of using ls to verify that a certain number of files exists in $HOME/logrotate_dir, the tests have been changed to rotate two specific logs: the log for wtmp and a new logrotate_testfile created during the second test. Both tests check that the logs are correctly rotated into $HOME/logrotate_dir by using find and grep on the expected filename (e.g. "wtmp" when rotated becomes "wtmp.1", so we check to see that wtmp.1 is present in $HOME/logrotate_dir). In addition, should the test fail, the output from logrotate -vf is included in the test log to aid debugging. It has also been seen that in some cases, the logrotate test fails because the /var/log/wtmp file is not yet present. Since the objective of the test is to check the logrotate functionality and not the presence of certain log files, test_logrotate_wtmp uses the touch command to help ensure that the file is present before the call to logrotate is issued. Finally, note that while the autobuilder failures that this patch addresses were only seen during core-image-full-cmdline tests, these changes were successfully tested on core-image-minimal and core-image-sato with the manual addition of logrotate and openssh-sshd to the images. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/logrotate.py | 62 ++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/logrotate.py b/meta/lib/oeqa/runtime/cases/logrotate.py index bfa57c5..3938e91 100644 --- a/meta/lib/oeqa/runtime/cases/logrotate.py +++ b/meta/lib/oeqa/runtime/cases/logrotate.py @@ -18,32 +18,58 @@ class LogrotateTest(OERuntimeTestCase): @classmethod def tearDownClass(cls): cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf $HOME/logrotate_dir') + cls.tc.target.run('rm -rf /var/log/logrotate_testfile && rm -rf /etc/logrotate.d/logrotate_testfile') @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['logrotate']) - def test_1_logrotate_setup(self): + def test_logrotate_wtmp(self): + + # /var/log/wtmp may not always exist initially, so use touch to ensure it is present + status, output = self.target.run('touch /var/log/wtmp') + msg = ('Could not create/update /var/log/wtmp with touch') + self.assertEqual(status, 0, msg = msg) + status, output = self.target.run('mkdir $HOME/logrotate_dir') - msg = 'Could not create logrotate_dir. Output: %s' % output + msg = ('Could not create logrotate_dir. Output: %s' % output) + self.assertEqual(status, 0, msg = msg) + + status, output = self.target.run('echo "create \n olddir $HOME/logrotate_dir \n include /etc/logrotate.d/wtmp" > /tmp/logrotate-test.conf') + msg = ('Could not write to /tmp/logrotate-test.conf') + self.assertEqual(status, 0, msg = msg) + + status, output = self.target.run('echo "/var/log/logrotate_test {\\n missingok \\n monthly \\n rotate 1" > /etc/logrotate.d/logrotate_test') + msg = ('Could not write to /etc/logrotate.d/logrotate_test') + self.assertEqual(status, 0, msg = msg) + + # If logrotate fails to rotate the log, view the verbose output of logrotate to see what prevented it + _, logrotate_output = self.target.run('logrotate -vf /tmp/logrotate-test.conf') + status, _ = self.target.run('find $HOME/logrotate_dir -type f | grep wtmp.1') + msg = ("logrotate did not successfully rotate the wtmp log. Output from logrotate -vf: \n%s" % (logrotate_output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['logrotate.LogrotateTest.test_logrotate_wtmp']) + def test_logrotate_newlog(self): + + status, output = self.target.run('echo "oeqa logrotate test file" > /var/log/logrotate_testfile') + msg = ('Could not create logrotate test file in /var/log') + self.assertEqual(status, 0, msg = msg) + + status, output = self.target.run('echo "/var/log/logrotate_testfile {\n missingok \n monthly \n rotate 1" > /etc/logrotate.d/logrotate_testfile') + msg = ('Could not write to /etc/logrotate.d/logrotate_testfile') self.assertEqual(status, 0, msg = msg) - cmd = ('sed -i "s#wtmp {#wtmp {\\n olddir $HOME/logrotate_dir#"' - ' /etc/logrotate.d/wtmp') - status, output = self.target.run(cmd) - msg = ('Could not write to logrotate.d/wtmp file. Status and output: ' - ' %s and %s' % (status, output)) + status, output = self.target.run('echo "create \n olddir $HOME/logrotate_dir \n include /etc/logrotate.d/logrotate_testfile" > /tmp/logrotate-test2.conf') + msg = ('Could not write to /tmp/logrotate_test2.conf') self.assertEqual(status, 0, msg = msg) - @OETestDepends(['logrotate.LogrotateTest.test_1_logrotate_setup']) - def test_2_logrotate(self): - status, output = self.target.run('echo "create \n include /etc/logrotate.d" > /tmp/logrotate-test.conf') - status, output = self.target.run('logrotate -f /tmp/logrotate-test.conf') + status, output = self.target.run('find $HOME/logrotate_dir -type f | grep logrotate_testfile.1') + msg = ('A rotated log for logrotate_testfile is already present in logrotate_dir') + self.assertEqual(status, 1, msg = msg) - msg = ('logrotate service could not be reloaded. Status and output: ' - '%s and %s' % (status, output)) + # If logrotate fails to rotate the log, view the verbose output of logrotate instead of just listing the files in olddir + _, logrotate_output = self.target.run('logrotate -vf /tmp/logrotate-test2.conf') + status, _ = self.target.run('find $HOME/logrotate_dir -type f | grep logrotate_testfile.1') + msg = ('logrotate did not successfully rotate the logrotate_test log. Output from logrotate -vf: \n%s' % (logrotate_output)) self.assertEqual(status, 0, msg = msg) - _, output = self.target.run('ls -la $HOME/logrotate_dir/ | wc -l') - msg = ('new logfile could not be created. List of files within log ' - 'directory: %s' % ( - self.target.run('ls -la $HOME/logrotate_dir')[1])) - self.assertTrue(int(output)>=3, msg = msg) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:00 +0000 Subject: [oe-commits] [openembedded-core] 08/10: ncurses: add CVE_VERSION In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.A14B9232A15@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fdb2a95d5e0265de1172940b6dc71fc7d602e8d1 Author: Anuj Mittal AuthorDate: Tue Feb 4 13:47:05 2020 +0800 ncurses: add CVE_VERSION Include the version number in a format that is comparable to what we get from NVD. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses_6.1+20191019.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb index ee7d4be..187777f 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb @@ -9,3 +9,5 @@ SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" + +CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:01 +0000 Subject: [oe-commits] [openembedded-core] 09/10: libxml2: fix CVE-2020-7595 In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.AB19B232A16@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f2f7aa9a495774fe5a2e3947584cb3503bd1eaf1 Author: Anuj Mittal AuthorDate: Tue Feb 4 13:47:06 2020 +0800 libxml2: fix CVE-2020-7595 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 37 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000..facfefd --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 2c833fa..6a4097c 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ + file://CVE-2020-7595.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:58 +0000 Subject: [oe-commits] [openembedded-core] 06/10: gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.8F025232A13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 14f34d32bfdaa752f5043e62750d2e7b92c4b419 Author: Taras Kondratiuk via Openembedded-core AuthorDate: Tue Feb 4 02:20:06 2020 +0000 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' Linux kernel compilation for aarch64 triggers ICE if CONFIG_CC_OPTIMIZE_FOR_SIZE=y. The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. Apply the fix to 9.2. Signed-off-by: Taras Kondratiuk Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 926df11..2bae85a 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -69,6 +69,7 @@ SRC_URI = "\ file://CVE-2019-15847_1.patch \ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch new file mode 100644 index 0000000..c37e0bb --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch @@ -0,0 +1,95 @@ +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From: Vladimir Makarov +Date: Wed, 10 Jul 2019 16:07:10 +0000 +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os + starting with r270266) + +2019-07-10 Vladimir Makarov + + PR target/91102 + * lra-constraints.c (process_alt_operands): Don't match user + defined regs only if they are early clobbers. + +2019-07-10 Vladimir Makarov + + PR target/91102 + * gcc.target/aarch64/pr91102.c: New test. + +From-SVN: r273357 +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] +[takondra: dropped conflicting ChangeLog changes] +Signed-off-by: Taras Kondratiuk +--- + gcc/lra-constraints.c | 17 ++++++++++---- + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 4 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index cf33da8013e4..6382dbf852b6 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) + else + { + /* Operands don't match. If the operands are +- different user defined explicit hard registers, +- then we cannot make them match. */ ++ different user defined explicit hard ++ registers, then we cannot make them match ++ when one is early clobber operand. */ + if ((REG_P (*curr_id->operand_loc[nop]) + || SUBREG_P (*curr_id->operand_loc[nop])) + && (REG_P (*curr_id->operand_loc[m]) +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) + && REG_P (m_reg) + && HARD_REGISTER_P (m_reg) + && REG_USERVAR_P (m_reg)) +- break; ++ { ++ int i; ++ ++ for (i = 0; i < early_clobbered_regs_num; i++) ++ if (m == early_clobbered_nops[i]) ++ break; ++ if (i < early_clobbered_regs_num ++ || early_clobber_p) ++ break; ++ } + } +- + /* Both operands must allow a reload register, + otherwise we cannot make them match. */ + if (curr_alt[m] == NO_REGS) +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c +new file mode 100644 +index 000000000000..70b99045a48e +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c +@@ -0,0 +1,26 @@ ++/* PR target/91102 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++int ++foo (long d, long l) ++{ ++ register long e asm ("x1") = d; ++ register long f asm("x2") = l; ++ asm ("" : : "r" (e), "r" (f)); ++ return 3; ++} ++ ++struct T { int i; int j; }; ++union S { long h; struct T t; }; ++ ++void ++bar (union S b) ++{ ++ while (1) ++ { ++ union S c = b; ++ c.t.j++; ++ b.h = foo (b.h, c.h); ++ } ++} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:59 +0000 Subject: [oe-commits] [openembedded-core] 07/10: x264: upgrade to latest revision In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.98387232A14@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f7cc44c98792f7c2f479a9bd86d6ed9c96373c00 Author: Anuj Mittal AuthorDate: Tue Feb 4 13:47:04 2020 +0800 x264: upgrade to latest revision Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 ++++++-------- meta/recipes-multimedia/x264/x264_git.bb | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch index 087a448..cb771fb 100644 --- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +++ b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch @@ -1,4 +1,4 @@ -From 66b120079fb21ed38cab0900c63360b0a7853eaa Mon Sep 17 00:00:00 2001 +From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 13 Dec 2016 14:22:32 -0700 Subject: [PATCH] Fix X32 build by disabling asm @@ -12,15 +12,16 @@ doesn't successfully build at this time, and my assembly is very rusty. Upstream-Status: Pending Signed-off-by: Christopher Larson + --- configure | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 3109ec4..844aeae 100755 +index 51b128d..6ea9469 100755 --- a/configure +++ b/configure -@@ -703,7 +703,13 @@ case $host_cpu in +@@ -754,7 +754,13 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" stack_alignment=16 @@ -33,9 +34,9 @@ index 3109ec4..844aeae 100755 + fi + fi if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" + ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" if cc_check '' "-arch x86_64"; then -@@ -722,7 +728,11 @@ case $host_cpu in +@@ -773,7 +779,11 @@ case $host_cpu in RCFLAGS="--target=pe-x86-64 $RCFLAGS" fi else @@ -48,6 +49,3 @@ index 3109ec4..844aeae 100755 fi ;; powerpc*) --- -2.8.0 - diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index f22930a..39429a8 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "72db437770fd1ce3961f624dd57a8e75ff65ae0b" +SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c" -PV = "r2917+git${SRCPV}" +PV = "r2991+git${SRCPV}" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:47:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:47:57 +0000 Subject: [oe-commits] [openembedded-core] 05/10: webkitgtk: Prefer -pthread over -lpthread In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.8503C232A10@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 94446ea1bfcb175af6fcaf5969a3a4507fdbf470 Author: Khem Raj AuthorDate: Mon Feb 3 17:45:36 2020 -0800 webkitgtk: Prefer -pthread over -lpthread -pthread is compiler driver option which links in needed dependencies for pthreads along with -lpthread, this aids in fixing build failures on rv64 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 45 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.2.bb | 1 + 2 files changed, 46 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch new file mode 100644 index 0000000..268118b --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch @@ -0,0 +1,45 @@ +From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 3 Feb 2020 17:06:27 -0800 +Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG + +Fixes build failures on risv64 + +Taken from https://trac.webkit.org/changeset/231843/webkit + + Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of +-lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to +missing atomic primitives. + +Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] +Signed-off-by: Khem Raj +--- + Source/cmake/OptionsGTK.cmake | 2 ++ + Source/cmake/OptionsJSCOnly.cmake | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake +index d3beef19..6a92856f 100644 +--- a/Source/cmake/OptionsGTK.cmake ++++ b/Source/cmake/OptionsGTK.cmake +@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT + set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") + ++set(THREADS_PREFER_PTHREAD_FLAG ON) ++ + find_package(Cairo 1.14.0 REQUIRED) + find_package(Fontconfig 2.8.0 REQUIRED) + find_package(Freetype 2.4.2 REQUIRED) +diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake +index b2e87418..326ade23 100644 +--- a/Source/cmake/OptionsJSCOnly.cmake ++++ b/Source/cmake/OptionsJSCOnly.cmake +@@ -1,3 +1,4 @@ ++set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + + if (MSVC) +-- +2.25.0 + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb index a223cfd..a184d83 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ + file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ file://x32_support.patch \ file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:02 +0000 Subject: [oe-commits] [openembedded-core] 10/10: sqlite3: upgrade 3.30.1 -> 3.31.1 In-Reply-To: <158091047298.23827.2249494759489664536@git.openembedded.org> References: <158091047298.23827.2249494759489664536@git.openembedded.org> Message-ID: <20200205134753.B40FD232A17@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 621ea68239763ce8740731e745c5002c956d4c67 Author: Anuj Mittal AuthorDate: Tue Feb 4 13:51:45 2020 +0800 sqlite3: upgrade 3.30.1 -> 3.31.1 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ----------- .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ----------- .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ----------------- .../sqlite/sqlite3/CVE-2019-19924.patch | 65 ---------------------- .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ----------- .../sqlite/sqlite3/CVE-2019-19926.patch | 31 ----------- .../sqlite/sqlite3/CVE-2019-19959.patch | 46 --------------- .../sqlite/sqlite3/CVE-2019-20218.patch | 31 ----------- meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ------- meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 ++++ 10 files changed, 12 insertions(+), 342 deletions(-) diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch deleted file mode 100644 index 3f70979..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19244 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 -From: dan -Date: Fri, 22 Nov 2019 10:14:01 +0000 -Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both - DISTINCT and window functions also used an ORDER BY that is the same as its - select list. - -Amalgamation version of the patch: -FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba ---- - sqlite3.c | 5 +++-- - sqlite3.h | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 8fd740b..db1c649 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( - */ - if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct - && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 -+ && p->pWin==0 - ){ - p->selFlags &= ~SF_Distinct; - pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch deleted file mode 100644 index ca5c31c..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19880 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Wed, 18 Dec 2019 00:05:50 +0000 -Subject: [PATCH] When processing constant integer values in ORDER BY clauses - of window definitions (see check-in [7e4 --- - ---- - sqlite3.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sqlite3.c b/sqlite3.c -index db1c649..a83b3d2 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList( - int nInit = pList ? pList->nExpr : 0; - for(i=0; inExpr; i++){ - Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0); -+ assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) ); - if( bIntToNull && pDup && pDup->op==TK_INTEGER ){ - pDup->op = TK_NULL; - pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); -+ pDup->u.zToken = 0; - } - pList = sqlite3ExprListAppend(pParse, pList, pDup); - if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags; --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch deleted file mode 100644 index b1b866b..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch +++ /dev/null @@ -1,50 +0,0 @@ -CVE: CVE-2019-19923 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Wed, 18 Dec 2019 20:51:58 +0000 -Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of - check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer - query is DISTINCT. Without this fix, if an index scan is run on the table - within the view on the right-hand side of the LEFT JOIN, stale result - registers might be accessed yielding incorrect results, and/or an - OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a - NULL-pointer dereference. This problem was found by the Yongheng and Rui - fuzzer. - -FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e ---- - sqlite3.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index d29da07..5bc06c8 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -129216,6 +129216,7 @@ static void substSelect( - ** (3b) the FROM clause of the subquery may not contain a virtual - ** table and - ** (3c) the outer query may not be an aggregate. -+** (3d) the outer query may not be DISTINCT. - ** - ** (4) The subquery can not be DISTINCT. - ** -@@ -129412,8 +129413,11 @@ static int flattenSubquery( - */ - if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ - isLeftJoin = 1; -- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ -- /* (3a) (3c) (3b) */ -+ if( pSubSrc->nSrc>1 /* (3a) */ -+ || isAgg /* (3b) */ -+ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ -+ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ -+ ){ - return 0; - } - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch deleted file mode 100644 index 80d5edb..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch +++ /dev/null @@ -1,65 +0,0 @@ -CVE: CVE-2019-19924 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 854fe21e8a987f84da81f6bb9e90abc5355c6621 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 20:37:32 +0000 -Subject: [PATCH] When an error occurs while rewriting the parser tree for - window functions in the sqlite3WindowRewrite() routine, make sure that - pParse->nErr is set, and make sure that this shuts down any subsequent code - generation that might depend on the transformations that were implemented. - This fixes a problem discovered by the Yongheng and Rui fuzzer. - -Amalgamation format of backported patch -FossilOrigin-Name: e2bddcd4c55ba3cbe0130332679ff4b048630d0ced9a8899982edb5a3569ba7f ---- - sqlite3.c | 16 +++++++++++----- - sqlite3.h | 2 +- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 408ec4c..857c28e 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -77798,7 +77798,8 @@ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){ - */ - static void vdbeVComment(Vdbe *p, const char *zFormat, va_list ap){ - assert( p->nOp>0 || p->aOp==0 ); -- assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ); -+ assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed -+ || p->pParse->nErr>0 ); - if( p->nOp ){ - assert( p->aOp ); - sqlite3DbFree(p->db, p->aOp[p->nOp-1].zComment); -@@ -97872,6 +97873,7 @@ static int codeCompare( - int addr; - CollSeq *p4; - -+ if( pParse->nErr ) return 0; - p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight); - p5 = binaryCompareP5(pLeft, pRight, jumpIfNull); - addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1, -@@ -147627,7 +147629,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ - - pTab = sqlite3DbMallocZero(db, sizeof(Table)); - if( pTab==0 ){ -- return SQLITE_NOMEM; -+ return sqlite3ErrorToParser(db, SQLITE_NOMEM); - } - - p->pSrc = 0; -@@ -147731,6 +147733,10 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ - sqlite3DbFree(db, pTab); - } - -+ if( rc && pParse->nErr==0 ){ -+ assert( pParse->db->mallocFailed ); -+ return sqlite3ErrorToParser(pParse->db, SQLITE_NOMEM); -+ } - return rc; - } - --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch deleted file mode 100644 index ffc2c6a..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19925 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 15:15:40 +0000 -Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the - pathname of the file being inserted is a NULL. Bug discovered by the - Yongheng and Rui fuzzer. - -FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 ---- - shell.c | 1 + - sqlite3.c | 4 ++-- - sqlite3.h | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/shell.c b/shell.c -index 053180c..404a8d4 100644 ---- a/shell.c -+++ b/shell.c -@@ -5827,6 +5827,7 @@ static int zipfileUpdate( - - if( rc==SQLITE_OK ){ - zPath = (const char*)sqlite3_value_text(apVal[2]); -+ if( zPath==0 ) zPath = ""; - nPath = (int)strlen(zPath); - mTime = zipfileGetTime(apVal[4]); - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch deleted file mode 100644 index 92bc790..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch +++ /dev/null @@ -1,31 +0,0 @@ -CVE: CVE-2019-19926 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 22:08:19 +0000 -Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it - is necessary to abort early due to prior errors in sqlite3WindowRewrite(). - -FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 ---- - sqlite3.c | 7 ++++--- - sqlite3.h | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 857c28e..19a474d 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -128427,6 +128427,7 @@ static int multiSelect( - } - #endif - } -+ if( pParse->nErr ) goto multi_select_end; - - /* Compute collating sequences used by - ** temporary tables needed to implement the compound select. --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch deleted file mode 100644 index cba8ec9..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch +++ /dev/null @@ -1,46 +0,0 @@ -CVE: CVE-2019-19959 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Mon, 23 Dec 2019 21:04:33 +0000 -Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that - it is able to deal with goofy filenames that contain embedded zeros. - -FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf ---- - shell.c | 4 ++-- - sqlite3.c | 4 ++-- - sqlite3.h | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/shell.c b/shell.c -index 404a8d4..48065e9 100644 ---- a/shell.c -+++ b/shell.c -@@ -5841,7 +5841,7 @@ static int zipfileUpdate( - zFree = sqlite3_mprintf("%s/", zPath); - if( zFree==0 ){ rc = SQLITE_NOMEM; } - zPath = (const char*)zFree; -- nPath++; -+ nPath = (int)strlen(zPath); - } - } - -@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ - }else{ - if( zName[nName-1]!='/' ){ - zName = zFree = sqlite3_mprintf("%s/", zName); -- nName++; - if( zName==0 ){ - rc = SQLITE_NOMEM; - goto zipfile_step_out; - } -+ nName = (int)strlen(zName); - }else{ - while( nName>1 && zName[nName-2]=='/' ) nName--; - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch deleted file mode 100644 index fb6cd6d..0000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch +++ /dev/null @@ -1,31 +0,0 @@ -CVE: CVE-2019-20218 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 -From: Dan Kennedy -Date: Fri, 27 Dec 2019 20:54:42 +0000 -Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object - following an error. This fixes a separate case to [de6e6d68]. - -FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 ---- - sqlite3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 5bc06c8..408ec4c 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ - - /* Process NATURAL keywords, and ON and USING clauses of joins. - */ -- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ -+ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ - return WRC_Abort; - } - --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb b/meta/recipes-support/sqlite/sqlite3_3.30.1.bb deleted file mode 100644 index e055aca..0000000 --- a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2019-19244.patch \ - file://CVE-2019-19880.patch \ - file://CVE-2019-19923.patch \ - file://CVE-2019-19924.patch \ - file://CVE-2019-19925.patch \ - file://CVE-2019-19926.patch \ - file://CVE-2019-19959.patch \ - file://CVE-2019-20218.patch \ - " -SRC_URI[md5sum] = "51252dc6bc9094ba11ab151ba650ff3c" -SRC_URI[sha256sum] = "8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file mode 100644 index 0000000..903d66a --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -0,0 +1,12 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + " +SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" +SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_WHITELIST += "CVE-2019-19242" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:22 +0000 Subject: [oe-commits] [openembedded-core] 01/13: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.2B844232A0C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 855fbe45899851847b04e798503a70888b4d2281 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:21 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (200e11f -> df9c427) Message-ID: <158091050099.24429.4812275582385959993@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 200e11f Revert "HACK: Intercept broken permissions in build" discard 40324fc patch: Extend to native/nativesdk and depend upon discard 2175169 sqlite3: upgrade 3.30.1 -> 3.31.1 discard 0649254 libxml2: fix CVE-2020-7595 discard 03957e1 ncurses: add CVE_VERSION discard 8b74bdc x264: upgrade to latest revision discard 5f92fd4 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' discard 3b09f6f webkitgtk: Prefer -pthread over -lpthread discard b04b864 mc: Fix manpage date indeterminism discard 436fdc3 HACK: Intercept broken permissions in build discard 8ef7a54 mc: Set zipinfo presence determinstically discard d7c7935 logrotate.py: improve oeqa test implementation discard 0714bd5 musl: Update to latest on master discard ae877d9 netbase: Upgrade to 6.0 discard 9c136e7 baremetal-helloworld: Create recipe for baremetal examples on QEMU discard 3aac5ef fixup discard c9b4c47 oeqa/reproducible: Improve test output and ensure deb+ipk compared discard f566ebd opkg-utils: Fix reproducibility discard 325fc4c sstatesig: Log timestamps for hashequiv in reprodubile builds discard 05ddb80 HACK: signing: Add extra test debug discard 2e41081 glew/curl: specify exclusive package configs discard 1dd7a8d base.bbclass: extend PACKAGECONFIG for conflict package configs discard e78d771 oescripts.py: use unittest.SkipUnless for class skip add b314e9a baremetal-helloworld: Create recipe for baremetal examples on QEMU add cdb4b65 netbase: Upgrade to 6.0 add d4ecf97 musl: Update to latest on master add b939240 logrotate.py: improve oeqa test implementation add 94446ea webkitgtk: Prefer -pthread over -lpthread add 14f34d3 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' add f7cc44c x264: upgrade to latest revision add fdb2a95 ncurses: add CVE_VERSION add f2f7aa9 libxml2: fix CVE-2020-7595 add 621ea68 sqlite3: upgrade 3.30.1 -> 3.31.1 new 855fbe45 oescripts.py: use unittest.SkipUnless for class skip new 3f75418 base.bbclass: extend PACKAGECONFIG for conflict package configs new 5dc1133 glew/curl: specify exclusive package configs new 23b0058 HACK: signing: Add extra test debug new 6f7f9d7 HACK: Intercept broken permissions in build new 574956e Revert "HACK: Intercept broken permissions in build" new ef3817c sstatesig: Log timestamps for hashequiv in reprodubile builds new 4b237f7 opkg-utils: Fix reproducibility issues in opkg-build new a80b85c oeqa/reproducible: Improve test output and ensure deb+ipk compared new 11bf2ad mc: Set zipinfo presence determinstically new 1bcebac mc: Fix manpage date indeterminism new ff5ad43 patch: Extend to native/nativesdk and depend upon new df9c427 xserver-xorg: Fix reproducibility issue This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (200e11f) \ N -- N -- N refs/heads/master-next (df9c427) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../opkg-utils/opkg-utils/fix-reproducibility.patch | 15 +++++++++++++++ meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 2 files changed, 16 insertions(+) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:25 +0000 Subject: [oe-commits] [openembedded-core] 04/13: HACK: signing: Add extra test debug In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.4BE52232A10@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 23b00580f0c49b4fdc760510d2b7bfb86880a124 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:23 +0000 Subject: [oe-commits] [openembedded-core] 02/13: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.353A6232A0D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3f75418e22c073a8af26ed9d1052c790ab5d9371 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:24 +0000 Subject: [oe-commits] [openembedded-core] 03/13: glew/curl: specify exclusive package configs In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.408A3232A0E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5dc1133e1f26a6c41d001e0a7e06e5dc68e4a40a Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:26 +0000 Subject: [oe-commits] [openembedded-core] 05/13: HACK: Intercept broken permissions in build In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.5805A232A13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6f7f9d7d320ad5be6e94476d5b3859183d2093f6 Author: Richard Purdie AuthorDate: Tue Feb 4 18:09:56 2020 +0000 HACK: Intercept broken permissions in build Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..bd5b7c3 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -908,6 +908,8 @@ def package_qa_check_host_user(path, name, d, elf, messages): if path == home or path.startswith(home + os.sep): return + import stat as stat2 + try: stat = os.lstat(path) except OSError as exc: @@ -924,6 +926,9 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/usr/src/debug/tcp-wrappers" in path and "weak_symbols" not in path: + if stat2.S_IMODE(stat.st_mode) & stat2.S_IWUSR: + bb.error("Fatal perms for %s %s" % (path, stat2.S_IMODE(stat.st_mode))) return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:27 +0000 Subject: [oe-commits] [openembedded-core] 06/13: Revert "HACK: Intercept broken permissions in build" In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.642F8232A14@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 574956e84560fc452fc5a781a7630cd625b35fcf Author: Richard Purdie AuthorDate: Tue Feb 4 22:26:52 2020 +0000 Revert "HACK: Intercept broken permissions in build" This reverts commit 436fdc39c6cca54f615b855d90bd84d22f9528b0. --- meta/classes/insane.bbclass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index bd5b7c3..795c7b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -908,8 +908,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if path == home or path.startswith(home + os.sep): return - import stat as stat2 - try: stat = os.lstat(path) except OSError as exc: @@ -926,9 +924,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False - if "/usr/src/debug/tcp-wrappers" in path and "weak_symbols" not in path: - if stat2.S_IMODE(stat.st_mode) & stat2.S_IWUSR: - bb.error("Fatal perms for %s %s" % (path, stat2.S_IMODE(stat.st_mode))) return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:28 +0000 Subject: [oe-commits] [openembedded-core] 07/13: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.71FDF232A15@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ef3817c31c6f0bcc93e6d22da0df2c4a637e1444 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:31 +0000 Subject: [oe-commits] [openembedded-core] 10/13: mc: Set zipinfo presence determinstically In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.AFA0F232A17@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 11bf2ad2b2e0e106dcdf9dc8b2656964f671c2d7 Author: Richard Purdie AuthorDate: Tue Feb 4 13:59:26 2020 +0000 mc: Set zipinfo presence determinstically This value was floating causing differences in generated files. Set it determinstically. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 95fa1da..d8c8f86 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -29,6 +29,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:30 +0000 Subject: [oe-commits] [openembedded-core] 09/13: oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.A2283232A0C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a80b85c2ef818b4b246221b662dbdb851a4a26ca Author: Richard Purdie AuthorDate: Mon Feb 3 23:39:29 2020 +0000 oeqa/reproducible: Improve test output and ensure deb+ipk compared Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f..f6433c9 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:32 +0000 Subject: [oe-commits] [openembedded-core] 11/13: mc: Fix manpage date indeterminism In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.BAE65232A0B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1bcebac4293c19116bdbfaa9d6c5c233f63258dd Author: Richard Purdie AuthorDate: Tue Feb 4 18:12:15 2020 +0000 mc: Fix manpage date indeterminism The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 0000000..48bd73b --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index d8c8f86..ead348b 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:29 +0000 Subject: [oe-commits] [openembedded-core] 08/13: opkg-utils: Fix reproducibility issues in opkg-build In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.8C082232A16@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4b237f706be2e347f7dcc44891704e9f96ccbc08 Author: Richard Purdie AuthorDate: Mon Feb 3 20:39:14 2020 +0000 opkg-utils: Fix reproducibility issues in opkg-build There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. Signed-off-by: Richard Purdie --- .../opkg-utils/fix-reproducibility.patch | 32 ++++++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000..945979b --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 8e7ef00..eda73db 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:34 +0000 Subject: [oe-commits] [openembedded-core] 13/13: xserver-xorg: Fix reproducibility issue In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.D5250232A0E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df9c427cd66eed545707f92ee7cedcfcd106da4e Author: Richard Purdie AuthorDate: Wed Feb 5 10:27:59 2020 +0000 xserver-xorg: Fix reproducibility issue The host kernel version was being encoded into the Xorg binary. Set an appropriate configure option to avoid this and be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0ae65c..14ba6bf 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ + --with-os-name=Linux \ " OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:48:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:48:33 +0000 Subject: [oe-commits] [openembedded-core] 12/13: patch: Extend to native/nativesdk and depend upon In-Reply-To: <158091050099.24429.4812275582385959993@git.openembedded.org> References: <158091050099.24429.4812275582385959993@git.openembedded.org> Message-ID: <20200205134821.C6E3B232A0D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ff5ad432f2d56c1597b7a566e87673443f7de544 Author: Richard Purdie AuthorDate: Tue Feb 4 22:20:35 2020 +0000 patch: Extend to native/nativesdk and depend upon There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1..25ec089 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 95ebda7..aa55cde 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f..b5897b3 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 13:49:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 13:49:02 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: replaced deprecated method warn() with warning() Message-ID: <158091054283.25537.8596761757149231341@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new a14631e replaced deprecated method warn() with warning() a14631e is described below commit a14631e3572300920001bd05b6696897a8369cbf Author: Frazer Clews AuthorDate: Tue Jan 14 14:46:06 2020 +0000 replaced deprecated method warn() with warning() Removed the deprecated methods as it will only cause problems later on, and since warn() just calls warning(), it shouldn't change anything Signed-off-by: Frazer Clews Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 2 +- lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 8407db8..1124332 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1784,7 +1784,7 @@ class CookerCollectFiles(object): # When constructing an older style single regex, it's possible for BBMASK # to end up beginning with '|', which matches and masks _everything_. if mask.startswith("|"): - collectlog.warn("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) + collectlog.warning("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) mask = mask[1:] try: re.compile(mask) diff --git a/lib/toaster/bldcontrol/management/commands/runbuilds.py b/lib/toaster/bldcontrol/management/commands/runbuilds.py index 50ec409..19f659e 100644 --- a/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/lib/toaster/bldcontrol/management/commands/runbuilds.py @@ -168,17 +168,17 @@ class Command(BaseCommand): try: self.cleanup() except Exception as e: - logger.warn("runbuilds: cleanup exception %s" % str(e)) + logger.warning("runbuilds: cleanup exception %s" % str(e)) try: self.archive() except Exception as e: - logger.warn("runbuilds: archive exception %s" % str(e)) + logger.warning("runbuilds: archive exception %s" % str(e)) try: self.schedule() except Exception as e: - logger.warn("runbuilds: schedule exception %s" % str(e)) + logger.warning("runbuilds: schedule exception %s" % str(e)) def handle(self, **options): pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 15:46:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 15:46:46 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: xmlsec1: fix for multilib Message-ID: <158091760692.16550.3873772139426660139@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 924fff4 xmlsec1: fix for multilib 924fff4 is described below commit 924fff467bfd120e14ab22d855923aaab41a2b12 Author: Qi.Chen at windriver.com AuthorDate: Wed Feb 5 00:11:42 2020 -0800 xmlsec1: fix for multilib With previous change of nss/nspr in this recipe, multilib build failure at do_configure. Fix it by not using hardcoded /lib/. Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- .../xmlsec1/0001-nss-nspr-fix-for-multilib.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch new file mode 100644 index 0000000..53c1197 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch @@ -0,0 +1,52 @@ +From 9ed3b4e628f9254d5c86006fe63c33a1eb02aee5 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 4 Feb 2020 23:39:49 -0800 +Subject: [PATCH] nss/nspr: fix for multilib + +Upstream-Status: Pending + +Signed-off-by: Chen Qi +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b46d97d..39f4318 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -920,24 +920,24 @@ fi + dnl Priority 1: User specifies the path to installation + if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then + AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) +- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then +- NSPR_INCLUDE_PATH="$with_nspr/include" +- NSPR_LIB_PATH="$with_nspr/lib" ++ if test -f "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then ++ NSPR_INCLUDE_PATH="$with_nspr/${includedir}" ++ NSPR_LIB_PATH="$with_nspr/${libdir}" + NSPR_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) + fi + fi + if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then + AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) +- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then +- NSS_INCLUDE_PATH="$with_nss/include" +- NSS_LIB_PATH="$with_nss/lib" ++ if test -f "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then ++ NSS_INCLUDE_PATH="$with_nss/${includedir}" ++ NSS_LIB_PATH="$with_nss/${libdir}" + NSS_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) + fi + fi + +-- +2.21.0 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb index 3e25e8d..8fc611a 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://change-finding-path-of-nss.patch \ file://makefile-ptest.patch \ file://xmlsec1-examples-allow-build-in-separate-dir.patch \ + file://0001-nss-nspr-fix-for-multilib.patch \ file://run-ptest \ " @@ -31,7 +32,7 @@ inherit autotools-brokensep ptest pkgconfig PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" PACKAGECONFIG[gnutls] = ",,gnutls" PACKAGECONFIG[libgcrypt] = ",,libgcrypt" -PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/.. --with-nspr=${STAGING_LIBDIR}/..,,nss nspr" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},,nss nspr" PACKAGECONFIG[openssl] = ",,openssl" PACKAGECONFIG[des] = ",--disable-des,," -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 16:44:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 16:44:44 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (924fff4 -> fd2765b) Message-ID: <158092108463.31395.14447040148486497548@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 924fff4 xmlsec1: fix for multilib new 8cda709 python3-matplotlib: provide a -native variant new fd2765b smem: update to v1.5 (python3 compatibility) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...mem-fix-support-for-source-option-python3.patch | 53 ++++++++++++++++++++++ .../smem/{smem_1.4.bb => smem_1.5.bb} | 20 ++++++-- .../python/python3-matplotlib_3.1.1.bb | 2 + 3 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch rename meta-oe/recipes-support/smem/{smem_1.4.bb => smem_1.5.bb} (56%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 16:44:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 16:44:45 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: python3-matplotlib: provide a -native variant In-Reply-To: <158092108463.31395.14447040148486497548@git.openembedded.org> References: <158092108463.31395.14447040148486497548@git.openembedded.org> Message-ID: <20200205164445.03498232A0E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8cda709fb9704660d87b0022430151cf088946b3 Author: Andr? Draszik AuthorDate: Wed Feb 5 16:32:48 2020 +0000 python3-matplotlib: provide a -native variant This is useful e.g. for smem-native. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb index 9b86ccc..824680c 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb @@ -15,3 +15,5 @@ SRC_URI[sha256sum] = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812 PYPI_PACKAGE = "matplotlib" inherit pypi setuptools3 + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 16:44:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 16:44:46 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: smem: update to v1.5 (python3 compatibility) In-Reply-To: <158092108463.31395.14447040148486497548@git.openembedded.org> References: <158092108463.31395.14447040148486497548@git.openembedded.org> Message-ID: <20200205164445.1025F232A10@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fd2765bb16d6a895d3d6d4886add4b8b6a1baa20 Author: Andr? Draszik AuthorDate: Wed Feb 5 16:32:49 2020 +0000 smem: update to v1.5 (python3 compatibility) smem generally works using the upstream code, but the --source argument still throws exceptions - add a patch to resolve those as well. There is no release on the downloads URL, but a tag in mercurial - so this now downloads the snapshot that tag is pointing to. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- ...mem-fix-support-for-source-option-python3.patch | 53 ++++++++++++++++++++++ .../smem/{smem_1.4.bb => smem_1.5.bb} | 20 ++++++-- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch b/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch new file mode 100644 index 0000000..5c1be5a --- /dev/null +++ b/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch @@ -0,0 +1,53 @@ +From 3ff78f1f00973393d1a7ee4e467a2bacf1c807f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Wed, 5 Feb 2020 16:14:21 +0000 +Subject: [PATCH] smem: fix support for --source option (python3) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Using --source doesn't work without this patch: +Traceback (most recent call last): + File "./smem", line 727, in + showpids() + File "./smem", line 299, in showpids + showtable(pt.keys(), fields, columns.split(), options.sort or 'pss') + File "./smem", line 519, in showtable + mt = totalmem() + File "./smem", line 118, in totalmem + _totalmem = memory()['memtotal'] + File "./smem", line 193, in memory + m = f.match(l) +TypeError: cannot use a string pattern on a bytes-like object + +python3's tarfile returns bytes, whereas all of the rest of +the code assumes str. + +Fix the tarfile usage to convert to str before returning the +results. + +Signed-off-by: Andr? Draszik +Upstream-Status: Inappropriate [upstream wants to support python2 & python3] +--- + smem | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/smem b/smem +index 46a3189..54d40dd 100755 +--- a/smem ++++ b/smem +@@ -90,9 +90,9 @@ class tardata(procdata): + d,f = ti.name.split('/') + yield d + def _read(self, f): +- return self.tar.extractfile(f).read() ++ return self.tar.extractfile(f).read().decode() + def _readlines(self, f): +- return self.tar.extractfile(f).readlines() ++ return [l.decode() for l in self.tar.extractfile(f).readlines()] + def piduser(self, p): + t = self.tar.getmember("%d" % p) + if t.uname: +-- +2.23.0.rc1 + diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.5.bb similarity index 56% rename from meta-oe/recipes-support/smem/smem_1.4.bb rename to meta-oe/recipes-support/smem/smem_1.5.bb index 947c47b..90db9c3 100644 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ b/meta-oe/recipes-support/smem/smem_1.5.bb @@ -9,9 +9,16 @@ SECTION = "Applications/System" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "http://www.selenic.com/${BPN}/download/${BP}.tar.gz" -SRC_URI[md5sum] = "fe79435c3930389bfdb560255c802162" -SRC_URI[sha256sum] = "2ea9f878f4cf3c276774c3f7e2a41977a1f2d64f98d2dcb6a15f1f3d84df61ec" +HG_CHANGESET = "98273ce331bb" +SRC_URI = "https://selenic.com/repo/${BPN}/archive/${HG_CHANGESET}.tar.bz2;downloadfilename=${BP}.tar.bz2 \ + file://0001-smem-fix-support-for-source-option-python3.patch" +SRC_URI[md5sum] = "51c3989779360f42b42ef46b2831be3a" +SRC_URI[sha256sum] = "161131c686a6d9962a0e96912526dd46308e022d62e3f8acaed5a56fda8e08ce" + +UPSTREAM_CHECK_URI = "https://selenic.com/repo/smem/tags" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/${BPN}-${HG_CHANGESET}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap @@ -21,12 +28,15 @@ do_install() { install -d ${D}/${bindir}/ install -d ${D}/${mandir}/man8 install -m 0755 ${S}/smem ${D}${bindir}/ + sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' ${D}${bindir}/smem install -m 0755 ${S}/smemcap ${D}${bindir}/ install -m 0644 ${S}/smem.8 ${D}/${mandir}/man8/ } -RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codecs" -PACKAGES =+ "smemcap" +RDEPENDS_${PN} = "python3-core python3-compression" +RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy" + +PACKAGE_BEFORE_PN = "smemcap" FILES_smemcap = "${bindir}/smemcap" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 20:15:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 20:15:28 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (3eaed6f -> fd2765b) Message-ID: <158093372853.27115.17925126573787162623@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from 3eaed6f recipes: Inherit perlnative for pod2man add 9cc9bd0 hiawatha: upgrade 10.7 -> 10.10 add 80514e1 libwebsockets: upgrade 3.2.0 -> 3.2.2 add 5af9b2a vlc: Link with libatomic on rv64 add 14e92f2 nng: Add recipe add d2e570b python3-imageio: add a new package. add 2baea2b phoronix-test-suite: change python to python3-core in RDEPENDS add 392484a fio: Add support for PMDK engines add 23d4351 smem: add a native variant add 0f80083 lftp: upgrade 4.9.0 -> 4.9.1 add 27f9b33 cpuid: Upgrade to 20200203 and use perlnative for pod2man add e44ff41 iwd: Update to 1.4 add e2bf7b5 iwd: Add PACKAGECONFIG options add 3db4cc7 iwd: Use manpages class to control documentation add 68aa2ea iwd: Update formatting add 924fff4 xmlsec1: fix for multilib add 8cda709 python3-matplotlib: provide a -native variant add fd2765b smem: update to v1.5 (python3 compatibility) No new revisions were added by this update. Summary of changes: .../recipes-multimedia/vlc/vlc_3.0.8.bb | 2 + .../lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} | 4 +- .../recipes-connectivity/nanomsg/nng_1.2.5.bb | 21 ++++++++ meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + .../phoronix-test-suite_9.2.1.bb | 2 +- ...-Avoid-redirection-of-input-and-output-fi.patch | 12 ++--- .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ++++++++++++++++++++++ meta-oe/recipes-connectivity/iwd/iwd_1.0.bb | 39 -------------- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 58 ++++++++++++++++++++ ...bwebsockets_3.2.0.bb => libwebsockets_3.2.2.bb} | 2 +- .../cpuid/{cpuid_20180519.bb => cpuid_20200203.bb} | 6 ++- ...mem-fix-support-for-source-option-python3.patch | 53 ++++++++++++++++++ .../smem/{smem_1.4.bb => smem_1.5.bb} | 22 ++++++-- .../xmlsec1/0001-nss-nspr-fix-for-multilib.patch | 52 ++++++++++++++++++ meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb | 3 +- .../python/python3-imageio_2.6.0.bb | 14 +++++ .../python/python3-matplotlib_3.1.1.bb | 2 + .../{hiawatha_10.7.bb => hiawatha_10.10.bb} | 4 +- 18 files changed, 299 insertions(+), 60 deletions(-) rename meta-networking/recipes-connectivity/lftp/{lftp_4.9.0.bb => lftp_4.9.1.bb} (89%) create mode 100644 meta-networking/recipes-connectivity/nanomsg/nng_1.2.5.bb create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.0.bb create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.4.bb rename meta-oe/recipes-connectivity/libwebsockets/{libwebsockets_3.2.0.bb => libwebsockets_3.2.2.bb} (95%) rename meta-oe/recipes-devtools/cpuid/{cpuid_20180519.bb => cpuid_20200203.bb} (83%) create mode 100644 meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch rename meta-oe/recipes-support/smem/{smem_1.4.bb => smem_1.5.bb} (54%) create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch create mode 100644 meta-python/recipes-devtools/python/python3-imageio_2.6.0.bb rename meta-webserver/recipes-httpd/hiawatha/{hiawatha_10.7.bb => hiawatha_10.10.bb} (94%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:17 +0000 Subject: [oe-commits] [openembedded-core] 01/19: tar: Fix build determinism, disable rsh In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235616.C938A232A13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 138d3bf2106759ed62661f802ebd543930a662be Author: Richard Purdie AuthorDate: Wed Feb 5 15:37:19 2020 +0000 tar: Fix build determinism, disable rsh rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. Signed-off-by: Richard Purdie --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5..ebe6cb0 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:18 +0000 Subject: [oe-commits] [openembedded-core] 02/19: libidn2: Fix reproducibility issue In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235616.D6E10232A14@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5dbca3d263d8d1d27c7709ad4adb764758db52d1 Author: Richard Purdie AuthorDate: Wed Feb 5 15:55:16 2020 +0000 libidn2: Fix reproducibility issue The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] Signed-off-by: Richard Purdie --- meta/recipes-extended/libidn/libidn2_2.3.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.3.0.bb b/meta/recipes-extended/libidn/libidn2_2.3.0.bb index 8e7e6c0..7adf924 100644 --- a/meta/recipes-extended/libidn/libidn2_2.3.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.3.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:19 +0000 Subject: [oe-commits] [openembedded-core] 03/19: gtk+3: sort resources for reproducible binaries In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235616.E1FC2232A15@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f599b294b52dcb84005d07051d8edf0706b89b6e Author: Ross Burton AuthorDate: Wed Feb 5 17:32:01 2020 +0000 gtk+3: sort resources for reproducible binaries The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | 1 + 2 files changed, 20 insertions(+) diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 0000000..7f87372 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb index 18976b5..025d887 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:16 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (df9c427 -> b20f324) Message-ID: <158094697650.20004.18279504235203029663@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from df9c427 xserver-xorg: Fix reproducibility issue new 138d3bf tar: Fix build determinism, disable rsh new 5dbca3d libidn2: Fix reproducibility issue new f599b29 gtk+3: sort resources for reproducible binaries new a02a1ce HACK: Attempt to find perl contamination new 18e3f11 perl: Fix repro issues (partial) new 674d5e9 kern-tools: tweak symbol_why to be python safe new 2ea5da9 kern-tools: integrate merge_config fix for gold linker new 7464ee1 kern-tools-native: use more common S value and oe_runmake new c00b6c7 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass new ab3baa8 kernel-yocto: Drop setting of unused variables in do_kernel_metadata new 862eee7 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set new c9e7bbf kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh new 0663452 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created new f8de8d4 kernel-yocto: fix defconfig detection in find_sccs() new a25caea microblaze tune: change microblazeeb to microblaze new 5ae9fa4 microblaze tune: Allow no version to be set new c8e312d microblaze tune: Enable 64-bit new 04c44cc microblaze tune: cleanup += new b20f324 Microblaze: Adjust Linux items from microblazeeb to microblaze The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 9 +++++ meta/classes/kernel-yocto.bbclass | 43 +++++++++++++++------- meta/classes/meson.bbclass | 2 +- meta/classes/siteinfo.bbclass | 3 -- .../machine/include/microblaze/arch-microblaze.inc | 35 +++++++++++------- .../include/microblaze/feature-microblaze-math.inc | 12 +++--- .../microblaze/feature-microblaze-versions.inc | 4 +- meta/lib/oe/elf.py | 3 -- meta/recipes-devtools/perl/files/fix.patch | 27 ++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + .../{microblazeeb => microblaze}/objarch.h | 0 meta/recipes-extended/libidn/libidn2_2.3.0.bb | 3 +- meta/recipes-extended/tar/tar_1.32.bb | 2 + meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 ++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | 1 + .../kern-tools/kern-tools-native_git.bb | 13 ++++--- meta/recipes-kernel/linux/linux-yocto.inc | 21 ----------- 17 files changed, 129 insertions(+), 69 deletions(-) create mode 100644 meta/recipes-devtools/perl/files/fix.patch rename meta/recipes-extended/ghostscript/ghostscript/{microblazeeb => microblaze}/objarch.h (100%) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:20 +0000 Subject: [oe-commits] [openembedded-core] 04/19: HACK: Attempt to find perl contamination In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235616.EF666232A16@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a02a1ce31f770573bd7930859af0304de6e02895 Author: Richard Purdie AuthorDate: Wed Feb 5 23:47:36 2020 +0000 HACK: Attempt to find perl contamination Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..bf1e267 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,6 +924,15 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/x86_64-linux/CORE/config.h" in path: + with open(path, "r") as f: + lines = f.readlines() + for l in lines: + if "SIG_SIZE" in l and "36" in l: + bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) + if "I_XLOCALE" in l and l.startswith("#define"): + bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) + return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:21 +0000 Subject: [oe-commits] [openembedded-core] 05/19: perl: Fix repro issues (partial) In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.0B3F9232A17@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 18e3f11d19bf5c8fcd394b9649f3f36adb848614 Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix repro issues (partial) Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/fix.patch | 27 +++++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-devtools/perl/files/fix.patch b/meta/recipes-devtools/perl/files/fix.patch new file mode 100644 index 0000000..ef9d36b --- /dev/null +++ b/meta/recipes-devtools/perl/files/fix.patch @@ -0,0 +1,27 @@ + +Index: perl-5.30.1/cnf/configure_attr.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_attr.sh ++++ perl-5.30.1/cnf/configure_attr.sh +@@ -131,7 +131,7 @@ if not hinted d_c99_variadic_macros 'sup + try_start + try_add '#include ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 3634122..d4b6bb3 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://fix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:22 +0000 Subject: [oe-commits] [openembedded-core] 06/19: kern-tools: tweak symbol_why to be python safe In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.1BD5D232A18@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 674d5e99cd927a25be69d2fd132e24d594610caa Author: Bruce Ashfield AuthorDate: Wed Feb 5 18:12:42 2020 -0500 kern-tools: tweak symbol_why to be python safe Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6f..57ec1ab 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:23 +0000 Subject: [oe-commits] [openembedded-core] 07/19: kern-tools: integrate merge_config fix for gold linker In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.272E6232A19@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ea5da95377248a6e705c81a4dd65aadf5b50dbe Author: Bruce Ashfield AuthorDate: Wed Feb 5 18:12:43 2020 -0500 kern-tools: integrate merge_config fix for gold linker Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1ab..3f9cfe7 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:24 +0000 Subject: [oe-commits] [openembedded-core] 08/19: kern-tools-native: use more common S value and oe_runmake In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.32E04232A1A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7464ee19fa9c397bdc24cf453d02cfd24fe6c2ef Author: Martin Jansa AuthorDate: Wed Feb 5 18:12:44 2020 -0500 kern-tools-native: use more common S value and oe_runmake Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7..f263421 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:26 +0000 Subject: [oe-commits] [openembedded-core] 10/19: kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.518A6232A1C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ab3baa8681807a1dce1dab0a99cd8e8e45997b53 Author: Paul Barker AuthorDate: Wed Feb 5 18:12:46 2020 -0500 kernel-yocto: Drop setting of unused variables in do_kernel_metadata The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6..9a4d286 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:27 +0000 Subject: [oe-commits] [openembedded-core] 11/19: kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.6262E232A13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 862eee72b4552e4afb74a0b21f0f1f58873ecab8 Author: Paul Barker AuthorDate: Wed Feb 5 18:12:47 2020 -0500 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d286..e8a9b1f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:29 +0000 Subject: [oe-commits] [openembedded-core] 13/19: kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.7C931232A10@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0663452e45a8d642f67c7799ae2494d31af46ffd Author: Martin Jansa AuthorDate: Wed Feb 5 18:12:49 2020 -0500 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d..d961901 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:25 +0000 Subject: [oe-commits] [openembedded-core] 09/19: kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.3FB94232A1B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c00b6c706bdb51a0ab74207c32608e3a9155d669 Author: Paul Barker AuthorDate: Wed Feb 5 18:12:45 2020 -0500 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeaf..a0362f6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946..91df9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:28 +0000 Subject: [oe-commits] [openembedded-core] 12/19: kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.6F792232A14@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c9e7bbffb11ce7ee4e2cc6fbec4ba922c5443bc3 Author: Martin Jansa AuthorDate: Wed Feb 5 18:12:48 2020 -0500 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', ' [...] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-compo [...] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f..f71aa7d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:30 +0000 Subject: [oe-commits] [openembedded-core] 14/19: kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.88CAA232A15@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f8de8d4f2ddb0c8a59a0f5c44a5537c009c357e8 Author: Gavin Li AuthorDate: Wed Feb 5 18:12:50 2020 -0500 kernel-yocto: fix defconfig detection in find_sccs() The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901..918d101 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:31 +0000 Subject: [oe-commits] [openembedded-core] 15/19: microblaze tune: change microblazeeb to microblaze In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.997CC232A16@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a25caea92dcbb89b91009688499647eeb1f85a75 Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:26 2020 -0600 microblaze tune: change microblazeeb to microblaze Using microblazeeb breaks a number of autoconf recipes, including newlib components. 'microblaze' is defined as the big-endian version, while microblazeel is defined as the little-endian version. config.sub: 2018-07-03 ... | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ ... | microblaze-* | microblazeel-* \ ... microblaze*) basic_machine=microblaze-xilinx ... Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/microblaze/arch-microblaze.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index eab7171..89e9484 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -45,8 +45,8 @@ MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", require conf/machine/include/microblaze/feature-microblaze-versions.inc require conf/machine/include/microblaze/feature-microblaze-math.inc -# Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" +# Architecture name, either 'microblaze' or 'microblazeel' depending on endianess +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" # Package Architecture formatting TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:33 +0000 Subject: [oe-commits] [openembedded-core] 17/19: microblaze tune: Enable 64-bit In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.B21CE232A1F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c8e312d6d423b9c1616b1b3ea73f1df236a5756d Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:28 2020 -0600 microblaze tune: Enable 64-bit 64-bit is not yet available in Linux, but some non-Linux uses exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/microblaze/arch-microblaze.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index 89e9484..0349caa 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -4,6 +4,11 @@ TUNEVALID[microblaze] = "MicroBlaze" MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" +# 64-bit +TUNEVALID[64-bit] = "64-bit MicroBlaze" +TUNECONFLICTS[64-bit] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" + # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" TUNECONFLICTS[bigendian] += "v10.0" @@ -26,6 +31,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ @@ -48,6 +54,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc # Architecture name, either 'microblaze' or 'microblazeel' depending on endianess TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" +# Add 64-bit to the PKGARCH if enabled. +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" + # Package Architecture formatting -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:32 +0000 Subject: [oe-commits] [openembedded-core] 16/19: microblaze tune: Allow no version to be set In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.A5189232A1E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5ae9fa40c2b5c2ab509eca52e09b5b864068051c Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:27 2020 -0600 microblaze tune: Allow no version to be set We want to allow no version to be configured. This should use the GCC default which is the latest defined version, currently 11.0. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/microblaze/feature-microblaze-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc index 3221e2a..5c37f49 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" # Version flags -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}" -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}" +TUNE_CCARGS += "${@'-mcpu=%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}" +MBPKGARCH_VERSION = "${@'-%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:34 +0000 Subject: [oe-commits] [openembedded-core] 18/19: microblaze tune: cleanup += In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.BF1DF232A20@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 04c44cc2bc4000af60eaf0592061e279b7986fad Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:29 2020 -0600 microblaze tune: cleanup += Various += were used, refactor these to be either = or .= depending on usuage. CONFLICTS should be '=', as no leading space is required and they are not amending any other conflict settings. The TUNE_CCARGS should be .= so that if the feature does not define a CCARG blank spaces are not added to the CFLAGS. This is consistent to how the arm tuning is implemented. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- .../machine/include/microblaze/arch-microblaze.inc | 22 +++++++++++----------- .../include/microblaze/feature-microblaze-math.inc | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index 0349caa..4f58076 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -11,34 +11,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" -TUNECONFLICTS[bigendian] += "v10.0" +TUNECONFLICTS[bigendian] = "v10.0" MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" # General features TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" TUNEVALID[reorder] = "Enable Reorder Instructions" -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" # Core configuration tune optimizations TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" # Feature compiler args -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ bb.utils.contains("TUNE_FEATURES", "v8.30", \ bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ - "-mxl-reorder", "-mno-xl-reorder", d), \ - "-mxl-reorder", d), "-mno-xl-reorder", d)}" + " -mxl-reorder", " -mno-xl-reorder", d), \ + " -mxl-reorder", d), " -mno-xl-reorder", d)}" # Feature package architecture formatting MBPKGARCH_TUNE = "" diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc index a315166..cba0ae6 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" # Compiler args -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" # Set target fpu (bitbake known target) to soft or hard (basic or extended) TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 5 23:56:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Feb 2020 23:56:35 +0000 Subject: [oe-commits] [openembedded-core] 19/19: Microblaze: Adjust Linux items from microblazeeb to microblaze In-Reply-To: <158094697650.20004.18279504235203029663@git.openembedded.org> References: <158094697650.20004.18279504235203029663@git.openembedded.org> Message-ID: <20200205235617.D45EE232A17@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b20f3244f3f6b7f8edbe56a00675c3b1bb734cfe Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:30 2020 -0600 Microblaze: Adjust Linux items from microblazeeb to microblaze Due to recent changes to the tune, in order to match config.guess, the name of the big-endian microblaze architecture was changes to 'microblaze'. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 2 +- meta/classes/siteinfo.bbclass | 3 --- meta/lib/oe/elf.py | 3 --- .../ghostscript/ghostscript/{microblazeeb => microblaze}/objarch.h | 0 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 001602b..06034e8 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -57,7 +57,7 @@ def meson_cpu_family(var, d): return 'mips64' elif re.match(r"i[3-6]86", arch): return "x86" - elif arch == "microblazeel" or arch == "microblazeeb": + elif arch == "microblazeel": return "microblaze" else: return arch diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index d62aaac..1a048c0 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -35,7 +35,6 @@ def siteinfo_data_for_machine(arch, os, d): "lm32": "endian-big bit-32", "m68k": "endian-big bit-32", "microblaze": "endian-big bit-32 microblaze-common", - "microblazeeb": "endian-big bit-32 microblaze-common", "microblazeel": "endian-little bit-32 microblaze-common", "mips": "endian-big bit-32 mips-common", "mips64": "endian-big bit-64 mips-common", @@ -89,8 +88,6 @@ def siteinfo_data_for_machine(arch, os, d): "arm-linux-musleabi": "arm-linux", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-musleabi": "armeb-linux", - "microblazeeb-linux" : "microblaze-linux", - "microblazeeb-linux-musl" : "microblaze-linux", "microblazeel-linux" : "microblaze-linux", "microblazeel-linux-musl" : "microblaze-linux", "mips-linux-musl": "mips-linux", diff --git a/meta/lib/oe/elf.py b/meta/lib/oe/elf.py index 2ed614f..df0a459 100644 --- a/meta/lib/oe/elf.py +++ b/meta/lib/oe/elf.py @@ -22,7 +22,6 @@ def machine_dict(d): "mips": ( 8, 0, 0, False, 32), "mipsel": ( 8, 0, 0, True, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "powerpc": (20, 0, 0, False, 32), "riscv32": (243, 0, 0, True, 32), @@ -60,7 +59,6 @@ def machine_dict(d): "sh4": (42, 0, 0, True, 32), "sparc": ( 2, 0, 0, False, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), }, "linux-musl" : { @@ -81,7 +79,6 @@ def machine_dict(d): "mips64": ( 8, 0, 0, False, 64), "mips64el": ( 8, 0, 0, True, 64), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "riscv32": (243, 0, 0, True, 32), "riscv64": (243, 0, 0, True, 64), diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h similarity index 100% rename from meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h rename to meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:52 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (621ea68 -> 6f6a6bb) Message-ID: <158099141273.7059.15622243269157364071@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 621ea68 sqlite3: upgrade 3.30.1 -> 3.31.1 new a9b8287 opkg-utils: Fix reproducibility issues in opkg-build new 6e2e048 oeqa/reproducible: Improve test output and ensure deb+ipk compared new 11d7a9e mc: Set zipinfo presence determinstically new 5553c20 mc: Fix manpage date indeterminism new 5ed0840 patch: Extend to native/nativesdk and depend upon new 39e25b0 xserver-xorg: Fix reproducibility issue new d14a4b0 tar: Fix build determinism, disable rsh new 0392fcb libidn2: Fix reproducibility issue new f3675be gtk+3: sort resources for reproducible binaries new c052b0c microblaze tune: change microblazeeb to microblaze new 0d1551d microblaze tune: Allow no version to be set new 389691b microblaze tune: Enable 64-bit new 78c3885 microblaze tune: cleanup += new 6f6a6bb microblaze: Adjust Linux items from microblazeeb to microblaze The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/meson.bbclass | 2 +- meta/classes/patch.bbclass | 7 +++++ meta/classes/siteinfo.bbclass | 3 -- .../machine/include/microblaze/arch-microblaze.inc | 35 ++++++++++++++-------- .../include/microblaze/feature-microblaze-math.inc | 12 ++++---- .../microblaze/feature-microblaze-versions.inc | 4 +-- meta/lib/oe/elf.py | 3 -- meta/lib/oeqa/selftest/cases/reproducible.py | 9 ++++-- meta/recipes-core/meta/buildtools-tarball.bb | 1 + .../opkg-utils/fix-reproducibility.patch | 32 ++++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 ++ .../{microblazeeb => microblaze}/objarch.h | 0 meta/recipes-extended/libidn/libidn2_2.3.0.bb | 3 +- meta/recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 2 ++ meta/recipes-extended/tar/tar_1.32.bb | 2 ++ meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 ++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | 1 + .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 20 files changed, 130 insertions(+), 31 deletions(-) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch rename meta/recipes-extended/ghostscript/ghostscript/{microblazeeb => microblaze}/objarch.h (100%) create mode 100644 meta/recipes-extended/mc/files/nomandate.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:54 +0000 Subject: [oe-commits] [openembedded-core] 02/14: oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.139B1232A19@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6e2e0480852177db75a6108d77c99c92c4e9950f Author: Richard Purdie AuthorDate: Mon Feb 3 23:39:29 2020 +0000 oeqa/reproducible: Improve test output and ensure deb+ipk compared Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f..f6433c9 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:55 +0000 Subject: [oe-commits] [openembedded-core] 03/14: mc: Set zipinfo presence determinstically In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.1B9A5232A1A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 11d7a9e37c1d3fc21396a98fefc9d34c0b9e784b Author: Richard Purdie AuthorDate: Tue Feb 4 13:59:26 2020 +0000 mc: Set zipinfo presence determinstically This value was floating causing differences in generated files. Set it determinstically. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 95fa1da..d8c8f86 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -29,6 +29,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:56 +0000 Subject: [oe-commits] [openembedded-core] 04/14: mc: Fix manpage date indeterminism In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.23CEE232A1B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5553c20f9fa4f35bf711b6b9d5717dcf4bfefafa Author: Richard Purdie AuthorDate: Tue Feb 4 18:12:15 2020 +0000 mc: Fix manpage date indeterminism The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 0000000..48bd73b --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index d8c8f86..ead348b 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:53 +0000 Subject: [oe-commits] [openembedded-core] 01/14: opkg-utils: Fix reproducibility issues in opkg-build In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.09E25232A18@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a9b8287984c63420e10329a69f7ac5125f1687f8 Author: Richard Purdie AuthorDate: Mon Feb 3 20:39:14 2020 +0000 opkg-utils: Fix reproducibility issues in opkg-build There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. Signed-off-by: Richard Purdie --- .../opkg-utils/fix-reproducibility.patch | 32 ++++++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000..945979b --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 8e7ef00..eda73db 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:58 +0000 Subject: [oe-commits] [openembedded-core] 06/14: xserver-xorg: Fix reproducibility issue In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.37714232A1E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 39e25b045231385c1e2a442fde2c5d4ee07640a8 Author: Richard Purdie AuthorDate: Wed Feb 5 10:27:59 2020 +0000 xserver-xorg: Fix reproducibility issue The host kernel version was being encoded into the Xorg binary. Set an appropriate configure option to avoid this and be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0ae65c..14ba6bf 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ + --with-os-name=Linux \ " OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:59 +0000 Subject: [oe-commits] [openembedded-core] 07/14: tar: Fix build determinism, disable rsh In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.41933232A1F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d14a4b0db92a9a7d1ff72a2e0faca7f1a23a0b68 Author: Richard Purdie AuthorDate: Wed Feb 5 15:37:19 2020 +0000 tar: Fix build determinism, disable rsh rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. Signed-off-by: Richard Purdie --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5..ebe6cb0 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:00 +0000 Subject: [oe-commits] [openembedded-core] 08/14: libidn2: Fix reproducibility issue In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.49CFC232A20@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0392fcbdc85180581ce7392212808ebb822cc2e8 Author: Richard Purdie AuthorDate: Wed Feb 5 15:55:16 2020 +0000 libidn2: Fix reproducibility issue The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] Signed-off-by: Richard Purdie --- meta/recipes-extended/libidn/libidn2_2.3.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.3.0.bb b/meta/recipes-extended/libidn/libidn2_2.3.0.bb index 8e7e6c0..7adf924 100644 --- a/meta/recipes-extended/libidn/libidn2_2.3.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.3.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:01 +0000 Subject: [oe-commits] [openembedded-core] 09/14: gtk+3: sort resources for reproducible binaries In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.530BD232A21@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f3675be6be29426688187a135221431a0941d007 Author: Ross Burton AuthorDate: Wed Feb 5 17:32:01 2020 +0000 gtk+3: sort resources for reproducible binaries The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | 1 + 2 files changed, 20 insertions(+) diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 0000000..7f87372 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb index 18976b5..025d887 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:02 +0000 Subject: [oe-commits] [openembedded-core] 10/14: microblaze tune: change microblazeeb to microblaze In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.5BCE6232A22@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c052b0c984b28d64527a66ea8e2936ca28b9406f Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:26 2020 -0600 microblaze tune: change microblazeeb to microblaze Using microblazeeb breaks a number of autoconf recipes, including newlib components. 'microblaze' is defined as the big-endian version, while microblazeel is defined as the little-endian version. config.sub: 2018-07-03 ... | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ ... | microblaze-* | microblazeel-* \ ... microblaze*) basic_machine=microblaze-xilinx ... Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/microblaze/arch-microblaze.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index eab7171..89e9484 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -45,8 +45,8 @@ MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", require conf/machine/include/microblaze/feature-microblaze-versions.inc require conf/machine/include/microblaze/feature-microblaze-math.inc -# Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" +# Architecture name, either 'microblaze' or 'microblazeel' depending on endianess +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" # Package Architecture formatting TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:16:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:16:57 +0000 Subject: [oe-commits] [openembedded-core] 05/14: patch: Extend to native/nativesdk and depend upon In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.2D4FA232A1C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5ed0840c93804488cd1c1aba6cb382b2434714a5 Author: Richard Purdie AuthorDate: Tue Feb 4 22:20:35 2020 +0000 patch: Extend to native/nativesdk and depend upon There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1..25ec089 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 95ebda7..aa55cde 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f..b5897b3 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:03 +0000 Subject: [oe-commits] [openembedded-core] 11/14: microblaze tune: Allow no version to be set In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.643A6232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0d1551dcc169f2d8dbfbe01b4f1f0ae3ce4770ed Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:27 2020 -0600 microblaze tune: Allow no version to be set We want to allow no version to be configured. This should use the GCC default which is the latest defined version, currently 11.0. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/microblaze/feature-microblaze-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc index 3221e2a..5c37f49 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" # Version flags -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}" -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}" +TUNE_CCARGS += "${@'-mcpu=%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}" +MBPKGARCH_VERSION = "${@'-%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:04 +0000 Subject: [oe-commits] [openembedded-core] 12/14: microblaze tune: Enable 64-bit In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.6C56D232A24@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 389691be34b79da1fafa8df2e6369e7771406cc2 Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:28 2020 -0600 microblaze tune: Enable 64-bit 64-bit is not yet available in Linux, but some non-Linux uses exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/microblaze/arch-microblaze.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index 89e9484..0349caa 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -4,6 +4,11 @@ TUNEVALID[microblaze] = "MicroBlaze" MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" +# 64-bit +TUNEVALID[64-bit] = "64-bit MicroBlaze" +TUNECONFLICTS[64-bit] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" + # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" TUNECONFLICTS[bigendian] += "v10.0" @@ -26,6 +31,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ @@ -48,6 +54,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc # Architecture name, either 'microblaze' or 'microblazeel' depending on endianess TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" +# Add 64-bit to the PKGARCH if enabled. +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" + # Package Architecture formatting -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:05 +0000 Subject: [oe-commits] [openembedded-core] 13/14: microblaze tune: cleanup += In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.7436E232A25@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 78c38857486d3107ecd95d0ceefabcf5152c3928 Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:29 2020 -0600 microblaze tune: cleanup += Various += were used, refactor these to be either = or .= depending on usuage. CONFLICTS should be '=', as no leading space is required and they are not amending any other conflict settings. The TUNE_CCARGS should be .= so that if the feature does not define a CCARG blank spaces are not added to the CFLAGS. This is consistent to how the arm tuning is implemented. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- .../machine/include/microblaze/arch-microblaze.inc | 22 +++++++++++----------- .../include/microblaze/feature-microblaze-math.inc | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index 0349caa..4f58076 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -11,34 +11,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" -TUNECONFLICTS[bigendian] += "v10.0" +TUNECONFLICTS[bigendian] = "v10.0" MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" # General features TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" TUNEVALID[reorder] = "Enable Reorder Instructions" -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" # Core configuration tune optimizations TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" # Feature compiler args -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ bb.utils.contains("TUNE_FEATURES", "v8.30", \ bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ - "-mxl-reorder", "-mno-xl-reorder", d), \ - "-mxl-reorder", d), "-mno-xl-reorder", d)}" + " -mxl-reorder", " -mno-xl-reorder", d), \ + " -mxl-reorder", d), " -mno-xl-reorder", d)}" # Feature package architecture formatting MBPKGARCH_TUNE = "" diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc index a315166..cba0ae6 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" # Compiler args -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" # Set target fpu (bitbake known target) to soft or hard (basic or extended) TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:17:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:17:06 +0000 Subject: [oe-commits] [openembedded-core] 14/14: microblaze: Adjust Linux items from microblazeeb to microblaze In-Reply-To: <158099141273.7059.15622243269157364071@git.openembedded.org> References: <158099141273.7059.15622243269157364071@git.openembedded.org> Message-ID: <20200206121653.7CE47232A26@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6f6a6bbac684ead3fe6d070d61f17c2f611a2c87 Author: Mark Hatle AuthorDate: Tue Feb 4 15:06:30 2020 -0600 microblaze: Adjust Linux items from microblazeeb to microblaze Due to recent changes to the tune, in order to match config.guess, the name of the big-endian microblaze architecture was changes to 'microblaze'. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 2 +- meta/classes/siteinfo.bbclass | 3 --- meta/lib/oe/elf.py | 3 --- .../ghostscript/ghostscript/{microblazeeb => microblaze}/objarch.h | 0 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 001602b..06034e8 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -57,7 +57,7 @@ def meson_cpu_family(var, d): return 'mips64' elif re.match(r"i[3-6]86", arch): return "x86" - elif arch == "microblazeel" or arch == "microblazeeb": + elif arch == "microblazeel": return "microblaze" else: return arch diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index d62aaac..1a048c0 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -35,7 +35,6 @@ def siteinfo_data_for_machine(arch, os, d): "lm32": "endian-big bit-32", "m68k": "endian-big bit-32", "microblaze": "endian-big bit-32 microblaze-common", - "microblazeeb": "endian-big bit-32 microblaze-common", "microblazeel": "endian-little bit-32 microblaze-common", "mips": "endian-big bit-32 mips-common", "mips64": "endian-big bit-64 mips-common", @@ -89,8 +88,6 @@ def siteinfo_data_for_machine(arch, os, d): "arm-linux-musleabi": "arm-linux", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-musleabi": "armeb-linux", - "microblazeeb-linux" : "microblaze-linux", - "microblazeeb-linux-musl" : "microblaze-linux", "microblazeel-linux" : "microblaze-linux", "microblazeel-linux-musl" : "microblaze-linux", "mips-linux-musl": "mips-linux", diff --git a/meta/lib/oe/elf.py b/meta/lib/oe/elf.py index 2ed614f..df0a459 100644 --- a/meta/lib/oe/elf.py +++ b/meta/lib/oe/elf.py @@ -22,7 +22,6 @@ def machine_dict(d): "mips": ( 8, 0, 0, False, 32), "mipsel": ( 8, 0, 0, True, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "powerpc": (20, 0, 0, False, 32), "riscv32": (243, 0, 0, True, 32), @@ -60,7 +59,6 @@ def machine_dict(d): "sh4": (42, 0, 0, True, 32), "sparc": ( 2, 0, 0, False, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), }, "linux-musl" : { @@ -81,7 +79,6 @@ def machine_dict(d): "mips64": ( 8, 0, 0, False, 64), "mips64el": ( 8, 0, 0, True, 64), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "riscv32": (243, 0, 0, True, 32), "riscv64": (243, 0, 0, True, 64), diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h similarity index 100% rename from meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h rename to meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:54 +0000 Subject: [oe-commits] [openembedded-core] 01/09: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122353.EC93D232A1A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a2417e3fd548411da554e842619a5cf61245783a Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:53 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b20f324 -> f3add88) Message-ID: <158099183380.9189.141473297718087237@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard b20f324 Microblaze: Adjust Linux items from microblazeeb to microblaze discard 04c44cc microblaze tune: cleanup += discard c8e312d microblaze tune: Enable 64-bit discard 5ae9fa4 microblaze tune: Allow no version to be set discard a25caea microblaze tune: change microblazeeb to microblaze discard f8de8d4 kernel-yocto: fix defconfig detection in find_sccs() discard 0663452 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created discard c9e7bbf kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh discard 862eee7 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set discard ab3baa8 kernel-yocto: Drop setting of unused variables in do_kernel_metadata discard c00b6c7 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass discard 7464ee1 kern-tools-native: use more common S value and oe_runmake discard 2ea5da9 kern-tools: integrate merge_config fix for gold linker discard 674d5e9 kern-tools: tweak symbol_why to be python safe discard 18e3f11 perl: Fix repro issues (partial) discard a02a1ce HACK: Attempt to find perl contamination discard f599b29 gtk+3: sort resources for reproducible binaries discard 5dbca3d libidn2: Fix reproducibility issue discard 138d3bf tar: Fix build determinism, disable rsh discard df9c427 xserver-xorg: Fix reproducibility issue discard ff5ad43 patch: Extend to native/nativesdk and depend upon discard 1bcebac mc: Fix manpage date indeterminism discard 11bf2ad mc: Set zipinfo presence determinstically discard a80b85c oeqa/reproducible: Improve test output and ensure deb+ipk compared discard 4b237f7 opkg-utils: Fix reproducibility issues in opkg-build discard ef3817c sstatesig: Log timestamps for hashequiv in reprodubile builds discard 574956e Revert "HACK: Intercept broken permissions in build" discard 6f7f9d7 HACK: Intercept broken permissions in build discard 23b0058 HACK: signing: Add extra test debug discard 5dc1133 glew/curl: specify exclusive package configs discard 3f75418 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 855fbe45 oescripts.py: use unittest.SkipUnless for class skip add a9b8287 opkg-utils: Fix reproducibility issues in opkg-build add 6e2e048 oeqa/reproducible: Improve test output and ensure deb+ipk compared add 11d7a9e mc: Set zipinfo presence determinstically add 5553c20 mc: Fix manpage date indeterminism add 5ed0840 patch: Extend to native/nativesdk and depend upon add 39e25b0 xserver-xorg: Fix reproducibility issue add d14a4b0 tar: Fix build determinism, disable rsh add 0392fcb libidn2: Fix reproducibility issue add f3675be gtk+3: sort resources for reproducible binaries add c052b0c microblaze tune: change microblazeeb to microblaze add 0d1551d microblaze tune: Allow no version to be set add 389691b microblaze tune: Enable 64-bit add 78c3885 microblaze tune: cleanup += add 6f6a6bb microblaze: Adjust Linux items from microblazeeb to microblaze new a2417e3 oescripts.py: use unittest.SkipUnless for class skip new f46a626 base.bbclass: extend PACKAGECONFIG for conflict package configs new 0f11c34 glew/curl: specify exclusive package configs new 1b568a5 HACK: signing: Add extra test debug new 3994c36 HACK: Intercept broken permissions in build new 66bc948 Revert "HACK: Intercept broken permissions in build" new 4bba999 sstatesig: Log timestamps for hashequiv in reprodubile builds new 5a4a054 perl: Fix repro issues (partial) new f3add88 HACK: Attempt to find perl contamination This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b20f324) \ N -- N -- N refs/heads/master-next (f3add88) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 2 + meta/classes/kernel-yocto.bbclass | 43 +++++++--------------- .../kern-tools/kern-tools-native_git.bb | 13 +++---- meta/recipes-kernel/linux/linux-yocto.inc | 21 +++++++++++ 4 files changed, 42 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:57 +0000 Subject: [oe-commits] [openembedded-core] 04/09: HACK: signing: Add extra test debug In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.126D8232A1E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1b568a5017ed0b48afa1737aca2c7aedde6e1b40 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:55 +0000 Subject: [oe-commits] [openembedded-core] 02/09: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.01C29232A1B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f46a626ca0f60821d3ce5a03c1c43836ac1ab7cf Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:56 +0000 Subject: [oe-commits] [openembedded-core] 03/09: glew/curl: specify exclusive package configs In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.093B2232A1C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0f11c34b5eeff5679fa8f0a9e5f84e8ddacebe89 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:58 +0000 Subject: [oe-commits] [openembedded-core] 05/09: HACK: Intercept broken permissions in build In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.1B9CD232A1F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3994c3666f77a9625eadacb2cb2ba9eaee559bff Author: Richard Purdie AuthorDate: Tue Feb 4 18:09:56 2020 +0000 HACK: Intercept broken permissions in build Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..bd5b7c3 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -908,6 +908,8 @@ def package_qa_check_host_user(path, name, d, elf, messages): if path == home or path.startswith(home + os.sep): return + import stat as stat2 + try: stat = os.lstat(path) except OSError as exc: @@ -924,6 +926,9 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/usr/src/debug/tcp-wrappers" in path and "weak_symbols" not in path: + if stat2.S_IMODE(stat.st_mode) & stat2.S_IWUSR: + bb.error("Fatal perms for %s %s" % (path, stat2.S_IMODE(stat.st_mode))) return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:23:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:23:59 +0000 Subject: [oe-commits] [openembedded-core] 06/09: Revert "HACK: Intercept broken permissions in build" In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.25415232A20@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 66bc9488b72f52ab18aeb156f38d66d5b277fcad Author: Richard Purdie AuthorDate: Tue Feb 4 22:26:52 2020 +0000 Revert "HACK: Intercept broken permissions in build" This reverts commit 436fdc39c6cca54f615b855d90bd84d22f9528b0. --- meta/classes/insane.bbclass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index bd5b7c3..795c7b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -908,8 +908,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if path == home or path.startswith(home + os.sep): return - import stat as stat2 - try: stat = os.lstat(path) except OSError as exc: @@ -926,9 +924,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False - if "/usr/src/debug/tcp-wrappers" in path and "weak_symbols" not in path: - if stat2.S_IMODE(stat.st_mode) & stat2.S_IWUSR: - bb.error("Fatal perms for %s %s" % (path, stat2.S_IMODE(stat.st_mode))) return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:24:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:24:01 +0000 Subject: [oe-commits] [openembedded-core] 08/09: perl: Fix repro issues (partial) In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.3D34B232A22@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5a4a054a6b232b5815150aedf3b311999945b30a Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix repro issues (partial) Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/fix.patch | 27 +++++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-devtools/perl/files/fix.patch b/meta/recipes-devtools/perl/files/fix.patch new file mode 100644 index 0000000..ef9d36b --- /dev/null +++ b/meta/recipes-devtools/perl/files/fix.patch @@ -0,0 +1,27 @@ + +Index: perl-5.30.1/cnf/configure_attr.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_attr.sh ++++ perl-5.30.1/cnf/configure_attr.sh +@@ -131,7 +131,7 @@ if not hinted d_c99_variadic_macros 'sup + try_start + try_add '#include ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 3634122..d4b6bb3 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://fix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:24:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:24:00 +0000 Subject: [oe-commits] [openembedded-core] 07/09: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.2F1EE232A21@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4bba9992987ff2d65a047c5f2f90670ed614ee26 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 12:24:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 12:24:02 +0000 Subject: [oe-commits] [openembedded-core] 09/09: HACK: Attempt to find perl contamination In-Reply-To: <158099183380.9189.141473297718087237@git.openembedded.org> References: <158099183380.9189.141473297718087237@git.openembedded.org> Message-ID: <20200206122354.4AE80232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f3add88f11a1c24e64066e33ac4f5eba08a1a7dd Author: Richard Purdie AuthorDate: Wed Feb 5 23:47:36 2020 +0000 HACK: Attempt to find perl contamination Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..326c851 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,6 +924,17 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/x86_64-linux/CORE/config.h" in path: + with open(path, "r") as f: + lines = f.readlines() + for l in lines: + if "SIG_SIZE" in l and "36" in l: + bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) + if "I_XLOCALE" in l and l.startswith("#define"): + bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) + if "I_QUADMATH" in l and not l.startswith("#define"): + bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) + return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 15:20:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 15:20:14 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (fd2765b -> dda2962) Message-ID: <158100241443.17346.8731438925235064464@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from fd2765b smem: update to v1.5 (python3 compatibility) new a44430f mdns: improve numerous aspects of Posix backend new 502084c freeradius: upgrade 3.0.19 -> 3.0.20 new dda2962 dbus-broker: backport patches to fix policy with SELinux nodes The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...-rlm_python3-add-PY_INC_DIR-in-search-dir.patch | 58 ++++++ ...-to-radiusd-user-group-when-rotating-logs.patch | 104 ---------- .../{freeradius_3.0.19.bb => freeradius_3.0.20.bb} | 35 ++-- ...subroutine-for-cleaning-recent-interfaces.patch | 60 ++++++ ...-subroutine-for-tearing-down-an-interface.patch | 58 ++++++ .../files/0003-Track-interface-socket-family.patch | 50 +++++ .../0004-Use-list-for-changed-interfaces.patch | 177 +++++++++++++++++ .../files/0005-Handle-noisy-netlink-sockets.patch | 212 +++++++++++++++++++++ .../mdns/files/0006-Remove-unneeded-function.patch | 51 +++++ ...-Indicate-loopback-interface-to-mDNS-core.patch | 129 +++++++++++++ ...-Mark-deleted-interfaces-as-being-changed.patch | 39 ++++ .../files/0009-Fix-possible-NULL-dereference.patch | 45 +++++ .../0010-Handle-errors-from-socket-calls.patch | 62 ++++++ ...dynamic-allocation-to-file-scope-variable.patch | 51 +++++ .../recipes-protocols/mdns/mdns_878.260.1.bb | 11 ++ ...h-policy-fix-crash-when-importing-selinux.patch | 50 +++++ ...h-policy-fix-crash-when-exporting-selinux.patch | 59 ++++++ meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 + 18 files changed, 1133 insertions(+), 120 deletions(-) create mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch delete mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch rename meta-networking/recipes-connectivity/freeradius/{freeradius_3.0.19.bb => freeradius_3.0.20.bb} (88%) create mode 100644 meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0005-Handle-noisy-netlink-sockets.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0007-Indicate-loopback-interface-to-mDNS-core.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch create mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch create mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 15:20:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 15:20:16 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: freeradius: upgrade 3.0.19 -> 3.0.20 In-Reply-To: <158100241443.17346.8731438925235064464@git.openembedded.org> References: <158100241443.17346.8731438925235064464@git.openembedded.org> Message-ID: <20200206152014.D9FFD232A20@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 502084cc99ac04c6989c03c23b8aa9c04425e976 Author: Yi Zhao AuthorDate: Thu Feb 6 19:22:03 2020 +0800 freeradius: upgrade 3.0.19 -> 3.0.20 * Drop backported patch: 0001-su-to-radiusd-user-group-when-rotating-logs.patch * Disable python2 module build and add PACKAGECONFIG for python3 module build Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...-rlm_python3-add-PY_INC_DIR-in-search-dir.patch | 58 ++++++++++++ ...-to-radiusd-user-group-when-rotating-logs.patch | 104 --------------------- .../{freeradius_3.0.19.bb => freeradius_3.0.20.bb} | 35 +++---- 3 files changed, 77 insertions(+), 120 deletions(-) diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch new file mode 100644 index 0000000..d630231 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch @@ -0,0 +1,58 @@ +From 733330888fff49e4d2b6c2121a6050fdd9f11a87 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 6 Feb 2020 09:32:04 +0800 +Subject: [PATCH] rlm_python3: add PY_INC_DIR in search dir + +The configure option --with-rlm-python3-include-dir is used to set +PY_INC_DIR which is never used and it fails to find Python.h, +so add it into search dir to fix it. + +Also remove SMART_LIBS from mod_flags because it introduces rpath +to LDFALGS which causes a do_package_qa error: + +ERROR: freeradius-3.0.20-r0 do_package_qa: QA Issue: package freeradius-python contains bad RPATH +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/recipe-sysroot-native/usr/lib/python3.8/config in file +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/packages-split/freeradius-python/usr/lib/rlm_python3.so.0.0.0 +package freeradius-python contains bad RPATH +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/recipe-sysroot-native/usr/lib/python3.8/config in file +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/packages-split/freeradius-python/usr/lib/rlm_python3.so.0.0.0 [rpaths] + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Yi Zhao +--- + src/modules/rlm_python3/configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac +index a00320f..adbdf19 100644 +--- a/src/modules/rlm_python3/configure.ac ++++ b/src/modules/rlm_python3/configure.ac +@@ -95,7 +95,7 @@ if test x$with_[]modname != xno; then + + old_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $PY_CFLAGS" +- smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION" ++ smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION $PY_INC_DIR" + FR_SMART_CHECK_INCLUDE(Python.h) + CFLAGS=$old_CFLAGS + +@@ -114,13 +114,13 @@ if test x$with_[]modname != xno; then + + eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}} + if test "x$t" = "xyes"; then +- mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm" ++ mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS -lm" + targetname=modname + else + FR_SMART_CHECK_LIB(python${PY_SYS_VERSION}m, Py_Initialize) + eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}} + if test "x$t" = "xyes"; then +- mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm" ++ mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS -lm" + targetname=modname + else + targetname= +-- +2.7.4 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch deleted file mode 100644 index 5859dc7..0000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 1f233773962bf1a9c2d228a180eacddb9db2d574 Mon Sep 17 00:00:00 2001 -From: Alexander Scheel -Date: Tue, 7 May 2019 16:04:29 -0400 -Subject: [PATCH] su to radiusd user/group when rotating logs - -The su directive to logrotate ensures that log rotation happens under the -owner of the logs. Otherwise, logrotate runs as root:root, potentially -enabling privilege escalation if a RCE is discovered against the -FreeRADIUS daemon. - -Signed-off-by: Alexander Scheel - -Upstream-Status: Backport -[https://github.com/FreeRADIUS/freeradius-server/commit/1f233773962bf1a9c2d228a180eacddb9db2d574] - -CVE: CVE-2019-10143 - -Signed-off-by: Yi Zhao ---- - debian/freeradius.logrotate | 3 +++ - redhat/freeradius-logrotate | 1 + - scripts/logrotate/freeradius | 3 +++ - suse/radiusd-logrotate | 1 + - 4 files changed, 8 insertions(+) - -diff --git a/debian/freeradius.logrotate b/debian/freeradius.logrotate -index 7d837d5..a8d29b7 100644 ---- a/debian/freeradius.logrotate -+++ b/debian/freeradius.logrotate -@@ -9,6 +9,7 @@ - notifempty - - copytruncate -+ su freerad freerad - } - - # (in order) -@@ -26,6 +27,7 @@ - notifempty - - nocreate -+ su freerad freerad - } - - # There are different detail-rotating strategies you can use. One is -@@ -45,4 +47,5 @@ - notifempty - - nocreate -+ su freerad freerad - } -diff --git a/redhat/freeradius-logrotate b/redhat/freeradius-logrotate -index 360765d..bb97ca5 100644 ---- a/redhat/freeradius-logrotate -+++ b/redhat/freeradius-logrotate -@@ -9,6 +9,7 @@ rotate 4 - missingok - compress - delaycompress -+su radiusd radiusd - - # - # The main server log -diff --git a/scripts/logrotate/freeradius b/scripts/logrotate/freeradius -index 3de435e..eecf631 100644 ---- a/scripts/logrotate/freeradius -+++ b/scripts/logrotate/freeradius -@@ -17,6 +17,7 @@ - notifempty - - copytruncate -+ su radiusd radiusd - } - - # (in order) -@@ -34,6 +35,7 @@ - notifempty - - nocreate -+ su radiusd radiusd - } - - # There are different detail-rotating strategies you can use. One is -@@ -53,4 +55,5 @@ - notifempty - - nocreate -+ su radiusd radiusd - } -diff --git a/suse/radiusd-logrotate b/suse/radiusd-logrotate -index 24d56be..be5a797 100644 ---- a/suse/radiusd-logrotate -+++ b/suse/radiusd-logrotate -@@ -11,6 +11,7 @@ missingok - compress - delaycompress - notifempty -+su radiusd radiusd - - # - # The main server log --- -2.7.4 - diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb similarity index 88% rename from meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb rename to meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb index 8887433..a9c2fad 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb @@ -26,12 +26,12 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x; \ file://freeradius-fix-quoting-for-BUILT_WITH.patch \ file://freeradius-fix-error-for-expansion-of-macro.patch \ file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ - file://0001-su-to-radiusd-user-group-when-rotating-logs.patch \ + file://0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " -SRCREV = "ab4c767099f263a7cd4109bcdca80ee74210a769" +SRCREV = "d94c953ab9602a238433ba18533111b845fd8e9e" PARALLEL_MAKE = "" @@ -61,9 +61,11 @@ EXTRA_OECONF = " --enable-strict-dependencies \ --without-rlm_sql_iodbc \ --without-rlm_sql_oracle \ --without-rlm_sql_sybase \ + --without-rlm_sql_mongo \ --without-rlm_sqlhpwippool \ --without-rlm_securid \ --without-rlm_unbound \ + --without-rlm_python \ ac_cv_path_PERL=${bindir}/perl \ ax_cv_cc_builtin_choose_expr=no \ ax_cv_cc_builtin_types_compatible_p=no \ @@ -86,7 +88,7 @@ PACKAGECONFIG[unixodbc] = "--with-rlm_sql_unixodbc,--without-rlm_sql_unixodbc,un PACKAGECONFIG[postgresql] = "--with-rlm_sql_postgresql,--without-rlm_sql_postgresql,postgresql" PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" -PACKAGECONFIG[python] = "--with-rlm_python --with-rlm-python-bin=${STAGING_BINDIR_NATIVE}/python-native/python --with-rlm-python-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python,python-native python" +PACKAGECONFIG[python3] = "--with-rlm_python3 --with-rlm-python3-bin=${STAGING_BINDIR_NATIVE}/python3-native/python3 --with-rlm-python3-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python3,python3-native python3" PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest,curl json-c" PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" @@ -145,23 +147,24 @@ do_install() { rm -f ${D}/${sbindir}/rc.radiusd chmod +x ${D}/${sysconfdir}/init.d/radiusd rm -rf ${D}/${localstatedir}/run/ + rm -rf ${D}/${localstatedir}/log/ install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd chown -R radiusd:radiusd ${D}/${sysconfdir}/raddb/ chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd # For systemd - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system - sed -i -e 's, at BASE_BINDIR@,${base_bindir},g' \ - -e 's, at SBINDIR@,${sbindir},g' \ - -e 's, at STATEDIR@,${localstatedir},g' \ - -e 's, at SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_unitdir}/system/radiusd.service - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system + sed -i -e 's, at BASE_BINDIR@,${base_bindir},g' \ + -e 's, at SBINDIR@,${sbindir},g' \ + -e 's, at STATEDIR@,${localstatedir},g' \ + -e 's, at SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/radiusd.service + install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf fi } @@ -171,7 +174,7 @@ pkg_postinst_${PN} () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then # create /var/log/radius, /var/run/radiusd - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/radiusd-volatiles.conf + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/radiusd.conf elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update fi @@ -210,9 +213,9 @@ FILES_${PN}-perl = "${libdir}/rlm_perl.so* \ ${sysconfdir}/raddb/mods-available/perl \ " -FILES_${PN}-python = "${libdir}/rlm_python.so* \ - ${sysconfdir}/raddb/mods-config/python \ - ${sysconfdir}/raddb/mods-available/python \ +FILES_${PN}-python = "${libdir}/rlm_python3.so* \ + ${sysconfdir}/raddb/mods-config/python3 \ + ${sysconfdir}/raddb/mods-available/python3 \ " FILES_${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 15:20:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 15:20:17 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: dbus-broker: backport patches to fix policy with SELinux nodes In-Reply-To: <158100241443.17346.8731438925235064464@git.openembedded.org> References: <158100241443.17346.8731438925235064464@git.openembedded.org> Message-ID: <20200206152014.E4A81232A21@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dda2962584e3a1616ba0e8e6e72e4eae6d56e652 Author: Luca Boccassi AuthorDate: Thu Feb 6 14:08:24 2020 +0000 dbus-broker: backport patches to fix policy with SELinux nodes Backport from master: https://github.com/bus1/dbus-broker/pull/213 Signed-off-by: Khem Raj --- ...h-policy-fix-crash-when-importing-selinux.patch | 50 ++++++++++++++++++ ...h-policy-fix-crash-when-exporting-selinux.patch | 59 ++++++++++++++++++++++ meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 + 3 files changed, 111 insertions(+) diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch b/meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch new file mode 100644 index 0000000..c5f3092 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch @@ -0,0 +1,50 @@ +From d28e59c451375e8b08fa431b1d64cb3ce9f078ee Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Fri, 25 Oct 2019 21:04:36 +0100 +Subject: [PATCH 1/2] launch/policy: fix crash when importing + +If a policy contains a element, dbus-broker-launch crashes: + +Oct 22 12:02:51 localhost dbus-broker-launch[885]: dbus-broker-launch: ../dbus-broker-19/src/launch/policy.c:232: policy_import_verdict: Assertion `cnode->parent->type == CONFIG_NODE_POLICY' failed. + +Minimal config to reproduce: + + + + + + + + + +policy_import_verdict is being called on an associate element, +but not only it cannot work as that function checks that the +parent is a policy node (but it's a selinux node in this case), +it is also not necessary as the selinux node only defines ownership, +it does not have allow/deny. + +Fixes #212 + +Signed-off-by: Luca Boccassi +Upstream-Status: merged https://github.com/bus1/dbus-broker/pull/213 +--- + src/launch/policy.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/launch/policy.c b/src/launch/policy.c +index a8ba8e7..466e4bd 100644 +--- a/src/launch/policy.c ++++ b/src/launch/policy.c +@@ -613,8 +613,6 @@ static int policy_import_selinux(Policy *policy, ConfigNode *cnode) { + if (r) + return error_trace(r); + +- policy_import_verdict(policy, record, cnode); +- + record->selinux.name = cnode->associate.own; + record->selinux.context = cnode->associate.context; + +-- +2.20.1 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch b/meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch new file mode 100644 index 0000000..51f4536 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch @@ -0,0 +1,59 @@ +From f1cdef4d98ddbfeeb4a688712d54b3adc89bfe26 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Fri, 25 Oct 2019 21:05:43 +0100 +Subject: [PATCH 2/2] launch/policy: fix crash when exporting +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If a policy contains a element, dbus-broker-launch crashes: + +[ 30.048705] dbus-broker-launch[221]: ERROR policy_export @ ../dbus-broker-21/src/launch/policy.c +1142: Return code 1 +[ 30.050963] dbus-broker-launch[221]: launcher_add_listener @ ../dbus-broker-21/src/launch/launcher.c +1130 +[ 30.079620] dbus-broker[228]: Dispatched 0 messages @ 0(?0)?s / message. +[ 30.082613] dbus-broker-launch[221]: launcher_run @ ../dbus-broker-21/src/launch/launcher.c +1389 +[ 30.084426] dbus-broker-launch[221]: run @ ../dbus-broker-21/src/launch/main.c +153 +[ 30.085797] dbus-broker-launch[221]: main @ ../dbus-broker-21/src/launch/main.c +181 +[ 30.087208] dbus-broker-launch[221]: Exiting due to fatal error: -131 + +Minimal config to reproduce: + + + + + + + + + +As per the libsystemd API, sd_bus_message_append can return an int +greater than 0 on success, which for example happens when processing +vectors. +The export function is treating every non-zero result as an error, +which causes dbus-broker-launch to terminate. + +Fixes #212 + +Signed-off-by: Luca Boccassi +Upstream-Status: merged https://github.com/bus1/dbus-broker/pull/213 +--- + src/launch/policy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/launch/policy.c b/src/launch/policy.c +index 466e4bd..f91f11b 100644 +--- a/src/launch/policy.c ++++ b/src/launch/policy.c +@@ -1138,7 +1138,7 @@ int policy_export(Policy *policy, sd_bus_message *m, uint32_t *at_console_uids, + r = sd_bus_message_append(m, "(ss)", + i_record->selinux.name, + i_record->selinux.context); +- if (r) ++ if (r < 0) + return error_origin(r); + } + +-- +2.20.1 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-oe/recipes-core/dbus/dbus-broker_21.bb index 8b4101a..bad4427 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_21.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -11,6 +11,8 @@ SRC_URI += " file://0001-launch-improve-error-handling-for-opendir.patch" SRC_URI += " file://0002-metrics-change-the-constant-used-for-invalid-timesta.patch" SRC_URI += " file://0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch" SRC_URI += " file://0004-launcher-fix-build-with-musl-libc.patch" +SRC_URI += " file://0005-launch-policy-fix-crash-when-importing-selinux.patch" +SRC_URI += " file://0006-launch-policy-fix-crash-when-exporting-selinux.patch" SRC_URI[md5sum] = "a17886a92ab1e0bc2e4b1a274339e388" SRC_URI[sha256sum] = "6fff9a831a514659e2c7d704e76867ce31ebcf43e8d7a62e080c6656f64cd39e" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 15:20:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 15:20:15 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: mdns: improve numerous aspects of Posix backend In-Reply-To: <158100241443.17346.8731438925235064464@git.openembedded.org> References: <158100241443.17346.8731438925235064464@git.openembedded.org> Message-ID: <20200206152014.CFA6D232A1F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a44430fe9115f58aa72f211cb114a2e1f63bf4c5 Author: Matt Hoosier AuthorDate: Wed Feb 5 16:04:49 2020 -0600 mdns: improve numerous aspects of Posix backend Apple's default implementation of the Posix backend for mDNSResponder has a number of weaknesses. Address several of them, most notably: * Improve interface tracking, preventing confusion to mdns's state machine. Prevents spurious removal/republication cycles whenever network interfaces are added or removed. * Support network interfaces whose indeces are great than 31. Indices grow past that range surprisingly quickly, especially with multi- homed, mobile, wifi, Bluetooth, VPN, VLANs, or other interfaces present. * Correctly handle edge cases during removal of a network interface. The fixes are kept as a patch series for clarity. Signed-off-by: Matt Hoosier Signed-off-by: Khem Raj --- ...subroutine-for-cleaning-recent-interfaces.patch | 60 ++++++ ...-subroutine-for-tearing-down-an-interface.patch | 58 ++++++ .../files/0003-Track-interface-socket-family.patch | 50 +++++ .../0004-Use-list-for-changed-interfaces.patch | 177 +++++++++++++++++ .../files/0005-Handle-noisy-netlink-sockets.patch | 212 +++++++++++++++++++++ .../mdns/files/0006-Remove-unneeded-function.patch | 51 +++++ ...-Indicate-loopback-interface-to-mDNS-core.patch | 129 +++++++++++++ ...-Mark-deleted-interfaces-as-being-changed.patch | 39 ++++ .../files/0009-Fix-possible-NULL-dereference.patch | 45 +++++ .../0010-Handle-errors-from-socket-calls.patch | 62 ++++++ ...dynamic-allocation-to-file-scope-variable.patch | 51 +++++ .../recipes-protocols/mdns/mdns_878.260.1.bb | 11 ++ 12 files changed, 945 insertions(+) diff --git a/meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch b/meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch new file mode 100644 index 0000000..692c344 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch @@ -0,0 +1,60 @@ +From 89ea6ac4a8840e8c2be0140a9805c6522c6c5280 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Wed, 28 Jun 2017 17:30:00 -0500 +Subject: [PATCH 01/11] Create subroutine for cleaning recent interfaces + +Moves functionality for cleaning the list of recent +interfaces into its own subroutine. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 0e10bd5..ffc9696 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -856,6 +856,19 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf + return err; + } + ++// Clean up any interfaces that have been hanging around on the RecentInterfaces list for more than a minute ++mDNSlocal void CleanRecentInterfaces(void) ++{ ++ PosixNetworkInterface **ri = &gRecentInterfaces; ++ const mDNSs32 utc = mDNSPlatformUTC(); ++ while (*ri) ++ { ++ PosixNetworkInterface *pi = *ri; ++ if (utc - pi->LastSeen < 60) ri = (PosixNetworkInterface **)&pi->coreIntf.next; ++ else { *ri = (PosixNetworkInterface *)pi->coreIntf.next; free(pi); } ++ } ++} ++ + // Creates a PosixNetworkInterface for the interface whose IP address is + // intfAddr and whose name is intfName and registers it with mDNS core. + mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, const char *intfName, int intfIndex) +@@ -1010,16 +1023,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) + + // Clean up. + if (intfList != NULL) free_ifi_info(intfList); +- +- // Clean up any interfaces that have been hanging around on the RecentInterfaces list for more than a minute +- PosixNetworkInterface **ri = &gRecentInterfaces; +- const mDNSs32 utc = mDNSPlatformUTC(); +- while (*ri) +- { +- PosixNetworkInterface *pi = *ri; +- if (utc - pi->LastSeen < 60) ri = (PosixNetworkInterface **)&pi->coreIntf.next; +- else { *ri = (PosixNetworkInterface *)pi->coreIntf.next; free(pi); } +- } ++ CleanRecentInterfaces(); + + return err; + } +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch b/meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch new file mode 100644 index 0000000..21ba318 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch @@ -0,0 +1,58 @@ +From a2148df99ddcd122247f95c4cbcce5c4118581a1 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Wed, 28 Jun 2017 17:30:00 -0500 +Subject: [PATCH 02/11] Create subroutine for tearing down an interface + +Creates a subroutine for tearing down an interface. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index ffc9696..5e5b2cd 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -591,6 +591,19 @@ mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf) + gRecentInterfaces = intf; + } + ++mDNSlocal void TearDownInterface(mDNS *const m, PosixNetworkInterface *intf) ++{ ++ mDNS_DeregisterInterface(m, &intf->coreIntf, NormalActivation); ++ if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName); ++ FreePosixNetworkInterface(intf); ++ ++ num_registered_interfaces--; ++ if (num_registered_interfaces == 0) { ++ num_pkts_accepted = 0; ++ num_pkts_rejected = 0; ++ } ++} ++ + // Grab the first interface, deregister it, free it, and repeat until done. + mDNSlocal void ClearInterfaceList(mDNS *const m) + { +@@ -599,13 +612,10 @@ mDNSlocal void ClearInterfaceList(mDNS *const m) + while (m->HostInterfaces) + { + PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); +- mDNS_DeregisterInterface(m, &intf->coreIntf, NormalActivation); +- if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName); +- FreePosixNetworkInterface(intf); ++ TearDownInterface(m, intf); + } +- num_registered_interfaces = 0; +- num_pkts_accepted = 0; +- num_pkts_rejected = 0; ++ ++ assert(num_registered_interfaces == 0); + } + + // Sets up a send/receive socket. +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch b/meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch new file mode 100644 index 0000000..8c0e6bf --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch @@ -0,0 +1,50 @@ +From 71a7c728ae0d8143b66aa40decca74ebaa9aa2ce Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Wed, 28 Jun 2017 17:30:00 -0500 +Subject: [PATCH 03/11] Track interface socket family + +Tracks the socket family associated with the interface. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 1 + + mDNSPosix/mDNSPosix.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 5e5b2cd..8fe22be 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -918,6 +918,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct + // Set up the extra fields in PosixNetworkInterface. + assert(intf->intfName != NULL); // intf->intfName already set up above + intf->index = intfIndex; ++ intf->sa_family = intfAddr->sa_family; + intf->multicastSocket4 = -1; + #if HAVE_IPV6 + intf->multicastSocket6 = -1; +diff --git a/mDNSPosix/mDNSPosix.h b/mDNSPosix/mDNSPosix.h +index ca60d80..f77c185 100644 +--- a/mDNSPosix/mDNSPosix.h ++++ b/mDNSPosix/mDNSPosix.h +@@ -19,6 +19,7 @@ + #define __mDNSPlatformPosix_h + + #include ++#include + #include + + #ifdef __cplusplus +@@ -40,6 +41,7 @@ struct PosixNetworkInterface + const char * intfName; + PosixNetworkInterface * aliasIntf; + int index; ++ sa_family_t sa_family; + int multicastSocket4; + #if HAVE_IPV6 + int multicastSocket6; +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch b/meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch new file mode 100644 index 0000000..05ad49b --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch @@ -0,0 +1,177 @@ +From e1f483510a1011e37540fdee8f3bc36111fa45a0 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Thu, 13 Jul 2017 09:00:00 -0500 +Subject: [PATCH 04/11] Use list for changed interfaces + +Uses a linked list to store the index of changed network interfaces +instead of a bitfield. This allows for network interfaces with an +index greater than 31 (an index of 36 was seen on Android). + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 67 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 52 insertions(+), 15 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 8fe22be..699855a 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -75,6 +75,14 @@ struct IfChangeRec + }; + typedef struct IfChangeRec IfChangeRec; + ++// Used to build a list of network interface indices ++struct NetworkInterfaceIndex ++{ ++ int if_index; ++ struct NetworkInterfaceIndex *Next; ++}; ++typedef struct NetworkInterfaceIndex NetworkInterfaceIndex; ++ + // Note that static data is initialized to zero in (modern) C. + static fd_set gEventFDs; + static int gMaxFD; // largest fd in gEventFDs +@@ -1071,6 +1079,32 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD) + return err; + } + ++mDNSlocal mDNSBool ListContainsInterfaceIndex(GenLinkedList *list, int if_index) ++{ ++ NetworkInterfaceIndex *item; ++ ++ for (item = (NetworkInterfaceIndex*)list->Head; item != NULL; item = item->Next) ++ { ++ if (if_index == item->if_index) return mDNStrue; ++ } ++ ++ return mDNSfalse; ++} ++ ++mDNSlocal void AddInterfaceIndexToList(GenLinkedList *list, int if_index) ++{ ++ NetworkInterfaceIndex *item; ++ ++ if (ListContainsInterfaceIndex(list, if_index)) return; ++ ++ item = malloc(sizeof *item); ++ if (item == NULL) return; ++ ++ item->if_index = if_index; ++ item->Next = NULL; ++ AddToTail(list, item); ++} ++ + #if MDNS_DEBUGMSGS + mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) + { +@@ -1098,14 +1132,13 @@ mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) + } + #endif + +-mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) ++mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *changedInterfaces) + // Read through the messages on sd and if any indicate that any interface records should + // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. + { + ssize_t readCount; + char buff[4096]; + struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; +- mDNSu32 result = 0; + + // The structure here is more complex than it really ought to be because, + // unfortunately, there's no good way to size a buffer in advance large +@@ -1141,9 +1174,9 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) + + // Process the NetLink message + if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) +- result |= 1 << ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index; ++ AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index); + else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR) +- result |= 1 << ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index; ++ AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index); + + // Advance pNLMsg to the next message in the buffer + if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) +@@ -1154,8 +1187,6 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) + else + break; // all done! + } +- +- return result; + } + + #else // USES_NETLINK +@@ -1187,14 +1218,13 @@ mDNSlocal void PrintRoutingSocketMsg(const struct ifa_msghdr *pRSMsg) + } + #endif + +-mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) ++mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *changedInterfaces) + // Read through the messages on sd and if any indicate that any interface records should + // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. + { + ssize_t readCount; + char buff[4096]; + struct ifa_msghdr *pRSMsg = (struct ifa_msghdr*) buff; +- mDNSu32 result = 0; + + readCount = read(sd, buff, sizeof buff); + if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) +@@ -1209,12 +1239,10 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) + pRSMsg->ifam_type == RTM_IFINFO) + { + if (pRSMsg->ifam_type == RTM_IFINFO) +- result |= 1 << ((struct if_msghdr*) pRSMsg)->ifm_index; ++ AddInterfaceIndexToList(changedInterfaces, ((struct if_msghdr*) pRSMsg)->ifm_index); + else +- result |= 1 << pRSMsg->ifam_index; ++ AddInterfaceIndexToList(changedInterfaces, pRSMsg->ifam_index); + } +- +- return result; + } + + #endif // USES_NETLINK +@@ -1224,7 +1252,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, short filter, void *context) + { + IfChangeRec *pChgRec = (IfChangeRec*) context; + fd_set readFDs; +- mDNSu32 changedInterfaces = 0; ++ GenLinkedList changedInterfaces; ++ NetworkInterfaceIndex *changedInterface; + struct timeval zeroTimeout = { 0, 0 }; + + (void)fd; // Unused +@@ -1233,17 +1262,25 @@ mDNSlocal void InterfaceChangeCallback(int fd, short filter, void *context) + FD_ZERO(&readFDs); + FD_SET(pChgRec->NotifySD, &readFDs); + ++ InitLinkedList(&changedInterfaces, offsetof(NetworkInterfaceIndex, Next)); ++ + do + { +- changedInterfaces |= ProcessRoutingNotification(pChgRec->NotifySD); ++ ProcessRoutingNotification(pChgRec->NotifySD, &changedInterfaces); + } + while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); + + // Currently we rebuild the entire interface list whenever any interface change is + // detected. If this ever proves to be a performance issue in a multi-homed + // configuration, more care should be paid to changedInterfaces. +- if (changedInterfaces) ++ if (changedInterfaces.Head != NULL) + mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS); ++ ++ while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) ++ { ++ RemoveFromList(&changedInterfaces, changedInterface); ++ free(changedInterface); ++ } + } + + // Register with either a Routing Socket or RtNetLink to listen for interface changes. +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0005-Handle-noisy-netlink-sockets.patch b/meta-networking/recipes-protocols/mdns/files/0005-Handle-noisy-netlink-sockets.patch new file mode 100644 index 0000000..f2b171e --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0005-Handle-noisy-netlink-sockets.patch @@ -0,0 +1,212 @@ +From 92025cab86619f548bf3eb816a1804ef40507ca7 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Mon, 24 Jul 2017 09:38:55 -0500 +Subject: [PATCH 05/11] Handle noisy netlink sockets + +The POSIX implementation currently clears all network interfaces +when netlink indicates that there has been a change. This causes +the following problems: + + 1) Applications are informed that all of the services they are + tracking have been removed. + 2) Increases network load because the client must re-query for + all records it is interested in. + +This changes netlink notification handling by: + + 1) Always comparing with the latest interface list returned + by the OS. + 2) Confirming that the interface has been changed in a way + that we care about. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 143 +++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 133 insertions(+), 10 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 699855a..59a8b8c 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1247,14 +1247,38 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change + + #endif // USES_NETLINK + ++// Test whether the given PosixNetworkInterface matches the given struct ifi_info ++mDNSlocal mDNSBool InterfacesMatch(PosixNetworkInterface *intf, struct ifi_info *ifi) ++{ ++ mDNSBool match = mDNSfalse; ++ mDNSAddr ip, mask; ++ ++ if((intf->index == ifi->ifi_index) && ++ (intf->sa_family == ifi->ifi_addr->sa_family) && ++ (strcmp(intf->coreIntf.ifname, ifi->ifi_name) == 0)) ++ { ++ SockAddrTomDNSAddr(ifi->ifi_addr, &ip, NULL); ++ SockAddrTomDNSAddr(ifi->ifi_netmask, &mask, NULL); ++ ++ match = mDNSSameAddress(&intf->coreIntf.ip, &ip) && ++ mDNSSameAddress(&intf->coreIntf.mask, &mask); ++ } ++ ++ return match; ++} ++ + // Called when data appears on interface change notification socket + mDNSlocal void InterfaceChangeCallback(int fd, short filter, void *context) + { + IfChangeRec *pChgRec = (IfChangeRec*) context; ++ mDNS *m = pChgRec->mDNS; + fd_set readFDs; + GenLinkedList changedInterfaces; + NetworkInterfaceIndex *changedInterface; + struct timeval zeroTimeout = { 0, 0 }; ++ struct ifi_info *ifi_list, **ifi, *ifi_free, *ifi_loop4 = NULL; ++ PosixNetworkInterface *intf, *intfNext; ++ mDNSBool found, foundav4; + + (void)fd; // Unused + (void)filter; // Unused +@@ -1270,12 +1294,115 @@ mDNSlocal void InterfaceChangeCallback(int fd, short filter, void *context) + } + while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); + +- // Currently we rebuild the entire interface list whenever any interface change is +- // detected. If this ever proves to be a performance issue in a multi-homed +- // configuration, more care should be paid to changedInterfaces. +- if (changedInterfaces.Head != NULL) +- mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS); ++ CleanRecentInterfaces(); ++ ++ if (changedInterfaces.Head == NULL) goto cleanup; ++ ++ ifi_list = get_ifi_info(AF_INET, mDNStrue); ++ if (ifi_list == NULL) goto cleanup; ++ ++#if HAVE_IPV6 ++ /* Link the IPv6 list to the end of the IPv4 list */ ++ ifi = &ifi_list; ++ while (*ifi != NULL) ifi = &(*ifi)->ifi_next; ++ *ifi = get_ifi_info(AF_INET6, mDNStrue); ++#endif ++ ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext) ++ { ++ intfNext = (PosixNetworkInterface*)(intf->coreIntf.next); ++ ++ // Loopback interface(s) are handled later ++ if (intf->coreIntf.Loopback) continue; ++ ++ found = mDNSfalse; ++ for (ifi = &ifi_list; *ifi != NULL; ifi = &(*ifi)->ifi_next) ++ { ++ if (InterfacesMatch(intf, *ifi)) ++ { ++ found = mDNStrue; ++ ++ // Removes unchanged from ifi_list ++ ifi_free = *ifi; ++ *ifi = (*ifi)->ifi_next; ++ ifi_free->ifi_next = NULL; ++ free_ifi_info(ifi_free); ++ ++ break; ++ } ++ } ++ ++ // Removes changed and old interfaces from m->HostInterfaces ++ if (!found) TearDownInterface(m, intf); ++ } ++ ++ // Add new and changed interfaces in ifi_list ++ // Save off loopback interface in case it is needed later ++ for (ifi = &ifi_list; *ifi != NULL; ifi = &(*ifi)->ifi_next) ++ { ++ if ((ifi_loop4 == NULL) && ++ ((*ifi)->ifi_addr->sa_family == AF_INET) && ++ ((*ifi)->ifi_flags & IFF_UP) && ++ ((*ifi)->ifi_flags & IFF_LOOPBACK)) ++ { ++ ifi_loop4 = *ifi; ++ continue; ++ } ++ ++ if ( (((*ifi)->ifi_addr->sa_family == AF_INET) ++#if HAVE_IPV6 ++ || ((*ifi)->ifi_addr->sa_family == AF_INET6) ++#endif ++ ) && ((*ifi)->ifi_flags & IFF_UP) ++ && !((*ifi)->ifi_flags & IFF_POINTOPOINT) ++ && !((*ifi)->ifi_flags & IFF_LOOPBACK)) ++ { ++ SetupOneInterface(m, *ifi); ++ } ++ } ++ ++ // Determine if there is at least one non-loopback IPv4 interface. This is to work around issues ++ // with multicast loopback on IPv6 interfaces -- see corresponding logic in SetupInterfaceList(). ++ foundav4 = mDNSfalse; ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = (PosixNetworkInterface*)(intf->coreIntf.next)) ++ { ++ if (intf->sa_family == AF_INET && !intf->coreIntf.Loopback) ++ { ++ foundav4 = mDNStrue; ++ break; ++ } ++ } ++ ++ if (foundav4) ++ { ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext) ++ { ++ intfNext = (PosixNetworkInterface*)(intf->coreIntf.next); ++ if (intf->coreIntf.Loopback) TearDownInterface(m, intf); ++ } ++ } ++ else ++ { ++ found = mDNSfalse; ++ ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = (PosixNetworkInterface*)(intf->coreIntf.next)) ++ { ++ if (intf->coreIntf.Loopback) ++ { ++ found = mDNStrue; ++ break; ++ } ++ } ++ ++ if (!found && (ifi_loop4 != NULL)) ++ { ++ SetupOneInterface(m, ifi_loop4); ++ } ++ } ++ ++ if (ifi_list != NULL) free_ifi_info(ifi_list); + ++cleanup: + while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) + { + RemoveFromList(&changedInterfaces, changedInterface); +@@ -1400,15 +1527,11 @@ mDNSexport void mDNSPlatformClose(mDNS *const m) + #endif + } + +-// This is used internally by InterfaceChangeCallback. +-// It's also exported so that the Standalone Responder (mDNSResponderPosix) ++// This is exported so that the Standalone Responder (mDNSResponderPosix) + // can call it in response to a SIGHUP (mainly for debugging purposes). + mDNSexport mStatus mDNSPlatformPosixRefreshInterfaceList(mDNS *const m) + { + int err; +- // This is a pretty heavyweight way to process interface changes -- +- // destroying the entire interface list and then making fresh one from scratch. +- // We should make it like the OS X version, which leaves unchanged interfaces alone. + ClearInterfaceList(m); + err = SetupInterfaceList(m); + return PosixErrorToStatus(err); +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch b/meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch new file mode 100644 index 0000000..b461a60 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch @@ -0,0 +1,51 @@ +From 157d67f152777754c059ced7511352102f23ffae Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Mon, 24 Jul 2017 09:39:18 -0500 +Subject: [PATCH 06/11] Remove unneeded function + +Removes a function we no longer need by integrating it into the only +function that calls it. This was originally separated so that we could +only process network interfaces that netlink indicated had been changed, +this has since been extended to test for all network intefaces. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 59a8b8c..3fc5451 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1079,24 +1079,15 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD) + return err; + } + +-mDNSlocal mDNSBool ListContainsInterfaceIndex(GenLinkedList *list, int if_index) ++mDNSlocal void AddInterfaceIndexToList(GenLinkedList *list, int if_index) + { + NetworkInterfaceIndex *item; + + for (item = (NetworkInterfaceIndex*)list->Head; item != NULL; item = item->Next) + { +- if (if_index == item->if_index) return mDNStrue; ++ if (if_index == item->if_index) return; + } + +- return mDNSfalse; +-} +- +-mDNSlocal void AddInterfaceIndexToList(GenLinkedList *list, int if_index) +-{ +- NetworkInterfaceIndex *item; +- +- if (ListContainsInterfaceIndex(list, if_index)) return; +- + item = malloc(sizeof *item); + if (item == NULL) return; + +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0007-Indicate-loopback-interface-to-mDNS-core.patch b/meta-networking/recipes-protocols/mdns/files/0007-Indicate-loopback-interface-to-mDNS-core.patch new file mode 100644 index 0000000..86201c6 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0007-Indicate-loopback-interface-to-mDNS-core.patch @@ -0,0 +1,129 @@ +From 07a9401d84804d7f0181aa4fb0f13a54b2a1c9a8 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Tue, 1 Aug 2017 17:06:01 -0500 +Subject: [PATCH 07/11] Indicate loopback interface to mDNS core + +Tells the mDNS core if an interface is a loopback interface, +similar to AddInterfaceToList() in the MacOS implementation. +Also reorganizes SetupOneInterface() to use a const struct +rather than growing its parameter list again. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 3fc5451..798ab10 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -889,16 +889,14 @@ mDNSlocal void CleanRecentInterfaces(void) + + // Creates a PosixNetworkInterface for the interface whose IP address is + // intfAddr and whose name is intfName and registers it with mDNS core. +-mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, const char *intfName, int intfIndex) ++mDNSlocal int SetupOneInterface(mDNS *const m, struct ifi_info *const ifi) + { + int err = 0; + PosixNetworkInterface *intf; + PosixNetworkInterface *alias = NULL; + + assert(m != NULL); +- assert(intfAddr != NULL); +- assert(intfName != NULL); +- assert(intfMask != NULL); ++ assert(ifi != NULL); + + // Allocate the interface structure itself. + intf = (PosixNetworkInterface*)calloc(1, sizeof(*intf)); +@@ -907,26 +905,27 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct + // And make a copy of the intfName. + if (err == 0) + { +- intf->intfName = strdup(intfName); ++ intf->intfName = strdup(ifi->ifi_name); + if (intf->intfName == NULL) { assert(0); err = ENOMEM; } + } + + if (err == 0) + { + // Set up the fields required by the mDNS core. +- SockAddrTomDNSAddr(intfAddr, &intf->coreIntf.ip, NULL); +- SockAddrTomDNSAddr(intfMask, &intf->coreIntf.mask, NULL); ++ SockAddrTomDNSAddr(ifi->ifi_addr, &intf->coreIntf.ip, NULL); ++ SockAddrTomDNSAddr(ifi->ifi_netmask, &intf->coreIntf.mask, NULL); + + //LogMsg("SetupOneInterface: %#a %#a", &intf->coreIntf.ip, &intf->coreIntf.mask); +- strncpy(intf->coreIntf.ifname, intfName, sizeof(intf->coreIntf.ifname)); ++ strncpy(intf->coreIntf.ifname, ifi->ifi_name, sizeof(intf->coreIntf.ifname)); + intf->coreIntf.ifname[sizeof(intf->coreIntf.ifname)-1] = 0; + intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; + intf->coreIntf.McastTxRx = mDNStrue; ++ intf->coreIntf.Loopback = ((ifi->ifi_flags & IFF_LOOPBACK) != 0) ? mDNStrue : mDNSfalse; + + // Set up the extra fields in PosixNetworkInterface. + assert(intf->intfName != NULL); // intf->intfName already set up above +- intf->index = intfIndex; +- intf->sa_family = intfAddr->sa_family; ++ intf->index = ifi->ifi_index; ++ intf->sa_family = ifi->ifi_addr->sa_family; + intf->multicastSocket4 = -1; + #if HAVE_IPV6 + intf->multicastSocket6 = -1; +@@ -936,17 +935,17 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct + intf->coreIntf.InterfaceID = (mDNSInterfaceID)alias; + + if (alias != intf) +- debugf("SetupOneInterface: %s %#a is an alias of %#a", intfName, &intf->coreIntf.ip, &alias->coreIntf.ip); ++ debugf("SetupOneInterface: %s %#a is an alias of %#a", ifi->ifi_name, &intf->coreIntf.ip, &alias->coreIntf.ip); + } + + // Set up the multicast socket + if (err == 0) + { +- if (alias->multicastSocket4 == -1 && intfAddr->sa_family == AF_INET) +- err = SetupSocket(intfAddr, MulticastDNSPort, intf->index, &alias->multicastSocket4); ++ if (alias->multicastSocket4 == -1 && ifi->ifi_addr->sa_family == AF_INET) ++ err = SetupSocket(ifi->ifi_addr, MulticastDNSPort, intf->index, &alias->multicastSocket4); + #if HAVE_IPV6 +- else if (alias->multicastSocket6 == -1 && intfAddr->sa_family == AF_INET6) +- err = SetupSocket(intfAddr, MulticastDNSPort, intf->index, &alias->multicastSocket6); ++ else if (alias->multicastSocket6 == -1 && ifi->ifi_addr->sa_family == AF_INET6) ++ err = SetupSocket(ifi->ifi_addr, MulticastDNSPort, intf->index, &alias->multicastSocket6); + #endif + } + +@@ -973,8 +972,8 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct + } + else + { +- // Use intfName instead of intf->intfName in the next line to avoid dereferencing NULL. +- debugf("SetupOneInterface: %s %#a failed to register %d", intfName, &intf->coreIntf.ip, err); ++ // Use ifi->ifi_name instead of intf->intfName in the next line to avoid dereferencing NULL. ++ debugf("SetupOneInterface: %s %#a failed to register %d", ifi->ifi_name, &intf->coreIntf.ip, err); + if (intf) { FreePosixNetworkInterface(intf); intf = NULL; } + } + +@@ -1023,7 +1022,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) + } + else + { +- if (SetupOneInterface(m, i->ifi_addr, i->ifi_netmask, i->ifi_name, i->ifi_index) == 0) ++ if (SetupOneInterface(m, i) == 0) + if (i->ifi_addr->sa_family == AF_INET) + foundav4 = mDNStrue; + } +@@ -1037,7 +1036,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) + // In the interim, we skip loopback interface only if we found at least one v4 interface to use + // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) + if (!foundav4 && firstLoopback) +- (void) SetupOneInterface(m, firstLoopback->ifi_addr, firstLoopback->ifi_netmask, firstLoopback->ifi_name, firstLoopback->ifi_index); ++ (void) SetupOneInterface(m, firstLoopback); + } + + // Clean up. +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch b/meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch new file mode 100644 index 0000000..fdc5105 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch @@ -0,0 +1,39 @@ +From 0fcc0f210f3a9310a1963de640b384ce866410fd Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Wed, 9 Aug 2017 09:16:58 -0500 +Subject: [PATCH 08/11] Mark deleted interfaces as being changed + +Netlink notification handling ignores messages for deleted links, +RTM_DELLINK. It does handle RTM_GETLINK. According to libnl docu- +mentation (http://www.infradead.org/~tgr/libnl/doc/route.html) +RTM_DELLINK can be sent by the kernel, but RTM_GETLINK cannot. +There was likely a mixup in the original implementation, so this +change replaces handling for RTM_GETLINK with RTM_DELLINK. + +Testing and Verification Instructions: + 1. Use ip-link to add and remove a VLAN interface and verify + that mDNSResponder handles the deleted link. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 798ab10..a8a57df 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1163,7 +1163,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change + #endif + + // Process the NetLink message +- if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) ++ if (pNLMsg->nlmsg_type == RTM_DELLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) + AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index); + else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR) + AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index); +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch b/meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch new file mode 100644 index 0000000..362d697 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch @@ -0,0 +1,45 @@ +From 38cff19781f81586926b02f0fd1cb36c040395e0 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Thu, 10 Aug 2017 08:21:53 -0500 +Subject: [PATCH 09/11] Fix possible NULL dereference + +Fixes a possible NULL dereference if memory for +the PosixNetworkInterface could not be allocated. +Other logic seems to prevent dereferencing this +variable if NULL, but this instance seems to have +been overlooked. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index a8a57df..3243ed4 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -951,12 +951,15 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct ifi_info *const ifi) + + // If interface is a direct link, address record will be marked as kDNSRecordTypeKnownUnique + // and skip the probe phase of the probe/announce packet sequence. +- intf->coreIntf.DirectLink = mDNSfalse; ++ if (err == 0) ++ { ++ intf->coreIntf.DirectLink = mDNSfalse; + #ifdef DIRECTLINK_INTERFACE_NAME +- if (strcmp(intfName, STRINGIFY(DIRECTLINK_INTERFACE_NAME)) == 0) +- intf->coreIntf.DirectLink = mDNStrue; ++ if (strcmp(intfName, STRINGIFY(DIRECTLINK_INTERFACE_NAME)) == 0) ++ intf->coreIntf.DirectLink = mDNStrue; + #endif +- intf->coreIntf.SupportsUnicastMDNSResponse = mDNStrue; ++ intf->coreIntf.SupportsUnicastMDNSResponse = mDNStrue; ++ } + + // The interface is all ready to go, let's register it with the mDNS core. + if (err == 0) +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch b/meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch new file mode 100644 index 0000000..b9b0157 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch @@ -0,0 +1,62 @@ +From 382b3b924e43abd1bdc5792918161d0922666691 Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Thu, 10 Aug 2017 08:27:32 -0500 +Subject: [PATCH 10/11] Handle errors from socket calls + +Adds handling for socket() or read() returning a +negative value (indicating an error has occurred). + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 3243ed4..84af26b 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1129,7 +1129,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change + // Read through the messages on sd and if any indicate that any interface records should + // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. + { +- ssize_t readCount; ++ ssize_t readVal, readCount; + char buff[4096]; + struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; + +@@ -1138,7 +1138,10 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change + // enough to hold all pending data and so avoid message fragmentation. + // (Note that FIONREAD is not supported on AF_NETLINK.) + +- readCount = read(sd, buff, sizeof buff); ++ readVal = read(sd, buff, sizeof buff); ++ if (readVal < 0) return; ++ readCount = readVal; ++ + while (1) + { + // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. +@@ -1154,7 +1157,9 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change + pNLMsg = (struct nlmsghdr*) buff; + + // read more data +- readCount += read(sd, buff + readCount, sizeof buff - readCount); ++ readVal = read(sd, buff + readCount, sizeof buff - readCount); ++ if (readVal < 0) return; ++ readCount += readVal; + continue; // spin around and revalidate with new readCount + } + else +@@ -1429,6 +1434,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void) + int err; + int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + struct sockaddr_in s5353; ++ if (s < 0) return mDNSfalse; + s5353.sin_family = AF_INET; + s5353.sin_port = MulticastDNSPort.NotAnInteger; + s5353.sin_addr.s_addr = 0; +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch b/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch new file mode 100644 index 0000000..d64fb35 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch @@ -0,0 +1,51 @@ +From 19de26db69408f02241e232b39224589a0f630df Mon Sep 17 00:00:00 2001 +From: Nate Karstens +Date: Thu, 10 Aug 2017 08:46:03 -0500 +Subject: [PATCH 11/11] Change a dynamic allocation to file-scope variable + +Changes a variable from being dynamically-allocated to being +statically-allocated at the file scope. Addresses a Coverity +issue where it appeared that the memory was being leaked. + +Upstream-Status: Submitted [dts at apple.com] + +Signed-off-by: Nate Karstens +--- + mDNSPosix/mDNSPosix.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 84af26b..b7795ed 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -91,6 +91,7 @@ static sigset_t gEventSignalSet; // Signals which event loop list + static sigset_t gEventSignals; // Signals which were received while inside loop + + static PosixNetworkInterface *gRecentInterfaces; ++static IfChangeRec gChgRec; + + // *************************************************************************** + // Globals (for debugging) +@@ -1412,16 +1413,11 @@ cleanup: + mDNSlocal mStatus WatchForInterfaceChange(mDNS *const m) + { + mStatus err; +- IfChangeRec *pChgRec; + +- pChgRec = (IfChangeRec*) mDNSPlatformMemAllocate(sizeof *pChgRec); +- if (pChgRec == NULL) +- return mStatus_NoMemoryErr; +- +- pChgRec->mDNS = m; +- err = OpenIfNotifySocket(&pChgRec->NotifySD); ++ gChgRec.mDNS = m; ++ err = OpenIfNotifySocket(&gChgRec.NotifySD); + if (err == 0) +- err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec); ++ err = mDNSPosixAddFDToEventLoop(gChgRec.NotifySD, InterfaceChangeCallback, &gChgRec); + + return err; + } +-- +2.17.1 + diff --git a/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb b/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb index 0178945..a5991bf 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb @@ -11,6 +11,17 @@ RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ + file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch;patchdir=.. \ + file://0002-Create-subroutine-for-tearing-down-an-interface.patch;patchdir=.. \ + file://0003-Track-interface-socket-family.patch;patchdir=.. \ + file://0004-Use-list-for-changed-interfaces.patch;patchdir=.. \ + file://0005-Handle-noisy-netlink-sockets.patch;patchdir=.. \ + file://0006-Remove-unneeded-function.patch;patchdir=.. \ + file://0007-Indicate-loopback-interface-to-mDNS-core.patch;patchdir=.. \ + file://0008-Mark-deleted-interfaces-as-being-changed.patch;patchdir=.. \ + file://0009-Fix-possible-NULL-dereference.patch;patchdir=.. \ + file://0010-Handle-errors-from-socket-calls.patch;patchdir=.. \ + file://0011-Change-a-dynamic-allocation-to-file-scope-variable.patch;patchdir=.. \ " SRC_URI[md5sum] = "aeb92d838a4aa2402ef128ed501484eb" SRC_URI[sha256sum] = "3cc71582e8eee469c2de8ecae1d769e7f32b3468dfb7f2ca77f1dee1f30a7d1e" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 16:44:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 16:44:51 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated: build-appliance-image: Update to zeus head revision Message-ID: <158100749160.30878.5263252245763113191@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. The following commit(s) were added to refs/heads/zeus by this push: new 832588c build-appliance-image: Update to zeus head revision 832588c is described below commit 832588c287d47604d8f717adfed6cc2ecd8c755e Author: Richard Purdie AuthorDate: Thu Feb 6 16:43:57 2020 +0000 build-appliance-image: Update to zeus head revision Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 6c9049f..f071f6c 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "cf0cefd53c5d4f72e26c74571a10e098996a1ff2" +SRCREV ?= "36520aa3829288e561f160f679c06246904591b6" SRC_URI = "git://git.yoctoproject.org/poky;branch=zeus \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:07 +0000 Subject: [oe-commits] [openembedded-core] 01/02: perl: do not install files that contain build host specific data In-Reply-To: <158102940697.10710.11352035213184536151@git.openembedded.org> References: <158102940697.10710.11352035213184536151@git.openembedded.org> Message-ID: <20200206225007.393C4232A22@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa79b60c54202258db251add7f8f3edbc275bbd0 Author: Alexander Kanavin AuthorDate: Thu Feb 6 23:14:38 2020 +0100 perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057..98e3361 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index d4b6bb3..804674e 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -145,6 +145,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:06 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f3add88 -> d34589b) Message-ID: <158102940697.10710.11352035213184536151@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from f3add88 HACK: Attempt to find perl contamination new aa79b60 perl: do not install files that contain build host specific data new d34589b openssl: Fix reproducibility issue The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + meta/recipes-devtools/perl/perl-ptest.inc | 3 ++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 ++ 4 files changed, 39 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:08 +0000 Subject: [oe-commits] [openembedded-core] 02/02: openssl: Fix reproducibility issue In-Reply-To: <158102940697.10710.11352035213184536151@git.openembedded.org> References: <158102940697.10710.11352035213184536151@git.openembedded.org> Message-ID: <20200206225007.47526232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d34589b5975d5eca5e7c3995fe0e613fb64ade65 Author: Richard Purdie AuthorDate: Thu Feb 6 22:47:07 2020 +0000 openssl: Fix reproducibility issue There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000..a24260c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 7fd0f9a..c2ba005 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:18 +0000 Subject: [oe-commits] [bitbake] branch master updated: cooker/toaster: replaced deprecated method warn() with warning() Message-ID: <158102941877.10956.3487783034492390457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new a194f27 cooker/toaster: replaced deprecated method warn() with warning() a194f27 is described below commit a194f275235f22411cb2368f06a44f61ceb6a0f3 Author: Frazer Clews AuthorDate: Tue Jan 14 14:46:06 2020 +0000 cooker/toaster: replaced deprecated method warn() with warning() Removed the deprecated methods as it will only cause problems later on, and since warn() just calls warning(), it shouldn't change anything Signed-off-by: Frazer Clews Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 2 +- lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 8407db8..1124332 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1784,7 +1784,7 @@ class CookerCollectFiles(object): # When constructing an older style single regex, it's possible for BBMASK # to end up beginning with '|', which matches and masks _everything_. if mask.startswith("|"): - collectlog.warn("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) + collectlog.warning("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) mask = mask[1:] try: re.compile(mask) diff --git a/lib/toaster/bldcontrol/management/commands/runbuilds.py b/lib/toaster/bldcontrol/management/commands/runbuilds.py index 50ec409..19f659e 100644 --- a/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/lib/toaster/bldcontrol/management/commands/runbuilds.py @@ -168,17 +168,17 @@ class Command(BaseCommand): try: self.cleanup() except Exception as e: - logger.warn("runbuilds: cleanup exception %s" % str(e)) + logger.warning("runbuilds: cleanup exception %s" % str(e)) try: self.archive() except Exception as e: - logger.warn("runbuilds: archive exception %s" % str(e)) + logger.warning("runbuilds: archive exception %s" % str(e)) try: self.schedule() except Exception as e: - logger.warn("runbuilds: schedule exception %s" % str(e)) + logger.warning("runbuilds: schedule exception %s" % str(e)) def handle(self, **options): pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:23 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (a14631e -> 11cf412) Message-ID: <158102942361.11180.5345495142233141891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard a14631e replaced deprecated method warn() with warning() discard d472a62 fixup discard b247b6e fix2 discard ff45f4e bitbake: siggen: Cache unihash values to avoid cache lookup discard 9523dd1 bitbake: siggen: Optimise get_unihash handling [fixme commit msg] discard ba7c04f runqueue: Possible tid handling optimisation add a194f27 cooker/toaster: replaced deprecated method warn() with warning() new f3ddb5b runqueue: Possible tid handling optimisation new 145f4f5 bitbake: siggen: Optimise get_unihash handling [fixme commit msg] new 367d417 bitbake: siggen: Cache unihash values to avoid cache lookup new 52faf3e fix2 new 11cf412 fixup This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a14631e) \ N -- N -- N refs/heads/master-next (11cf412) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:24 +0000 Subject: [oe-commits] [bitbake] 01/05: runqueue: Possible tid handling optimisation In-Reply-To: <158102942361.11180.5345495142233141891@git.openembedded.org> References: <158102942361.11180.5345495142233141891@git.openembedded.org> Message-ID: <20200206225023.BCCAB232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit f3ddb5b7d2b63885037cf22f6b6bbff2a871f036 Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? References: <158102942361.11180.5345495142233141891@git.openembedded.org> Message-ID: <20200206225023.C7147232A24@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 145f4f503e06554b045db7edb73bd1ec47b3d0c8 Author: Richard Purdie AuthorDate: Thu Dec 12 18:07:14 2019 +0000 bitbake: siggen: Optimise get_unihash handling [fixme commit msg] (Bitbake rev: d81603dd059c254f0b8ac8960330300edcad235f) Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ded1da0..5e66eae 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -44,6 +44,7 @@ class SignatureGenerator(object): self.file_checksum_values = {} self.taints = {} self.unitaskhashes = {} + self.tidtopn = {} self.setscenetasks = set() def finalise(self, fn, d, varient): @@ -79,19 +80,19 @@ class SignatureGenerator(object): return def get_taskdata(self): - return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.setscenetasks) + return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) def set_taskdata(self, data): - self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.setscenetasks = data + self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data def reset(self, data): self.__init__(data) def get_taskhashes(self): - return self.taskhash, self.unitaskhashes + return self.taskhash, self.unitaskhashes, self.tidtopn def set_taskhashes(self, hashes): - self.taskhash, self.unitaskhashes = hashes + self.taskhash, self.unitaskhashes, self.tidtopn = hashes def save_unitaskhashes(self): return @@ -124,9 +125,10 @@ class SignatureGeneratorBasic(SignatureGenerator): else: self.checksum_cache = None - self.unihash_cache = bb.cache.SimpleCache("1") + self.unihash_cache = bb.cache.SimpleCache("3") self.unitaskhashes = self.unihash_cache.init_cache(data, "bb_unihashes.dat", {}) self.localdirsexclude = (data.getVar("BB_SIGNATURE_LOCAL_DIRS_EXCLUDE") or "CVS .bzr .git .hg .osc .p4 .repo .svn").split() + self.tidtopn = {} def init_rundepcheck(self, data): self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None @@ -210,6 +212,9 @@ class SignatureGeneratorBasic(SignatureGenerator): self.runtaskdeps[tid] = [] self.file_checksum_values[tid] = [] recipename = dataCache.pkg_fn[fn] + + self.tidtopn[tid] = recipename + for dep in sorted(deps, key=clean_basepath): (depmc, _, deptaskname, depfn) = bb.runqueue.split_tid_mcfn(dep) if mc != depmc: @@ -407,24 +412,33 @@ class SignatureGeneratorUniHashMixIn(object): self._client = hashserv.create_client(self.server) return self._client - def __get_task_unihash_key(self, tid): - # TODO: The key only *needs* to be the taskhash, the tid is just - # convenient - return '%s:%s' % (tid.rsplit("/", 1)[1], self.taskhash[tid]) - def get_stampfile_hash(self, tid): if tid in self.taskhash: # If a unique hash is reported, use it as the stampfile hash. This # ensures that if a task won't be re-run if the taskhash changes, # but it would result in the same output hash - unihash = self.unitaskhashes.get(self.__get_task_unihash_key(tid), None) + unihash = self._get_unihash(tid) if unihash is not None: return unihash return super().get_stampfile_hash(tid) def set_unihash(self, tid, unihash): - self.unitaskhashes[self.__get_task_unihash_key(tid)] = unihash + key = self.tidtopn[tid] + ":" + bb.runqueue.taskname_from_tid(tid) + self.unitaskhashes[key] = (self.taskhash[tid], unihash) + + def _get_unihash(self, tid, checkkey=None): + if tid not in self.tidtopn: + return None + key = self.tidtopn[tid] + ":" + bb.runqueue.taskname_from_tid(tid) + if key not in self.unitaskhashes: + return None + if not checkkey: + checkkey = self.taskhash[tid] + (key, unihash) = self.unitaskhashes[key] + if key != checkkey: + return None + return unihash def get_unihash(self, tid): taskhash = self.taskhash[tid] @@ -433,11 +447,9 @@ class SignatureGeneratorUniHashMixIn(object): if self.setscenetasks and tid not in self.setscenetasks: return taskhash - key = self.__get_task_unihash_key(tid) - # TODO: This cache can grow unbounded. It probably only needs to keep # for each task - unihash = self.unitaskhashes.get(key, None) + unihash = self._get_unihash(tid) if unihash is not None: return unihash @@ -472,7 +484,7 @@ class SignatureGeneratorUniHashMixIn(object): except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) - self.unitaskhashes[key] = unihash + self.set_unihash(tid, unihash) return unihash def report_unihash(self, path, task, d): @@ -484,13 +496,13 @@ class SignatureGeneratorUniHashMixIn(object): tempdir = d.getVar('T') fn = d.getVar('BB_FILENAME') tid = fn + ':do_' + task - key = tid.rsplit("/", 1)[1] + ':' + taskhash + key = tid + ':' + taskhash if self.setscenetasks and tid not in self.setscenetasks: return # Sanity checks - cache_unihash = self.unitaskhashes.get(key, None) + cache_unihash = self._get_unihash(tid, checkkey=taskhash) if cache_unihash is None: bb.fatal('%s not in unihash cache. Please report this error' % key) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:27 +0000 Subject: [oe-commits] [bitbake] 04/05: fix2 In-Reply-To: <158102942361.11180.5345495142233141891@git.openembedded.org> References: <158102942361.11180.5345495142233141891@git.openembedded.org> Message-ID: <20200206225023.DB3E1232A26@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 52faf3e513fec243e50f484bd88ef57cd18f42ef Author: Richard Purdie AuthorDate: Sun Jan 5 14:04:59 2020 +0000 fix2 Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 36da00d..044ce52 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -513,6 +513,10 @@ class SignatureGeneratorUniHashMixIn(object): if self.setscenetasks and tid not in self.setscenetasks: return + # This can happen if locked sigs are in action. Detect and just abort + if taskhash != self.taskhash[tid]: + return + # Sanity checks cache_unihash = self._get_unihash(tid, checkkey=taskhash) if cache_unihash is None: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:26 +0000 Subject: [oe-commits] [bitbake] 03/05: bitbake: siggen: Cache unihash values to avoid cache lookup In-Reply-To: <158102942361.11180.5345495142233141891@git.openembedded.org> References: <158102942361.11180.5345495142233141891@git.openembedded.org> Message-ID: <20200206225023.D10E0232A25@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 367d41709483de22b9e9ba6f998d7584123450cb Author: Richard Purdie AuthorDate: Sat Dec 14 18:17:01 2019 +0000 bitbake: siggen: Cache unihash values to avoid cache lookup Add unihash cache of values to speed up cache lookup. (Bitbake rev: cb4eba0ff6b5702971a870c5d22bcdf74e015658) Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 5e66eae..36da00d 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -40,6 +40,7 @@ class SignatureGenerator(object): def __init__(self, data): self.basehash = {} self.taskhash = {} + self.unihash = {} self.runtaskdeps = {} self.file_checksum_values = {} self.taints = {} @@ -80,19 +81,19 @@ class SignatureGenerator(object): return def get_taskdata(self): - return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) + return (self.runtaskdeps, self.taskhash, self.unihash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) def set_taskdata(self, data): - self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data + self.runtaskdeps, self.taskhash, self.unihash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data def reset(self, data): self.__init__(data) def get_taskhashes(self): - return self.taskhash, self.unitaskhashes, self.tidtopn + return self.taskhash, self.unihash, self.unitaskhashes, self.tidtopn def set_taskhashes(self, hashes): - self.taskhash, self.unitaskhashes, self.tidtopn = hashes + self.taskhash, self.unihash, self.unitaskhashes, self.tidtopn = hashes def save_unitaskhashes(self): return @@ -108,6 +109,7 @@ class SignatureGeneratorBasic(SignatureGenerator): def __init__(self, data): self.basehash = {} self.taskhash = {} + self.unihash = {} self.taskdeps = {} self.runtaskdeps = {} self.file_checksum_values = {} @@ -256,7 +258,13 @@ class SignatureGeneratorBasic(SignatureGenerator): data = self.basehash[tid] for dep in self.runtaskdeps[tid]: - data = data + self.get_unihash(dep) + if dep in self.unihash: + if self.unihash[dep] is None: + data = data + self.taskhash[dep] + else: + data = data + self.unihash[dep] + else: + data = data + self.get_unihash(dep) for (f, cs) in self.file_checksum_values[tid]: if cs: @@ -426,6 +434,7 @@ class SignatureGeneratorUniHashMixIn(object): def set_unihash(self, tid, unihash): key = self.tidtopn[tid] + ":" + bb.runqueue.taskname_from_tid(tid) self.unitaskhashes[key] = (self.taskhash[tid], unihash) + self.unihash[tid] = unihash def _get_unihash(self, tid, checkkey=None): if tid not in self.tidtopn: @@ -445,12 +454,14 @@ class SignatureGeneratorUniHashMixIn(object): # If its not a setscene task we can return if self.setscenetasks and tid not in self.setscenetasks: + self.unihash[tid] = None return taskhash # TODO: This cache can grow unbounded. It probably only needs to keep # for each task unihash = self._get_unihash(tid) if unihash is not None: + self.unihash[tid] = unihash return unihash # In the absence of being able to discover a unique hash from the @@ -485,6 +496,7 @@ class SignatureGeneratorUniHashMixIn(object): bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) self.set_unihash(tid, unihash) + self.unihash[tid] = unihash return unihash def report_unihash(self, path, task, d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 6 22:50:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Feb 2020 22:50:28 +0000 Subject: [oe-commits] [bitbake] 05/05: fixup In-Reply-To: <158102942361.11180.5345495142233141891@git.openembedded.org> References: <158102942361.11180.5345495142233141891@git.openembedded.org> Message-ID: <20200206225023.E79BC232A27@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 11cf4122dcbbe7e1e9f91af37013007e17984f80 Author: Richard Purdie AuthorDate: Mon Jan 13 17:54:38 2020 +0000 fixup Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 044ce52..ffd8fca 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -432,14 +432,16 @@ class SignatureGeneratorUniHashMixIn(object): return super().get_stampfile_hash(tid) def set_unihash(self, tid, unihash): - key = self.tidtopn[tid] + ":" + bb.runqueue.taskname_from_tid(tid) + (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) + key = mc + ":" + self.tidtopn[tid] + ":" + taskname self.unitaskhashes[key] = (self.taskhash[tid], unihash) self.unihash[tid] = unihash def _get_unihash(self, tid, checkkey=None): if tid not in self.tidtopn: return None - key = self.tidtopn[tid] + ":" + bb.runqueue.taskname_from_tid(tid) + (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) + key = mc + ":" + self.tidtopn[tid] + ":" + taskname if key not in self.unitaskhashes: return None if not checkkey: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:01:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:01:56 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d34589b -> f2333be) Message-ID: <158103371612.10839.12835828535123715471@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from d34589b openssl: Fix reproducibility issue new e26040f iputils: Fix build determinism new eed80f1 libinput: Fix determinism issue new f2333be libgcrypt: Fix determinism issue The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-extended/iputils/iputils_s20190709.bb | 3 +- .../wayland/libinput/determinism.patch | 21 ++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 + .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb | 1 + 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:01:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:01:57 +0000 Subject: [oe-commits] [openembedded-core] 01/03: iputils: Fix build determinism In-Reply-To: <158103371612.10839.12835828535123715471@git.openembedded.org> References: <158103371612.10839.12835828535123715471@git.openembedded.org> Message-ID: <20200207000156.5DFBA232A26@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e26040f54c2180e1eea9959e1d205c2809c62c72 Author: Richard Purdie AuthorDate: Thu Feb 6 23:34:46 2020 +0000 iputils: Fix build determinism The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index a672ccd..e0d2ae1 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -34,7 +34,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:01:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:01:58 +0000 Subject: [oe-commits] [openembedded-core] 02/03: libinput: Fix determinism issue In-Reply-To: <158103371612.10839.12835828535123715471@git.openembedded.org> References: <158103371612.10839.12835828535123715471@git.openembedded.org> Message-ID: <20200207000156.677D8232A27@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eed80f109209d9e91e7c054157492de709bab0a2 Author: Richard Purdie AuthorDate: Thu Feb 6 23:57:28 2020 +0000 libinput: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb index 46d46c5..bc5a76d 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.3.bb @@ -14,6 +14,7 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:01:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:01:59 +0000 Subject: [oe-commits] [openembedded-core] 03/03: libgcrypt: Fix determinism issue In-Reply-To: <158103371612.10839.12835828535123715471@git.openembedded.org> References: <158103371612.10839.12835828535123715471@git.openembedded.org> Message-ID: <20200207000156.7202B232A28@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f2333be5e87fcdc82c352ea6734aaba048772892 Author: Richard Purdie AuthorDate: Thu Feb 6 23:58:46 2020 +0000 libgcrypt: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000..ad0b8c7 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb index 0478557..4e0eb0a 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-Prefetch-GCM-look-up-tables.patch \ file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:29 +0000 Subject: [oe-commits] [openembedded-core] 01/10: kern-tools: tweak symbol_why to be python safe In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.4CDD8232A29@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3e7506bfe53e1fb7360e60cf71636d0ae77b618b Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:44 2020 -0500 kern-tools: tweak symbol_why to be python safe Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6f..57ec1ab 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:28 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f2333be -> da0cdf6) Message-ID: <158103404813.12156.15708050147737228445@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from f2333be libgcrypt: Fix determinism issue new 3e7506b kern-tools: tweak symbol_why to be python safe new aabce12 kern-tools: integrate merge_config fix for gold linker new 3925639 kern-tools-native: use more common S value and oe_runmake new a056d03 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass new d945bd5 kernel-yocto: Drop setting of unused variables in do_kernel_metadata new 41f700c kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set new 6bc2580 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh new a2428c0 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created new 667c31e kernel-yocto: fix defconfig detection in find_sccs() new da0cdf6 kern-tools: fix merge_config when LD contains parameters The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel-yocto.bbclass | 49 +++++++++++++++------- .../kern-tools/kern-tools-native_git.bb | 13 +++--- meta/recipes-kernel/linux/linux-yocto.inc | 21 ---------- 3 files changed, 42 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:30 +0000 Subject: [oe-commits] [openembedded-core] 02/10: kern-tools: integrate merge_config fix for gold linker In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.582BF232A2A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aabce12e87d65b86818e8f8d6f13844c465f6205 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:45 2020 -0500 kern-tools: integrate merge_config fix for gold linker Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1ab..3f9cfe7 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:31 +0000 Subject: [oe-commits] [openembedded-core] 03/10: kern-tools-native: use more common S value and oe_runmake In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.6A806232A2B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3925639d5fc229b17a789e53f1074ef2912175a0 Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:46 2020 -0500 kern-tools-native: use more common S value and oe_runmake Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7..f263421 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:32 +0000 Subject: [oe-commits] [openembedded-core] 04/10: kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.7A805232A2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a056d03e24f5b6e623e2d498ad322597fbdbe733 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:47 2020 -0500 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeaf..a0362f6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946..91df9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:34 +0000 Subject: [oe-commits] [openembedded-core] 06/10: kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.938AD232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41f700c312549979c0a88434f39d859c95c6cfb6 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:49 2020 -0500 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d286..e8a9b1f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:36 +0000 Subject: [oe-commits] [openembedded-core] 08/10: kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.AA321232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a2428c04e05ca1b6dd1bbfef22c39d282a930e3b Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:51 2020 -0500 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d..d961901 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:33 +0000 Subject: [oe-commits] [openembedded-core] 05/10: kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.85BEF232A2D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d945bd5b59a1c8d28e0a3958d26159111feb9e21 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:48 2020 -0500 kernel-yocto: Drop setting of unused variables in do_kernel_metadata The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6..9a4d286 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:37 +0000 Subject: [oe-commits] [openembedded-core] 09/10: kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.B62A1232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 667c31e647df33c23c4b71d88937a5fa85c19143 Author: Gavin Li AuthorDate: Thu Feb 6 12:35:52 2020 -0500 kernel-yocto: fix defconfig detection in find_sccs() The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901..918d101 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:35 +0000 Subject: [oe-commits] [openembedded-core] 07/10: kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.9F066232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6bc258083fbd62f172735e63cb5e97836529467f Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:50 2020 -0500 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', ' [...] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-compo [...] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f..f71aa7d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 00:07:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 00:07:38 +0000 Subject: [oe-commits] [openembedded-core] 10/10: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158103404813.12156.15708050147737228445@git.openembedded.org> References: <158103404813.12156.15708050147737228445@git.openembedded.org> Message-ID: <20200207000728.C02A0232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit da0cdf6e1b8f9110e03be19d31fc7df27a77bea0 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:53 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..31ea425 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 07:30:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 07:30:07 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: libcamera: Bumped to latest source revision Message-ID: <158106060710.18154.12590667583478875130@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 827df06 libcamera: Bumped to latest source revision 827df06 is described below commit 827df06d14d3f572727dfa672cb2247fca6d34be Author: Madhavan Krishnan AuthorDate: Tue Jan 21 08:08:43 2020 +0100 libcamera: Bumped to latest source revision libcamera uses the host machine python instead of sysroot, We use the patch file for libcamera source to use the sysroot python. But libcamera team has fix this issue and, pushed the changes to libcamera source, now we are pointing to that particular source revision of libcamera. In musl, we faced the compilation iisue, so we changed the source revision pointing to the fix of musl compilation issue. Signed-off-by: Khem Raj --- ...n-import-python3-to-use-also-from-sysroot.patch | 61 ---------------------- .../recipes-multimedia/libcamera/libcamera.bb | 5 +- 2 files changed, 2 insertions(+), 64 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch b/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch deleted file mode 100644 index fc56a68..0000000 --- a/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ea47e53911213d71e997eb34848ae72735bacc82 Mon Sep 17 00:00:00 2001 -From: madhavank27 -Date: Thu, 9 Jan 2020 07:42:18 +0100 -Subject: [PATCH] meson: import python3 to use also from sysroot - -importing python module can provide the exact path -which can be used in desktop build as well as from -any build system - -Upstream-Status: Pending -Signed-off-by: madhavank27 ---- - include/libcamera/meson.build | 4 +++- - src/libcamera/meson.build | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build -index 99abf06..83525e2 100644 ---- a/include/libcamera/meson.build -+++ b/include/libcamera/meson.build -@@ -21,13 +21,15 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera') - install_headers(libcamera_api, - subdir : include_dir) - -+python_mod = import('python3').find_python() -+ - gen_controls = files('../../src/libcamera/gen-controls.py') - - control_ids_h = custom_target('control_ids_h', - input : files('../../src/libcamera/control_ids.yaml', 'control_ids.h.in'), - output : 'control_ids.h', - depend_files : gen_controls, -- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'], -+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'], - install : true, - install_dir : join_paths('include', include_dir)) - -diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build -index c4f965b..243935b 100644 ---- a/src/libcamera/meson.build -+++ b/src/libcamera/meson.build -@@ -65,13 +65,15 @@ if libudev.found() - ]) - endif - -+python_mod = import('python3').find_python() -+ - gen_controls = files('gen-controls.py') - - control_ids_cpp = custom_target('control_ids_cpp', - input : files('control_ids.yaml', 'control_ids.cpp.in'), - output : 'control_ids.cpp', - depend_files : gen_controls, -- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@']) -+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@']) - - libcamera_sources += control_ids_cpp - libcamera_sources += control_ids_h --- -2.7.4 - diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index b95bf6d..378f07b 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ - file://0001-meson-import-python3-to-use-also-from-sysroot.patch \ " -SRCREV = "53eab996809e826bc914e4c34c78fe74d86f8dc4" +SRCREV = "b448bfb426067a05d92a51f3ff123898a91ea643" -PV = "201910+git${SRCPV}" +PV = "202002+git${SRCPV}" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:08:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:08:59 +0000 Subject: [oe-commits] [openembedded-core] 01/17: perl: do not install files that contain build host specific data In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080858.E7F41232A2B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8919109f89367ca009cb18543d15b1c893d1620e Author: Alexander Kanavin AuthorDate: Thu Feb 6 23:14:38 2020 +0100 perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057..98e3361 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index d4b6bb3..804674e 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -145,6 +145,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:00 +0000 Subject: [oe-commits] [openembedded-core] 02/17: openssl: Fix reproducibility issue In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080858.F2C19232A2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6c30c95d350a96f049a74d08f305719b1f0e2de0 Author: Richard Purdie AuthorDate: Thu Feb 6 22:47:07 2020 +0000 openssl: Fix reproducibility issue There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000..a24260c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 7fd0f9a..c2ba005 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:01 +0000 Subject: [oe-commits] [openembedded-core] 03/17: iputils: Fix build determinism In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.0D131232A2D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 82f4a8901bd8c5475e99c84ef123c1afd7b1d202 Author: Richard Purdie AuthorDate: Thu Feb 6 23:34:46 2020 +0000 iputils: Fix build determinism The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index a672ccd..e0d2ae1 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -34,7 +34,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:02 +0000 Subject: [oe-commits] [openembedded-core] 04/17: libinput: Fix determinism issue In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.181EE232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b08a5b1dbc345bbec0bd5fae001872d355bfabb Author: Richard Purdie AuthorDate: Thu Feb 6 23:57:28 2020 +0000 libinput: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb index 46d46c5..bc5a76d 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.3.bb @@ -14,6 +14,7 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:08:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:08:58 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (da0cdf6 -> 4794441) Message-ID: <158106293873.3806.12832432504338766064@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard da0cdf6 kern-tools: fix merge_config when LD contains parameters discard 667c31e kernel-yocto: fix defconfig detection in find_sccs() discard a2428c0 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created discard 6bc2580 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh discard 41f700c kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set discard d945bd5 kernel-yocto: Drop setting of unused variables in do_kernel_metadata discard a056d03 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass discard 3925639 kern-tools-native: use more common S value and oe_runmake discard aabce12 kern-tools: integrate merge_config fix for gold linker discard 3e7506b kern-tools: tweak symbol_why to be python safe discard f2333be libgcrypt: Fix determinism issue discard eed80f1 libinput: Fix determinism issue discard e26040f iputils: Fix build determinism discard d34589b openssl: Fix reproducibility issue discard aa79b60 perl: do not install files that contain build host specific data discard f3add88 HACK: Attempt to find perl contamination new 8919109 perl: do not install files that contain build host specific data new 6c30c95 openssl: Fix reproducibility issue new 82f4a89 iputils: Fix build determinism new 3b08a5b libinput: Fix determinism issue new f4ca6bb libgcrypt: Fix determinism issue new ebfcd89 kern-tools: tweak symbol_why to be python safe new 24e2b7a kern-tools: integrate merge_config fix for gold linker new 9c14aac kern-tools-native: use more common S value and oe_runmake new 247aaa7 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass new dc00302 kernel-yocto: Drop setting of unused variables in do_kernel_metadata new d0a0c45 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set new 3811dba kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh new 5c14913 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created new 14baa63 kernel-yocto: fix defconfig detection in find_sccs() new 94fc949 kern-tools: fix merge_config when LD contains parameters new af76095 HACK: Attempt to find perl contamination new 4794441 Revert "HACK: Attempt to find perl contamination" This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (da0cdf6) \ N -- N -- N refs/heads/master-next (4794441) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 17 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 11 ----------- 1 file changed, 11 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:04 +0000 Subject: [oe-commits] [openembedded-core] 06/17: kern-tools: tweak symbol_why to be python safe In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.2EEF5232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ebfcd89f07704cfde012e163e48ca15c9e3385d1 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:44 2020 -0500 kern-tools: tweak symbol_why to be python safe Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6f..57ec1ab 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:06 +0000 Subject: [oe-commits] [openembedded-core] 08/17: kern-tools-native: use more common S value and oe_runmake In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.48CD6232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9c14aacd22a84ba214f60da1902da2f06fe01299 Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:46 2020 -0500 kern-tools-native: use more common S value and oe_runmake Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7..f263421 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:05 +0000 Subject: [oe-commits] [openembedded-core] 07/17: kern-tools: integrate merge_config fix for gold linker In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.3A1A1232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 24e2b7a8955149ada0050e2e02ae48766171a01a Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:45 2020 -0500 kern-tools: integrate merge_config fix for gold linker Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1ab..3f9cfe7 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:08 +0000 Subject: [oe-commits] [openembedded-core] 10/17: kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.662B9232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dc00302c27ec39d96986e9b94f428acc10c061b9 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:48 2020 -0500 kernel-yocto: Drop setting of unused variables in do_kernel_metadata The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6..9a4d286 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:03 +0000 Subject: [oe-commits] [openembedded-core] 05/17: libgcrypt: Fix determinism issue In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.232E1232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f4ca6bb867235d6cc2d3d047d97b44fc4966c2a5 Author: Richard Purdie AuthorDate: Thu Feb 6 23:58:46 2020 +0000 libgcrypt: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000..ad0b8c7 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb index 0478557..4e0eb0a 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-Prefetch-GCM-look-up-tables.patch \ file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:09 +0000 Subject: [oe-commits] [openembedded-core] 11/17: kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.735CF232A2B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d0a0c45a99856cf464e104a3276ba4218e670bfc Author: Paul Barker AuthorDate: Thu Feb 6 12:35:49 2020 -0500 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d286..e8a9b1f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:11 +0000 Subject: [oe-commits] [openembedded-core] 13/17: kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.9251D232A2A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5c14913fad51683cd5489cfa596798af748eb323 Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:51 2020 -0500 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d..d961901 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:07 +0000 Subject: [oe-commits] [openembedded-core] 09/17: kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.57644232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 247aaa7932cc7c42f7283e6d096dba89babb5d9b Author: Paul Barker AuthorDate: Thu Feb 6 12:35:47 2020 -0500 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeaf..a0362f6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946..91df9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:10 +0000 Subject: [oe-commits] [openembedded-core] 12/17: kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.80A1A232A2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3811dbad43aa496ad23f487c01b3ae4aac8c18b6 Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:50 2020 -0500 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', ' [...] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-compo [...] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f..f71aa7d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:12 +0000 Subject: [oe-commits] [openembedded-core] 14/17: kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.A3445232A2D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 14baa63a446fa9618b5d5c8875894216dd323f96 Author: Gavin Li AuthorDate: Thu Feb 6 12:35:52 2020 -0500 kernel-yocto: fix defconfig detection in find_sccs() The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901..918d101 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:14 +0000 Subject: [oe-commits] [openembedded-core] 16/17: HACK: Attempt to find perl contamination In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.C448F232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af760959310bbddef082c6ac29a9b8c854b84450 Author: Richard Purdie AuthorDate: Wed Feb 5 23:47:36 2020 +0000 HACK: Attempt to find perl contamination Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..326c851 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,6 +924,17 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/x86_64-linux/CORE/config.h" in path: + with open(path, "r") as f: + lines = f.readlines() + for l in lines: + if "SIG_SIZE" in l and "36" in l: + bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) + if "I_XLOCALE" in l and l.startswith("#define"): + bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) + if "I_QUADMATH" in l and not l.startswith("#define"): + bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) + return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:15 +0000 Subject: [oe-commits] [openembedded-core] 17/17: Revert "HACK: Attempt to find perl contamination" In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.D5772232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 47944415324c7ffb99a0eac75aa68cf284fd64f3 Author: Richard Purdie AuthorDate: Fri Feb 7 08:08:33 2020 +0000 Revert "HACK: Attempt to find perl contamination" This reverts commit af760959310bbddef082c6ac29a9b8c854b84450. --- meta/classes/insane.bbclass | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 326c851..795c7b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,17 +924,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False - if "/x86_64-linux/CORE/config.h" in path: - with open(path, "r") as f: - lines = f.readlines() - for l in lines: - if "SIG_SIZE" in l and "36" in l: - bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) - if "I_XLOCALE" in l and l.startswith("#define"): - bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) - if "I_QUADMATH" in l and not l.startswith("#define"): - bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) - return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 08:09:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 08:09:13 +0000 Subject: [oe-commits] [openembedded-core] 15/17: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158106293873.3806.12832432504338766064@git.openembedded.org> References: <158106293873.3806.12832432504338766064@git.openembedded.org> Message-ID: <20200207080859.B3D80232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 94fc9496dd53e7ea0e103be0eb24ccbded9ef9ee Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:53 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..31ea425 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:16 +0000 Subject: [oe-commits] [openembedded-core] 01/19: perl: do not install files that contain build host specific data In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131215.C1159232A2B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e290f6c2542884bd0789425f23857bcaadc07a83 Author: Alexander Kanavin AuthorDate: Thu Feb 6 23:14:38 2020 +0100 perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057..98e3361 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 3634122..dcdabb6 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -144,6 +144,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:17 +0000 Subject: [oe-commits] [openembedded-core] 02/19: openssl: Fix reproducibility issue In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131215.CBFB3232A2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 64b7faab5e3e74b06c55c06fb8e44ec6cf46db0b Author: Richard Purdie AuthorDate: Thu Feb 6 22:47:07 2020 +0000 openssl: Fix reproducibility issue There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000..a24260c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 7fd0f9a..c2ba005 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:18 +0000 Subject: [oe-commits] [openembedded-core] 03/19: iputils: Fix build determinism In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131215.D5C1F232A2D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ba34e3ab27c0e50f09bbee4a014cdeb6087d7b5 Author: Richard Purdie AuthorDate: Thu Feb 6 23:34:46 2020 +0000 iputils: Fix build determinism The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index a672ccd..e0d2ae1 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -34,7 +34,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:19 +0000 Subject: [oe-commits] [openembedded-core] 04/19: libinput: Fix determinism issue In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131215.E1877232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 36a814d2aa98b1948923f78c30b129f286a4c741 Author: Richard Purdie AuthorDate: Thu Feb 6 23:57:28 2020 +0000 libinput: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb index 46d46c5..bc5a76d 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.3.bb @@ -14,6 +14,7 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:15 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (4794441 -> bf897ec) Message-ID: <158108113550.12783.17886319274424415929@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 4794441 Revert "HACK: Attempt to find perl contamination" discard af76095 HACK: Attempt to find perl contamination discard 94fc949 kern-tools: fix merge_config when LD contains parameters discard 14baa63 kernel-yocto: fix defconfig detection in find_sccs() discard 5c14913 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created discard 3811dba kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh discard d0a0c45 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set discard dc00302 kernel-yocto: Drop setting of unused variables in do_kernel_metadata discard 247aaa7 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass discard 9c14aac kern-tools-native: use more common S value and oe_runmake discard 24e2b7a kern-tools: integrate merge_config fix for gold linker discard ebfcd89 kern-tools: tweak symbol_why to be python safe discard f4ca6bb libgcrypt: Fix determinism issue discard 3b08a5b libinput: Fix determinism issue discard 82f4a89 iputils: Fix build determinism discard 6c30c95 openssl: Fix reproducibility issue discard 8919109 perl: do not install files that contain build host specific data discard 5a4a054 perl: Fix repro issues (partial) new e290f6c perl: do not install files that contain build host specific data new 64b7faa openssl: Fix reproducibility issue new 2ba34e3 iputils: Fix build determinism new 36a814d libinput: Fix determinism issue new 359032c libgcrypt: Fix determinism issue new 345f562 kern-tools: tweak symbol_why to be python safe new f5439d0 kern-tools: integrate merge_config fix for gold linker new b282407 kern-tools-native: use more common S value and oe_runmake new 407e9a7 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass new b6f08b8 kernel-yocto: Drop setting of unused variables in do_kernel_metadata new 4eadd6b kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set new 17df86d kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh new c9dc482 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created new 930ab1e kernel-yocto: fix defconfig detection in find_sccs() new 65f37bf kern-tools: fix merge_config when LD contains parameters new 2cfd7ad HACK: Attempt to find perl contamination new 12477c2 Revert "HACK: Attempt to find perl contamination" new f06521a perl: Fix repro issues (partial) new bf897ec libevdev: Fix determinism issue This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4794441) \ N -- N -- N refs/heads/master-next (bf897ec) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-devtools/perl/files/fix.patch | 54 ++++++++++++++++++++++ .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:21 +0000 Subject: [oe-commits] [openembedded-core] 06/19: kern-tools: tweak symbol_why to be python safe In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.0446C232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 345f56278340d35d16aad805d9988fef03218487 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:44 2020 -0500 kern-tools: tweak symbol_why to be python safe Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6f..57ec1ab 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:22 +0000 Subject: [oe-commits] [openembedded-core] 07/19: kern-tools: integrate merge_config fix for gold linker In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.0F467232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f5439d0236f305e4b506d04cf14bb298219140d2 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:45 2020 -0500 kern-tools: integrate merge_config fix for gold linker Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1ab..3f9cfe7 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:23 +0000 Subject: [oe-commits] [openembedded-core] 08/19: kern-tools-native: use more common S value and oe_runmake In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.1B160232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b282407a54bc83fb1c28718c596a16b948161504 Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:46 2020 -0500 kern-tools-native: use more common S value and oe_runmake Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7..f263421 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:25 +0000 Subject: [oe-commits] [openembedded-core] 10/19: kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.322A9232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b6f08b85d5578f63496d4775a4c6e21d17d0f294 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:48 2020 -0500 kernel-yocto: Drop setting of unused variables in do_kernel_metadata The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6..9a4d286 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:26 +0000 Subject: [oe-commits] [openembedded-core] 11/19: kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.3D62D232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4eadd6b5dd29bc2536fe1ab598c24eedd6d9979f Author: Paul Barker AuthorDate: Thu Feb 6 12:35:49 2020 -0500 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d286..e8a9b1f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:20 +0000 Subject: [oe-commits] [openembedded-core] 05/19: libgcrypt: Fix determinism issue In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131215.ED052232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 359032c80b3435f58e61d9bf58504474d1d6c66a Author: Richard Purdie AuthorDate: Thu Feb 6 23:58:46 2020 +0000 libgcrypt: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000..ad0b8c7 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb index 0478557..4e0eb0a 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-Prefetch-GCM-look-up-tables.patch \ file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:28 +0000 Subject: [oe-commits] [openembedded-core] 13/19: kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.55151232A2B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c9dc482ee1b32cbab8277b483252b5a63e2151cb Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:51 2020 -0500 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d..d961901 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:24 +0000 Subject: [oe-commits] [openembedded-core] 09/19: kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.273F6232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 407e9a7a0dca278ead3da66b4bc978ce1d89fdbd Author: Paul Barker AuthorDate: Thu Feb 6 12:35:47 2020 -0500 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeaf..a0362f6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946..91df9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:29 +0000 Subject: [oe-commits] [openembedded-core] 14/19: kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.62BD4232A2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 930ab1e1401860e4aa9c44c31d958c2c0fa8faa7 Author: Gavin Li AuthorDate: Thu Feb 6 12:35:52 2020 -0500 kernel-yocto: fix defconfig detection in find_sccs() The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901..918d101 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:27 +0000 Subject: [oe-commits] [openembedded-core] 12/19: kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.49987232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 17df86d5df60f3a98eb81003b4efd81c1e328f0b Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:50 2020 -0500 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', ' [...] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-compo [...] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f..f71aa7d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:32 +0000 Subject: [oe-commits] [openembedded-core] 17/19: Revert "HACK: Attempt to find perl contamination" In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.8AA29232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12477c28809b93c36156f7e7f7a4c75772dfd6ba Author: Richard Purdie AuthorDate: Fri Feb 7 08:08:33 2020 +0000 Revert "HACK: Attempt to find perl contamination" This reverts commit af760959310bbddef082c6ac29a9b8c854b84450. --- meta/classes/insane.bbclass | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 326c851..795c7b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,17 +924,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False - if "/x86_64-linux/CORE/config.h" in path: - with open(path, "r") as f: - lines = f.readlines() - for l in lines: - if "SIG_SIZE" in l and "36" in l: - bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) - if "I_XLOCALE" in l and l.startswith("#define"): - bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) - if "I_QUADMATH" in l and not l.startswith("#define"): - bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) - return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:33 +0000 Subject: [oe-commits] [openembedded-core] 18/19: perl: Fix repro issues (partial) In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.9734F232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f06521ab672ff3208b5510780b35396d7b0e7a83 Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix repro issues (partial) Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/fix.patch | 81 ++++++++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/fix.patch b/meta/recipes-devtools/perl/files/fix.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/fix.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb6..804674e 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://fix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:30 +0000 Subject: [oe-commits] [openembedded-core] 15/19: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.7232C232A2A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 65f37bfceb9e0ad1ee469015d93a7f9de7ffec30 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:53 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..31ea425 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:31 +0000 Subject: [oe-commits] [openembedded-core] 16/19: HACK: Attempt to find perl contamination In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.7F38D232A2D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2cfd7ad9d2885337a6f608e3083ab068fa15d545 Author: Richard Purdie AuthorDate: Wed Feb 5 23:47:36 2020 +0000 HACK: Attempt to find perl contamination Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..326c851 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,6 +924,17 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/x86_64-linux/CORE/config.h" in path: + with open(path, "r") as f: + lines = f.readlines() + for l in lines: + if "SIG_SIZE" in l and "36" in l: + bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) + if "I_XLOCALE" in l and l.startswith("#define"): + bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) + if "I_QUADMATH" in l and not l.startswith("#define"): + bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) + return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:12:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:12:34 +0000 Subject: [oe-commits] [openembedded-core] 19/19: libevdev: Fix determinism issue In-Reply-To: <158108113550.12783.17886319274424415929@git.openembedded.org> References: <158108113550.12783.17886319274424415929@git.openembedded.org> Message-ID: <20200207131216.A526D232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bf897ec8e4785597ec02a1e6017208611fedcefc Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:33:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:33:29 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (bf897ec -> 71a2b61) Message-ID: <158108240921.23551.7662986490246426463@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from bf897ec libevdev: Fix determinism issue new 0f576c9 oeqa: Use cpio 2.13 as testcase new 385afaf oeqa: autoreconf cpio before building new 71a2b61 bison: Upgrade to 3.5.1 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/runtime/cases/buildcpio.py | 4 ++-- meta/lib/oeqa/sdk/cases/buildcpio.py | 5 +++-- meta/lib/oeqa/selftest/cases/meta_ide.py | 4 ++-- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) rename meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} (90%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:33:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:33:31 +0000 Subject: [oe-commits] [openembedded-core] 02/03: oeqa: autoreconf cpio before building In-Reply-To: <158108240921.23551.7662986490246426463@git.openembedded.org> References: <158108240921.23551.7662986490246426463@git.openembedded.org> Message-ID: <20200207133329.891E4232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 385afaf58b72d1fa0da5e61498497d5a7c6e53be Author: Khem Raj AuthorDate: Tue Feb 4 21:41:20 2020 -0800 oeqa: autoreconf cpio before building since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd..9cc261c 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('','autoreconf --force;') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb..ec10149 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) + self._run("cd {source} && autoreconf --force") self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 8091425..46398c7 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('','autoreconf --force;'), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:33:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:33:32 +0000 Subject: [oe-commits] [openembedded-core] 03/03: bison: Upgrade to 3.5.1 In-Reply-To: <158108240921.23551.7662986490246426463@git.openembedded.org> References: <158108240921.23551.7662986490246426463@git.openembedded.org> Message-ID: <20200207133329.9317E232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 71a2b61bc397c0227f735652612acadf4f05a8c3 Author: Khem Raj AuthorDate: Tue Feb 4 17:08:19 2020 -0800 bison: Upgrade to 3.5.1 Minor upgrade on 3.5 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.bb rename to meta/recipes-devtools/bison/bison_3.5.1.bb index 3d8f657..e70252d 100644 --- a/meta/recipes-devtools/bison/bison_3.5.bb +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:33:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:33:30 +0000 Subject: [oe-commits] [openembedded-core] 01/03: oeqa: Use cpio 2.13 as testcase In-Reply-To: <158108240921.23551.7662986490246426463@git.openembedded.org> References: <158108240921.23551.7662986490246426463@git.openembedded.org> Message-ID: <20200207133329.7DE40232A2D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0f576c987be1400ddbd921c0b243f471097ba19a Author: Khem Raj AuthorDate: Tue Feb 4 21:41:19 2020 -0800 oeqa: Use cpio 2.13 as testcase cpio 2.12 was released in 2015 and might have used older autotools which could result in errors like https://bugzilla.yoctoproject.org/show_bug.cgi?id=13779 Bumping to 2.13 will help in matching the tool versions A good change on top would be to run aclocal -I .; autoheader; autoconf; automake --add-missing -c before running configure step perhaps [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 4 ++-- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index f4e871e..4bd72dd 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -12,7 +12,7 @@ class BuildCpioTest(OERuntimeTestCase): @classmethod def setUpClass(cls): - uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.12.tar.gz' + uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.13.tar.gz' cls.project = TargetBuildProject(cls.tc.target, uri, dl_dir = cls.tc.td['DL_DIR']) diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 0a5e68d..b0beafb 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -17,10 +17,10 @@ class BuildCpioTest(OESDKTestCase): """ def test_cpio(self): with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz") + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz") dirs = {} - dirs["source"] = os.path.join(testdir, "cpio-2.12") + dirs["source"] = os.path.join(testdir, "cpio-2.13") dirs["build"] = os.path.join(testdir, "build") dirs["install"] = os.path.join(testdir, "install") diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 03901a2..8091425 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -40,7 +40,7 @@ class MetaIDE(OESelftestTestCase): def test_meta_ide_can_build_cpio_project(self): dl_dir = self.td.get('DL_DIR', None) self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, - "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz", + "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() self.assertEqual(self.project.run_configure(), 0, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 13:54:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 13:54:38 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: qemurunner.py: add try/except for pid handling race Message-ID: <158108367885.5572.17290819584808623924@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new ae07f69 qemurunner.py: add try/except for pid handling race ae07f69 is described below commit ae07f694e490302a4c2b20fa0f1c6d91cba61be8 Author: Trevor Gamblin AuthorDate: Fri Feb 7 08:46:52 2020 -0500 qemurunner.py: add try/except for pid handling race In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. [YOCTO #13675] Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35..4704422 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -406,7 +406,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:27 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ae07f69 -> 358636e) Message-ID: <158108648743.14048.5014356366156519177@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard ae07f69 qemurunner.py: add try/except for pid handling race discard 71a2b61 bison: Upgrade to 3.5.1 discard 385afaf oeqa: autoreconf cpio before building discard 0f576c9 oeqa: Use cpio 2.13 as testcase discard bf897ec libevdev: Fix determinism issue discard f06521a perl: Fix repro issues (partial) new c62e876 oeqa: Use cpio 2.13 as testcase new 9b18f5a oeqa: autoreconf cpio before building new 7f96a8c bison: Upgrade to 3.5.1 new b69c3f8 qemurunner.py: add try/except for pid handling race new 17a637c sudo: specify where target tools are new 95202bb sysvinit: Fix Reproducibility issue new 2b5deaa libevdev: Fix determinism issue new 358636e perl: Fix various reproducibile build issues This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ae07f69) \ N -- N -- N refs/heads/master-next (358636e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + .../recipes-devtools/perl/files/{fix.patch => determinism.patch} | 0 meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 ++++++++- 5 files changed, 11 insertions(+), 3 deletions(-) rename meta/recipes-devtools/perl/files/{fix.patch => determinism.patch} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:30 +0000 Subject: [oe-commits] [openembedded-core] 03/08: bison: Upgrade to 3.5.1 In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144127.B534B232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7f96a8cb819154ff2aadb88ea9bfdcde782a0c12 Author: Khem Raj AuthorDate: Tue Feb 4 17:08:19 2020 -0800 bison: Upgrade to 3.5.1 Minor upgrade on 3.5 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.bb rename to meta/recipes-devtools/bison/bison_3.5.1.bb index 3d8f657..e70252d 100644 --- a/meta/recipes-devtools/bison/bison_3.5.bb +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:29 +0000 Subject: [oe-commits] [openembedded-core] 02/08: oeqa: autoreconf cpio before building In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144127.A9373232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9b18f5a2955c2b65be08a04f6bc45d4eb4324aa3 Author: Khem Raj AuthorDate: Tue Feb 4 21:41:20 2020 -0800 oeqa: autoreconf cpio before building since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd..9cc261c 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('','autoreconf --force;') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb..ec10149 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) + self._run("cd {source} && autoreconf --force") self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 8091425..46398c7 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('','autoreconf --force;'), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:31 +0000 Subject: [oe-commits] [openembedded-core] 04/08: qemurunner.py: add try/except for pid handling race In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144127.C6092232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b69c3f8ebdf64c3bf4b4876b43443294466efbfd Author: Trevor Gamblin AuthorDate: Fri Feb 7 08:46:52 2020 -0500 qemurunner.py: add try/except for pid handling race In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. [YOCTO #13675] Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35..4704422 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -406,7 +406,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:28 +0000 Subject: [oe-commits] [openembedded-core] 01/08: oeqa: Use cpio 2.13 as testcase In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144127.9D682232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c62e87654e0cfbac9e3a596d6a6c8887b35e8a70 Author: Khem Raj AuthorDate: Tue Feb 4 21:41:19 2020 -0800 oeqa: Use cpio 2.13 as testcase cpio 2.12 was released in 2015 and might have used older autotools which could result in errors like https://bugzilla.yoctoproject.org/show_bug.cgi?id=13779 Bumping to 2.13 will help in matching the tool versions A good change on top would be to run aclocal -I .; autoheader; autoconf; automake --add-missing -c before running configure step perhaps [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 4 ++-- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index f4e871e..4bd72dd 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -12,7 +12,7 @@ class BuildCpioTest(OERuntimeTestCase): @classmethod def setUpClass(cls): - uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.12.tar.gz' + uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.13.tar.gz' cls.project = TargetBuildProject(cls.tc.target, uri, dl_dir = cls.tc.td['DL_DIR']) diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 0a5e68d..b0beafb 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -17,10 +17,10 @@ class BuildCpioTest(OESDKTestCase): """ def test_cpio(self): with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz") + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz") dirs = {} - dirs["source"] = os.path.join(testdir, "cpio-2.12") + dirs["source"] = os.path.join(testdir, "cpio-2.13") dirs["build"] = os.path.join(testdir, "build") dirs["install"] = os.path.join(testdir, "install") diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 03901a2..8091425 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -40,7 +40,7 @@ class MetaIDE(OESelftestTestCase): def test_meta_ide_can_build_cpio_project(self): dl_dir = self.td.get('DL_DIR', None) self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, - "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz", + "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() self.assertEqual(self.project.run_configure(), 0, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:32 +0000 Subject: [oe-commits] [openembedded-core] 05/08: sudo: specify where target tools are In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144127.D6F11232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 17a637cf7c48a14e65a63be0e24e300abd39347c Author: Ross Burton AuthorDate: Fri Feb 7 14:29:28 2020 +0000 sudo: specify where target tools are sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 67815fa..3b314dd 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb index 6ea06a9..9d014d2 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -13,8 +13,15 @@ SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:33 +0000 Subject: [oe-commits] [openembedded-core] 06/08: sysvinit: Fix Reproducibility issue In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144127.E5EDC232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 95202bb4f52105f87008f60b45aa6fa7dc65fb24 Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 2b146b1..349ea71 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -29,6 +29,7 @@ B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:35 +0000 Subject: [oe-commits] [openembedded-core] 08/08: perl: Fix various reproducibile build issues In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144128.0E60D232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 358636e98435a937ced0c72c724db495e87c9d01 Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb6..5d76271 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:41:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:41:34 +0000 Subject: [oe-commits] [openembedded-core] 07/08: libevdev: Fix determinism issue In-Reply-To: <158108648743.14048.5014356366156519177@git.openembedded.org> References: <158108648743.14048.5014356366156519177@git.openembedded.org> Message-ID: <20200207144128.00ABA232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2b5deaaacb55e4dce76c67319389a8624a7c91f8 Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:31 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (358636e -> 807d23b) Message-ID: <158108721142.20124.6856909633871155036@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 358636e perl: Fix various reproducibile build issues discard 2b5deaa libevdev: Fix determinism issue discard 95202bb sysvinit: Fix Reproducibility issue discard 17a637c sudo: specify where target tools are discard b69c3f8 qemurunner.py: add try/except for pid handling race discard 7f96a8c bison: Upgrade to 3.5.1 discard 9b18f5a oeqa: autoreconf cpio before building discard c62e876 oeqa: Use cpio 2.13 as testcase discard 12477c2 Revert "HACK: Attempt to find perl contamination" discard 2cfd7ad HACK: Attempt to find perl contamination discard 65f37bf kern-tools: fix merge_config when LD contains parameters new c200949 HACK: Attempt to find perl contamination new d8a159b Revert "HACK: Attempt to find perl contamination" new cfd11e8 oeqa: Use cpio 2.13 as testcase new e83d510 oeqa: autoreconf cpio before building new 84c7ad7 bison: Upgrade to 3.5.1 new 7b9d3d6 qemurunner.py: add try/except for pid handling race new 4ced340 sudo: specify where target tools are new 16fc52a sysvinit: Fix Reproducibility issue new d461d3f libevdev: Fix determinism issue new 08f4a2f perl: Fix various reproducibile build issues new 807d23b kern-tools: fix merge_config when LD contains parameters This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (358636e) \ N -- N -- N refs/heads/master-next (807d23b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:32 +0000 Subject: [oe-commits] [openembedded-core] 01/11: HACK: Attempt to find perl contamination In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.92DCD232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c2009498c610bb40017ab4c8a4a417950914125a Author: Richard Purdie AuthorDate: Wed Feb 5 23:47:36 2020 +0000 HACK: Attempt to find perl contamination Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..326c851 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,6 +924,17 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False + if "/x86_64-linux/CORE/config.h" in path: + with open(path, "r") as f: + lines = f.readlines() + for l in lines: + if "SIG_SIZE" in l and "36" in l: + bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) + if "I_XLOCALE" in l and l.startswith("#define"): + bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) + if "I_QUADMATH" in l and not l.startswith("#define"): + bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) + return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:33 +0000 Subject: [oe-commits] [openembedded-core] 02/11: Revert "HACK: Attempt to find perl contamination" In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.9D026232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d8a159b8ac9f802b9863cbeb33f1216a839d749c Author: Richard Purdie AuthorDate: Fri Feb 7 08:08:33 2020 +0000 Revert "HACK: Attempt to find perl contamination" This reverts commit af760959310bbddef082c6ac29a9b8c854b84450. --- meta/classes/insane.bbclass | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 326c851..795c7b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -924,17 +924,6 @@ def package_qa_check_host_user(path, name, d, elf, messages): if stat.st_gid == check_gid: package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid)) return False - if "/x86_64-linux/CORE/config.h" in path: - with open(path, "r") as f: - lines = f.readlines() - for l in lines: - if "SIG_SIZE" in l and "36" in l: - bb.error("Fatal sigize 36 found for %s (%s)" % (path, l)) - if "I_XLOCALE" in l and l.startswith("#define"): - bb.error("Fatal xlocale header found for %s (%s)" % (path, l)) - if "I_QUADMATH" in l and not l.startswith("#define"): - bb.error("Fatal quadmath header not found for %s (%s)" % (path, l)) - return True QARECIPETEST[src-uri-bad] = "package_qa_check_src_uri" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:35 +0000 Subject: [oe-commits] [openembedded-core] 04/11: oeqa: autoreconf cpio before building In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.B664F232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e83d5109efdef0034e9a9455892a1ec6815f2678 Author: Khem Raj AuthorDate: Tue Feb 4 21:41:20 2020 -0800 oeqa: autoreconf cpio before building since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd..9cc261c 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('','autoreconf --force;') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb..ec10149 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) + self._run("cd {source} && autoreconf --force") self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 8091425..46398c7 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('','autoreconf --force;'), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:34 +0000 Subject: [oe-commits] [openembedded-core] 03/11: oeqa: Use cpio 2.13 as testcase In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.AA70C232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cfd11e83534ce91ac172b0811bb68c7fc3665c03 Author: Khem Raj AuthorDate: Tue Feb 4 21:41:19 2020 -0800 oeqa: Use cpio 2.13 as testcase cpio 2.12 was released in 2015 and might have used older autotools which could result in errors like https://bugzilla.yoctoproject.org/show_bug.cgi?id=13779 Bumping to 2.13 will help in matching the tool versions A good change on top would be to run aclocal -I .; autoheader; autoconf; automake --add-missing -c before running configure step perhaps [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 4 ++-- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index f4e871e..4bd72dd 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -12,7 +12,7 @@ class BuildCpioTest(OERuntimeTestCase): @classmethod def setUpClass(cls): - uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.12.tar.gz' + uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.13.tar.gz' cls.project = TargetBuildProject(cls.tc.target, uri, dl_dir = cls.tc.td['DL_DIR']) diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 0a5e68d..b0beafb 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -17,10 +17,10 @@ class BuildCpioTest(OESDKTestCase): """ def test_cpio(self): with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz") + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz") dirs = {} - dirs["source"] = os.path.join(testdir, "cpio-2.12") + dirs["source"] = os.path.join(testdir, "cpio-2.13") dirs["build"] = os.path.join(testdir, "build") dirs["install"] = os.path.join(testdir, "install") diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 03901a2..8091425 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -40,7 +40,7 @@ class MetaIDE(OESelftestTestCase): def test_meta_ide_can_build_cpio_project(self): dl_dir = self.td.get('DL_DIR', None) self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, - "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz", + "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() self.assertEqual(self.project.run_configure(), 0, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:36 +0000 Subject: [oe-commits] [openembedded-core] 05/11: bison: Upgrade to 3.5.1 In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.C4821232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 84c7ad7d79184b22d1bf0e51ba43e88634779802 Author: Khem Raj AuthorDate: Tue Feb 4 17:08:19 2020 -0800 bison: Upgrade to 3.5.1 Minor upgrade on 3.5 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.bb rename to meta/recipes-devtools/bison/bison_3.5.1.bb index 3d8f657..e70252d 100644 --- a/meta/recipes-devtools/bison/bison_3.5.bb +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:37 +0000 Subject: [oe-commits] [openembedded-core] 06/11: qemurunner.py: add try/except for pid handling race In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.D1450232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7b9d3d688bbbb1d07ff91a8f8cc53a4ec6895de8 Author: Trevor Gamblin AuthorDate: Fri Feb 7 08:46:52 2020 -0500 qemurunner.py: add try/except for pid handling race In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. [YOCTO #13675] Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35..4704422 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -406,7 +406,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:38 +0000 Subject: [oe-commits] [openembedded-core] 07/11: sudo: specify where target tools are In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145331.DFB63232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4ced340ff6e71d020353e9abd448184f7abeb0be Author: Ross Burton AuthorDate: Fri Feb 7 14:29:28 2020 +0000 sudo: specify where target tools are sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 67815fa..3b314dd 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb index 6ea06a9..9d014d2 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -13,8 +13,15 @@ SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:39 +0000 Subject: [oe-commits] [openembedded-core] 08/11: sysvinit: Fix Reproducibility issue In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145332.061D4232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 16fc52a5894d1768aaa3914e8d4e46eaa01bf250 Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 2b146b1..349ea71 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -29,6 +29,7 @@ B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:41 +0000 Subject: [oe-commits] [openembedded-core] 10/11: perl: Fix various reproducibile build issues In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145332.20980232A2F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 08f4a2f0ffeb2e8cc68f4c5ed098ec26e37cb9f8 Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb6..5d76271 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:40 +0000 Subject: [oe-commits] [openembedded-core] 09/11: libevdev: Fix determinism issue In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145332.12A57232A2E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d461d3f69c0bc28436d6b05042a7c69a35dd3c07 Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 14:53:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 14:53:42 +0000 Subject: [oe-commits] [openembedded-core] 11/11: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158108721142.20124.6856909633871155036@git.openembedded.org> References: <158108721142.20124.6856909633871155036@git.openembedded.org> Message-ID: <20200207145332.31843232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 807d23b4eff1ea8de993cc2528d8961b717034ff Author: Bruce Ashfield AuthorDate: Fri Feb 7 09:52:04 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..44863ad 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 15:05:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 15:05:54 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (827df06 -> dda2962) Message-ID: <158108795419.26996.13752023905246835260@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 827df06 libcamera: Bumped to latest source revision This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master-next (dda2962) \ O -- O -- O (827df06) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ...n-import-python3-to-use-also-from-sysroot.patch | 61 ++++++++++++++++++++++ .../recipes-multimedia/libcamera/libcamera.bb | 5 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 15:42:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 15:42:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: ncurses: Fix reproducibility issue Message-ID: <158109012531.11851.13821047093013178128@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new c80062c ncurses: Fix reproducibility issue c80062c is described below commit c80062ca6c9eb52a6782e8810ef63c43c8efb417 Author: Richard Purdie AuthorDate: Fri Feb 7 15:09:48 2020 +0000 ncurses: Fix reproducibility issue The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35..b7bf4c0 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:14 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (c80062c -> fe0ddc3) Message-ID: <158109901435.9213.16135972493629272231@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard c80062c ncurses: Fix reproducibility issue discard 807d23b kern-tools: fix merge_config when LD contains parameters discard 08f4a2f perl: Fix various reproducibile build issues discard d461d3f libevdev: Fix determinism issue discard 16fc52a sysvinit: Fix Reproducibility issue discard 4ced340 sudo: specify where target tools are discard 7b9d3d6 qemurunner.py: add try/except for pid handling race discard 84c7ad7 bison: Upgrade to 3.5.1 discard e83d510 oeqa: autoreconf cpio before building new 12aa0bc bison: Upgrade to 3.5.1 new 59953d4 qemurunner.py: add try/except for pid handling race new 3491249 sudo: specify where target tools are new 6340d87 sysvinit: Fix Reproducibility issue new afb0419 libevdev: Fix determinism issue new b305acf perl: Fix various reproducibile build issues new 696e8fc kern-tools: fix merge_config when LD contains parameters new fe0ddc3 ncurses: Fix reproducibility issue This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c80062c) \ N -- N -- N refs/heads/master-next (fe0ddc3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 - meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:15 +0000 Subject: [oe-commits] [openembedded-core] 01/08: bison: Upgrade to 3.5.1 In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.8A824232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12aa0bcbebb35ac860b277fdf3db1f5dfdff68df Author: Khem Raj AuthorDate: Tue Feb 4 17:08:19 2020 -0800 bison: Upgrade to 3.5.1 Minor upgrade on 3.5 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.bb rename to meta/recipes-devtools/bison/bison_3.5.1.bb index 3d8f657..e70252d 100644 --- a/meta/recipes-devtools/bison/bison_3.5.bb +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:16 +0000 Subject: [oe-commits] [openembedded-core] 02/08: qemurunner.py: add try/except for pid handling race In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.95890232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59953d42239a5875bd7937c9a48a02c96759e639 Author: Trevor Gamblin AuthorDate: Fri Feb 7 08:46:52 2020 -0500 qemurunner.py: add try/except for pid handling race In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. [YOCTO #13675] Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35..4704422 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -406,7 +406,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:17 +0000 Subject: [oe-commits] [openembedded-core] 03/08: sudo: specify where target tools are In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.A1DB0232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3491249bda40eb35b29429e79d389bd0a9c8437e Author: Ross Burton AuthorDate: Fri Feb 7 14:29:28 2020 +0000 sudo: specify where target tools are sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 67815fa..3b314dd 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb index 6ea06a9..9d014d2 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -13,8 +13,15 @@ SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:18 +0000 Subject: [oe-commits] [openembedded-core] 04/08: sysvinit: Fix Reproducibility issue In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.AC760232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6340d871de99155aea82af92d8bafe5ec61e4ae7 Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 2b146b1..349ea71 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -29,6 +29,7 @@ B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:22 +0000 Subject: [oe-commits] [openembedded-core] 08/08: ncurses: Fix reproducibility issue In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.DC9B6232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fe0ddc3440622edb5b9f1ab3ef41737f2b5eea5e Author: Richard Purdie AuthorDate: Fri Feb 7 15:09:48 2020 +0000 ncurses: Fix reproducibility issue The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35..b7bf4c0 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:20 +0000 Subject: [oe-commits] [openembedded-core] 06/08: perl: Fix various reproducibile build issues In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.C528F232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b305acfbd36b03774135e3d24b66004886c3b66f Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb6..5d76271 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:19 +0000 Subject: [oe-commits] [openembedded-core] 05/08: libevdev: Fix determinism issue In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.B8B22232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit afb0419bc835cc367559802bd7866b06102f839c Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 18:10:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 18:10:21 +0000 Subject: [oe-commits] [openembedded-core] 07/08: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158109901435.9213.16135972493629272231@git.openembedded.org> References: <158109901435.9213.16135972493629272231@git.openembedded.org> Message-ID: <20200207181014.D13CD232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 696e8fc13c12ac50565c7ff4bced9a0f30648f92 Author: Bruce Ashfield AuthorDate: Fri Feb 7 09:52:04 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..44863ad 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:53 +0000 Subject: [oe-commits] [openembedded-core] 04/16: package.bbclass: Fix debug source processing for static libraries In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.4E7F7232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 671be79687d538e75f920f066d931e7e467d9098 Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:06 2020 -0600 package.bbclass: Fix debug source processing for static libraries Format of the sources list is the [ (file, [source, ...]), ... ] before this change, the static libraries were processed but the items were included incorrectly causing no sources for static libraries to be included. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ef3de35..46ec9b6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1051,7 +1051,7 @@ python split_and_strip_files () { if debugsrcdir and not targetos.startswith("mingw"): for file in staticlibs: - results.extend(source_info(file, d, fatal=False)) + results.append( (file, source_info(file, d, fatal=False)) ) sources = set() for r in results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:49 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (fe0ddc3 -> e5c2067) Message-ID: <158111674981.11546.8656731558477143451@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from fe0ddc3 ncurses: Fix reproducibility issue new 392f6dd cryptodev: update to Jan.23, 2020 new b1a9300 xserver-xorg: upgrade 1.20.6 -> 1.20.7 new 15163bc chkconfig: remove the recipe new 671be79 package.bbclass: Fix debug source processing for static libraries new 0310f25 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs new 83caf46 package.bbclass: Support stripping and debug copy of static libraries new 1346e32 pciutils: upgrade 3.6.2 -> 3.6.4 new b62bd73 qemu: Upgrade to 4.2.0 new d46f846 mesa: upgrade 19.3.1 -> 19.3.3 new 9bfb29d sstate.bbclass: fix issue while handling long sstate filenames new 62a2f4a python3: fix the installation path of libpython3.7m.a for multilib new 02848bc python3: Do not hardcode "lib" for distutils new b82e236 procps: upgrade 3.3.15 -> 3.3.16 new 9d24982 lighttpd: upgrade 1.4.54 -> 1.4.55 new 252016e dhcp: upgrade 4.4.1 -> 4.4.2 new e5c2067 systemd: upgrade 243.4 -> 244.1 The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 2 +- meta/classes/package.bbclass | 80 ++++- meta/classes/sstate.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- meta/conf/distro/include/maintainers.inc | 2 - meta/conf/distro/include/tcmode-default.inc | 2 +- .../{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 +- .../dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ---- ...d-includes-of-new-BIND9-compatibility-hea.patch | 79 ----- .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- .../packagegroups/packagegroup-self-hosted.bb | 1 - ...systemd-boot_243.4.bb => systemd-boot_244.1.bb} | 0 ...systemd-conf_243.2.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...t-install-dependency-links-at-install-tim.patch | 33 +- ...01-do-not-disable-buffer-in-writing-files.patch | 168 +++++---- .../0002-don-t-use-glibc-specific-qsort_r.patch | 26 +- ...src-login-brightness.c-include-sys-wait.h.patch | 8 +- ...pper-instead-of-looking-for-relative-opti.patch | 63 ---- ...0003-implment-systemd-sysv-install-for-OE.patch | 10 +- ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 37 +- .../0003-src-basic-copy.c-include-signal.h.patch | 12 +- ...llback-parse_printf_format-implementation.patch | 29 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 10 +- ...asic-missing.h-check-for-missing-strndupa.patch | 381 ++++++++++++++++----- .../systemd/0006-Include-netinet-if_ether.h.patch | 101 ++++-- ...-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 +- .../0008-add-missing-FTW_-macros-for-musl.patch | 10 +- ...-of-__register_atfork-for-non-glibc-build.patch | 14 +- .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 22 +- ....c-Disable-tests-for-missing-typedefs-in-.patch | 15 +- ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 +- ...c-compatible-basename-for-non-glibc-syste.patch | 18 +- ...ble-buffering-when-writing-to-oom_score_a.patch | 9 +- ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 14 +- ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 10 +- ...ing_type.h-add-__compar_d_fn_t-definition.patch | 10 +- ...id-redefinition-of-prctl_mm_map-structure.patch | 10 +- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 10 +- .../systemd/0024-test-json.c-define-M_PIl.patch | 12 +- .../systemd/{systemd_243.4.bb => systemd_244.1.bb} | 2 +- .../python3/0001-configure.ac-fix-LIBPL.patch | 35 ++ ...python3-Do-not-hardcode-lib-for-distutils.patch | 43 +++ meta/recipes-devtools/python/python3_3.8.1.bb | 6 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 6 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 +- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 +- ...1-fix-libcap-header-issue-on-some-distro.patch} | 0 ...0011-linux-user-remove-host-stime-syscall.patch | 61 ---- ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 ------ .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 .../chkconfig-alternatives-native_1.3.59.bb | 44 --- .../chkconfig/chkconfig/replace_caddr_t.patch | 33 -- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 71 ---- .../{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 +- .../procps/0001-Fix-out-of-tree-builds.patch | 24 -- .../procps/{procps_3.3.15.bb => procps_3.3.16.bb} | 5 +- .../mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} | 0 .../mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} | 4 +- ...rmmode_display.c-add-missing-mi.h-include.patch | 23 ++ ...erver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 +- meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- ...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 ---- 76 files changed, 913 insertions(+), 1077 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} (92%) delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch rename meta/recipes-connectivity/dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} (74%) rename meta/recipes-core/systemd/{systemd-boot_243.4.bb => systemd-boot_244.1.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_243.2.bb => systemd-conf_244.1.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch rename meta/recipes-core/systemd/{systemd_243.4.bb => systemd_244.1.bb} (99%) create mode 100644 meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch create mode 100644 meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0011-fix-libcap-header-issue-on-some-distro.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) delete mode 100644 meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb delete mode 100644 meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb rename meta/recipes-extended/lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} (96%) delete mode 100644 meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch rename meta/recipes-extended/procps/{procps_3.3.15.bb => procps_3.3.16.bb} (93%) rename meta/recipes-graphics/mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} (88%) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (71%) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:52 +0000 Subject: [oe-commits] [openembedded-core] 03/16: chkconfig: remove the recipe In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.4549C232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 15163bc1522e9d0c80de931e2780312cb3034c8a Author: Alexander Kanavin AuthorDate: Fri Feb 7 20:45:59 2020 +0100 chkconfig: remove the recipe chkconfig is one of the options for virtual/update-alternatives, however opkg-utils have been used as the default for a very long time, while chkconfig isn't anymore tested in any way, and is stuck at a very old version due to newer versions requiring selinux. [YOCTO #11264] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 - .../packagegroups/packagegroup-self-hosted.bb | 1 - .../chkconfig-alternatives-native_1.3.59.bb | 44 -------------- .../chkconfig/chkconfig/replace_caddr_t.patch | 33 ---------- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 71 ---------------------- 5 files changed, 151 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a80e85a..c68e9ed 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal " RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ccache = "Robert Yang " RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ea6d567..9a70b18 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ RDEPENDS_packagegroup-self-hosted-extended = "\ bzip2 \ - chkconfig \ chrpath \ cpio \ curl \ diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb deleted file mode 100644 index 87fa8eb..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb +++ /dev/null @@ -1,44 +0,0 @@ -require recipes-extended/chkconfig/chkconfig_1.3.58.bb - -SUMMARY = "${SUMMARY_chkconfig-alternatives}" -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" -DEPENDS = "" -PROVIDES += "virtual/update-alternatives-native" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -# The sysroot branch is 1.3.59 + some git commits from master + --sysroot -# support for alternatives. -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" -S = "${WORKDIR}/git" -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" - -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" -PV = "1.3.59+${SRCPV}" - -inherit native - -# We want our native recipes to build using the target paths rather than paths -# into the sysroot, as we may use them to construct the rootfs. As such, we -# only adjust the paths to match the metadata for the target, not native. -obey_variables () { - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c -} - -do_compile () { - oe_runmake alternatives -} - -do_install () { - install -d ${D}${sysconfdir}/alternatives \ - ${D}${localstatedir}/lib/alternatives - - install -D -m 0755 alternatives ${D}${bindir}/alternatives - install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 - - ln -s alternatives ${D}${bindir}/update-alternatives - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 -} - -do_install_append_linuxstdbase() { - rm -rf ${D}${libdir}/lsb -} diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch deleted file mode 100644 index 96d1938..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -caddr_t is a legacy BSD type which was rejected by the POSIX standard. -Use void * instead. - -sys/unitstd.h is not needed and moreover its not available on all C library -implementations e.g. musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Index: chkconfig-1.3.58/alternatives.c -=================================================================== ---- chkconfig-1.3.58.orig/alternatives.c -+++ chkconfig-1.3.58/alternatives.c -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - - #define FLAGS_TEST (1 << 0) -Index: chkconfig-1.3.58/leveldb.c -=================================================================== ---- chkconfig-1.3.58.orig/leveldb.c -+++ chkconfig-1.3.58/leveldb.c -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name - fstat(fd, &sb); - - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); -- if (bufstart == ((caddr_t) -1)) { -+ if (bufstart == ((void*) -1)) { - close(fd); - return -1; - } diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb deleted file mode 100644 index d21dd69..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" -DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ -information for system services. Chkconfig manipulates the numerous \ -symbolic links in /etc/rc.d, to relieve system administrators of some \ -of the drudgery of manually editing the symbolic links." - -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" - -HOMEPAGE = "https://github.com/fedora-sysv" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -DEPENDS = "libnewt popt" -PROVIDES += "virtual/update-alternatives" - -PR = "r7" - -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" - -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ - file://replace_caddr_t.patch \ - " - -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit gettext - -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS -# -EXTRA_OEMAKE = "\ - 'RPM_OPT_FLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'BINDIR=${base_sbindir}' \ - 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' \ - 'ALTDIR=${localstatedir}/lib/alternatives' \ - 'ALTDATADIR=${sysconfdir}/alternatives' \ -" - -do_unpack[postfuncs] += "obey_variables" -do_unpack[vardeps] += "obey_variables" -obey_variables () { - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ - -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c -} - -do_install() { - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ - 'BINDIR=${sbindir}' install - install -d ${D}${sysconfdir}/chkconfig.d -} - -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ -information about the symbolic links comprising the alternatives system." -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" -DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ -This package contains documentation." -RPROVIDES_${PN}-alternatives += "update-alternatives" -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" -FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ - ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ - ${mandir}/man8/update-alternatives.8" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:51 +0000 Subject: [oe-commits] [openembedded-core] 02/16: xserver-xorg: upgrade 1.20.6 -> 1.20.7 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.3C71B232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b1a93008ab36d6d9df98958badb4b959ccc68c32 Author: Alexander Kanavin AuthorDate: Fri Feb 7 20:45:58 2020 +0100 xserver-xorg: upgrade 1.20.6 -> 1.20.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...rmmode_display.c-add-missing-mi.h-include.patch | 23 ++++++++++++++++++++++ ...erver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 ++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch new file mode 100644 index 0000000..4b8e43f --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch @@ -0,0 +1,23 @@ +From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 7 Feb 2020 20:36:45 +0100 +Subject: [PATCH] drmmode_display.c: add missing mi.h include + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +index e18cc37..3445cce 100644 +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c ++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -46,6 +46,7 @@ + #include "xf86Crtc.h" + #include "drmmode_display.h" + #include "present.h" ++#include "mi.h" + + #include + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb similarity index 71% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb index a1cd490..998b98a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb @@ -1,12 +1,13 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ - file://pkgconfig.patch \ - file://0001-test-xtest-Initialize-array-with-braces.patch \ - file://sdksyms-no-build-path.patch \ - " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" + file://pkgconfig.patch \ + file://0001-test-xtest-Initialize-array-with-braces.patch \ + file://sdksyms-no-build-path.patch \ + file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ + " +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:50 +0000 Subject: [oe-commits] [openembedded-core] 01/16: cryptodev: update to Jan.23, 2020 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.31F84232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 392f6dd77764ab6200325fd240a7eed2d9deef3a Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 6 12:57:43 2020 -0800 cryptodev: update to Jan.23, 2020 * Remove backported patches: 0001-Fix-module-loading-with-Linux-v5.0-rc5.patch Update to latest cryptodev dated Jan.23, 2020. Fixes build on kernel v5.5+ Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- ...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 ---------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 9d8ba44..f99f8bc 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -4,9 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \ - file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \ " -SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29" +SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch deleted file mode 100644 index 34ec872..0000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c] - -Backport patch from upstream to fix module cryptodev loading error. - -Signed-off-by: Kai Kang - -From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001 -From: "Derald D. Woods" -Date: Sun, 10 Feb 2019 13:22:19 -0600 -Subject: [PATCH] Fix module loading with Linux v5.0-rc5 - -This commit fixes this module load error: -[...] -[ 29.112091] cryptodev: loading out-of-tree module taints kernel. -[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter -[...] - -Upstream Linux support for unused GIVCIPHER, and others, was dropped here: - -c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators) - -Signed-off-by: Derald D. Woods ---- - cryptlib.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/cryptlib.c b/cryptlib.c -index 6e66698..4a87037 100644 ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -38,7 +38,9 @@ - #include "cryptodev_int.h" - #include "cipherapi.h" - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) - extern const struct crypto_type crypto_givcipher_type; -+#endif - - static void cryptodev_complete(struct crypto_async_request *req, int err) - { -@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) - tfm = crypto_skcipher_tfm(out->async.s); -- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) || -- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) { -+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) -+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) -+#endif -+ ) { - struct ablkcipher_alg *alg; - - alg = &tfm->__crt_alg->cra_ablkcipher; --- -2.20.0 - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:54 +0000 Subject: [oe-commits] [openembedded-core] 05/16: package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.58762232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0310f25e69c9acafb96a7c6634768ac322c54599 Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:07 2020 -0600 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs Change the order of the skip processing to happen before any .ko and static library processing. This will allow these types of files to be individually skipped if necessary. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 46ec9b6..7080d63 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -955,12 +955,6 @@ python split_and_strip_files () { for root, dirs, files in cpath.walk(dvar): for f in files: file = os.path.join(root, f) - if file.endswith(".ko") and file.find("/lib/modules/") != -1: - kernmods.append(file) - continue - if oe.package.is_static_lib(file): - staticlibs.append(file) - continue # Skip debug files if debugappend and file.endswith(debugappend): @@ -971,6 +965,13 @@ python split_and_strip_files () { if file in skipfiles: continue + if file.endswith(".ko") and file.find("/lib/modules/") != -1: + kernmods.append(file) + continue + if oe.package.is_static_lib(file): + staticlibs.append(file) + continue + try: ltarget = cpath.realpath(file, dvar, False) s = cpath.lstat(ltarget) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:56 +0000 Subject: [oe-commits] [openembedded-core] 07/16: pciutils: upgrade 3.6.2 -> 3.6.4 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.6BC71232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1346e32021d9f9e2b4218394308664ae04f3ab29 Author: Wang Mingyu AuthorDate: Fri Feb 7 12:27:55 2020 -0800 pciutils: upgrade 3.6.2 -> 3.6.4 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb similarity index 92% rename from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb rename to meta/recipes-bsp/pciutils/pciutils_3.6.4.bb index 413421c..034bb63 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82" -SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" +SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" +SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" inherit multilib_header pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:55 +0000 Subject: [oe-commits] [openembedded-core] 06/16: package.bbclass: Support stripping and debug copy of static libraries In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.63006232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 83caf46895760b7e2e1320f6c8acabb891c48a41 Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:08 2020 -0600 package.bbclass: Support stripping and debug copy of static libraries By default, we won't copy and strip static libraries. However, this functionality can be useful in some cases where people are doing development on the target, and don't generally want the larger debug capable static libraries. To enable the new functionality set: PACKAGE_DEBUG_STATIC_SPLIT = '1' Add a new function splitstaticdebuginfo. Thus function will copy the unmodified static library into the specific debug directory location. By keeping an unmodified version, it is possible for a user trying to debug something to use -L /usr/lib/.debug-static and their existing build commands to switch from stripped to full debug versions. The PACKAGE_DEBUG_SPLIT_STYLE will select between two different approaches, /usr/lib/debug-static or /.debug-static. Additionally you can now choose to strip static libraries to conserve space. If either 'PACKAGE_DEBUG_STATIC_SPLIT' or 'PACKAGE_STRIP_STATIC' is set to 1, the static library will be stripped. (This is not on by default, as it could make diagnosing static library usage difficult in some cases.) Add to insane.bbclass a skip to the staticdev warning for the specific -dbg package versions. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- meta/classes/package.bbclass | 67 ++++++++++++++++++++++++++++++++++++++++++-- meta/conf/bitbake.conf | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..7425b8c 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -182,7 +182,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages): libgcc.a, libgcov.a will be skipped in their packages """ - if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a"): + if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a") and not '/usr/lib/debug-static/' in path and not '/.debug-static/' in path: package_qa_add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7080d63..1efc396 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -416,6 +416,49 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, return (file, sources) +def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d): + # Unlike the function above, there is no way to split a static library + # two components. So to get similar results we will copy the unmodified + # static library (containing the debug symbols) into a new directory. + # We will then strip (preserving symbols) the static library in the + # typical location. + # + # return a mapping of files:debugsources + + import stat + import shutil + + src = file[len(dvar):] + dest = debugstaticlibdir + os.path.dirname(src) + debugstaticdir + "/" + os.path.basename(src) + debugstaticappend + debugfile = dvar + dest + sources = [] + + # Copy the file... + bb.utils.mkdirhier(os.path.dirname(debugfile)) + #bb.note("Copy %s -> %s" % (file, debugfile)) + + dvar = d.getVar('PKGD') + + newmode = None + if not os.access(file, os.W_OK) or os.access(file, os.R_OK): + origmode = os.stat(file)[stat.ST_MODE] + newmode = origmode | stat.S_IWRITE | stat.S_IREAD + os.chmod(file, newmode) + + # We need to extract the debug src information here... + if debugsrcdir: + sources = source_info(file, d) + + bb.utils.mkdirhier(os.path.dirname(debugfile)) + + # Copy the unmodified item to the debug directory + shutil.copy2(file, debugfile) + + if newmode: + os.chmod(file, origmode) + + return (file, sources) + def copydebugsources(debugsrcdir, sources, d): # The debug src information written out to sourcefile is further processed # and copied to the destination here. @@ -916,25 +959,37 @@ python split_and_strip_files () { if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory': # Single debug-file-directory style debug info debugappend = ".debug" + debugstaticappend = "" debugdir = "" + debugstaticdir = "" debuglibdir = "/usr/lib/debug" + debugstaticlibdir = "/usr/lib/debug-static" debugsrcdir = "/usr/src/debug" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-without-src': # Original OE-core, a.k.a. ".debug", style debug info, but without sources in /usr/src/debug debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg': debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" else: # Original OE-core, a.k.a. ".debug", style debug info debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" # @@ -1051,8 +1106,11 @@ python split_and_strip_files () { results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) if debugsrcdir and not targetos.startswith("mingw"): - for file in staticlibs: - results.append( (file, source_info(file, d, fatal=False)) ) + if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d)) + else: + for file in staticlibs: + results.append( (file,source_info(file, d)) ) sources = set() for r in results: @@ -1121,6 +1179,9 @@ python split_and_strip_files () { sfiles.append((file, elf_file, strip)) for f in kernmods: sfiles.append((f, 16, strip)) + if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + for f in staticlibs: + sfiles.append((f, 16, strip)) oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d) @@ -1188,7 +1249,7 @@ python populate_packages () { dir = os.sep for f in (files + dirs): path = "." + os.path.join(dir, f) - if "/.debug/" in path or path.endswith("/.debug"): + if "/.debug/" in path or "/.debug-static/" in path or path.endswith("/.debug"): debug.append(path) for pkg in packages: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8b4621f..954c06b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -325,7 +325,7 @@ FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a" SECTION_${PN}-staticdev = "devel" RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" -FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" +FILES_${PN}-dbg = "/usr/lib/debug /usr/lib/debug-static /usr/src/debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:58 +0000 Subject: [oe-commits] [openembedded-core] 09/16: mesa: upgrade 19.3.1 -> 19.3.3 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.7EE9F232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d46f846f382e840e864344ae350d227e25e591b7 Author: Wang Mingyu AuthorDate: Thu Feb 6 11:02:54 2020 -0800 mesa: upgrade 19.3.1 -> 19.3.3 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.1.bb b/meta/recipes-graphics/mesa/mesa_19.3.3.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa_19.3.3.bb index b889f09..7e0c5d6 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.1.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.3.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "5c5965db31993af47fee82c9a7ccba5e" -SRC_URI[sha256sum] = "cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4eb8274723e033beae59" +SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" +SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:59 +0000 Subject: [oe-commits] [openembedded-core] 10/16: sstate.bbclass: fix issue while handling long sstate filenames In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.8836B232A39@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9bfb29d5b8b3139ccffb7ed7bb5da495a0c46abf Author: Jaewon Lee AuthorDate: Thu Feb 6 13:45:11 2020 -0800 sstate.bbclass: fix issue while handling long sstate filenames When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Using '//' instead to do the division to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 > components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..0beeb33 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators - avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 + avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3 components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:06:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:06:03 +0000 Subject: [oe-commits] [openembedded-core] 14/16: lighttpd: upgrade 1.4.54 -> 1.4.55 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.AB822232A3D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9d24982457f49728a7fa47c3dc5306a5acd20651 Author: Wang Mingyu AuthorDate: Thu Feb 6 06:52:26 2020 -0800 lighttpd: upgrade 1.4.54 -> 1.4.55 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb similarity index 96% rename from meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb rename to meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb index 20ce698..7a255ce 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb @@ -19,8 +19,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "7abc776243c811e9872f73ab38b7f8b5" -SRC_URI[sha256sum] = "cf14cce2254a96d8fcb6d3181e1a3c29a8f832531c3e86ff6f2524ecda9a8721" +SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" +SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:06:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:06:02 +0000 Subject: [oe-commits] [openembedded-core] 13/16: procps: upgrade 3.3.15 -> 3.3.16 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.A2B44232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b82e236cf397cc7a807a170d46103fc089590e44 Author: Yi Zhao AuthorDate: Thu Feb 6 19:18:12 2020 +0800 procps: upgrade 3.3.15 -> 3.3.16 Drop 0001-Fix-out-of-tree-builds.patch since it has been merged upstream. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../procps/0001-Fix-out-of-tree-builds.patch | 24 ---------------------- .../procps/{procps_3.3.15.bb => procps_3.3.16.bb} | 5 ++--- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index e548194..0000000 --- a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Apr 2018 14:09:45 +0300 -Subject: [PATCH] Fix out of tree builds - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - include/nls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/nls.h b/include/nls.h -index 1166b7b..f5abe05 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -6,7 +6,7 @@ - #define PROCPS_NG_NLS_H - - /* programs issuing textdomain() need PACKAGE string */ --#include "../config.h" -+#include "config.h" - - /* programs issuing bindtextdomain() also need LOCALEDIR string */ - #ifndef LOCALEDIR diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.16.bb similarity index 93% rename from meta/recipes-extended/procps/procps_3.3.15.bb rename to meta/recipes-extended/procps/procps_3.3.16.bb index 17abd96..60f9097 100644 --- a/meta/recipes-extended/procps/procps_3.3.15.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -14,11 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ file://sysctl.conf \ - file://0001-Fix-out-of-tree-builds.patch \ " -SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" -SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" +SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" +SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" S = "${WORKDIR}/procps-ng-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:05:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:05:57 +0000 Subject: [oe-commits] [openembedded-core] 08/16: qemu: Upgrade to 4.2.0 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.75A18232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b62bd734b16e217daa9731d9e3cd3e24eac004d1 Author: Alistair Francis AuthorDate: Fri Feb 7 13:10:08 2020 -0800 qemu: Upgrade to 4.2.0 While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 6 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +-- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 ++- ...1-fix-libcap-header-issue-on-some-distro.patch} | 0 ...0011-linux-user-remove-host-stime-syscall.patch | 61 ------------ ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 --------------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 20 files changed, 53 insertions(+), 228 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5a..23f2ce9 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43..c04297c 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0011-fix-libcap-header-issue-on-some-distro.patch \ + file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060..deca13a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102..66ff996 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd5..7f7da51 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68..012d60d 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab4..bc30397 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a736815..ec30337 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a423855..0810ae8 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2..89baad9 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25..30bb4dd 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d94..7e273ee 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7da..34df78b 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0011-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0011-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be..0000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e4..0000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:06:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:06:00 +0000 Subject: [oe-commits] [openembedded-core] 11/16: python3: fix the installation path of libpython3.7m.a for multilib In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.90D6C232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 62a2f4ae15b548f9ab570db06889687779346b31 Author: Changqing Li AuthorDate: Fri Feb 7 14:07:43 2020 +0800 python3: fix the installation path of libpython3.7m.a for multilib Fix the installation path of libpython3.7m.a on mulitlib lib64 platform to lib64 instead of lib Signed-off-by: Li Zhou Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- .../python3/0001-configure.ac-fix-LIBPL.patch | 35 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 5 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch new file mode 100644 index 0000000..123ce3a --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch @@ -0,0 +1,35 @@ +From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:36:25 +0800 +Subject: [PATCH] configure.ac: fix LIBPL + +Use LIBDIR rather than prefix/lib, so that it would work when lib64. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Robert Yang +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce04258..915f475 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4532,9 +4532,9 @@ fi + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) + if test x$PLATFORM_TRIPLET = x; then +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" + else +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + fi + AC_SUBST(LIBPL) + +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index a71c207..981b52e 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -29,6 +29,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ + file://0001-configure.ac-fix-LIBPL.patch \ " SRC_URI_append_class-native = " \ @@ -174,7 +175,7 @@ py_package_preprocess () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config @@ -322,7 +323,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv" # package libpython3 PACKAGES =+ "libpython3 libpython3-staticdev" FILES_libpython3 = "${libdir}/libpython*.so.*" -FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" +FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:06:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:06:01 +0000 Subject: [oe-commits] [openembedded-core] 12/16: python3: Do not hardcode "lib" for distutils In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.9A411232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 02848bcae54b25a37ad86879e86a8d1efd29d7ae Author: Changqing Li AuthorDate: Fri Feb 7 14:07:44 2020 +0800 python3: Do not hardcode "lib" for distutils Get the sys.lib from python3 itself and do not use hardcoded value of 'lib' for distutils. Solve the error below that occurs when run "python3 setup.py install" on lib64 multilib platform: [Errno 2] No such file or directory: '/usr/lib/python3.7/site-packages/test-easy-install-1828.write-test' Signed-off-by: Li Zhou Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- ...python3-Do-not-hardcode-lib-for-distutils.patch | 43 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 44 insertions(+) diff --git a/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch new file mode 100644 index 0000000..fe031b9 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch @@ -0,0 +1,43 @@ +From bb711b53f10d32a90a27ccf4b0dc51e4a701d862 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:42:09 +0800 +Subject: [PATCH] python3: Do not hardcode "lib" for distutils + +Get the sys.lib from python3 itself and do not use +hardcoded value of 'lib' for distutils. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + Lib/distutils/command/install.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index c625c95..8e32f54 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -19,6 +19,8 @@ from site import USER_BASE + from site import USER_SITE + HAS_USER_SITE = True + ++libname = sys.lib ++ + WINDOWS_SCHEME = { + 'purelib': '$base/Lib/site-packages', + 'platlib': '$base/Lib/site-packages', +@@ -29,8 +31,8 @@ WINDOWS_SCHEME = { + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/' + libname + '/python$py_version_short/site-packages', ++ 'platlib': '$platbase/' + libname + '/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 981b52e..c836066 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -30,6 +30,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ + file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:06:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:06:04 +0000 Subject: [oe-commits] [openembedded-core] 15/16: dhcp: upgrade 4.4.1 -> 4.4.2 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.B5360232A3E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 252016e32e68364a66f2e1b6423cbeceb6662ad3 Author: Wang Mingyu AuthorDate: Thu Feb 6 06:53:22 2020 -0800 dhcp: upgrade 4.4.1 -> 4.4.2 0001-Fix-a-NSUPDATE-compiling-issue.patch 0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch Removed since they are included in 4.4.2. refresh the following patch: 0004-Fix-out-of-tree-builds.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ------------------- ...d-includes-of-new-BIND9-compatibility-hea.patch | 79 ---------------------- .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- 4 files changed, 6 insertions(+), 153 deletions(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch deleted file mode 100644 index f12a112..0000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Tue, 14 May 2019 11:07:15 +0200 -Subject: [PATCH] Fix a NSUPDATE compiling issue - -Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] - -A following error was observed when NSUPDATE is not defined: -| omapip/isclib.c: In function 'dns_client_init': -| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| if (dhcp_gbl_ctx.dnsclient == NULL) { -| ^ -| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| &dhcp_gbl_ctx.dnsclient, -| ^ -| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4' -| (dhcp_gbl_ctx.use_local4 ? -| ^ -| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr' -| &dhcp_gbl_ctx.local4_sockaddr -| ^ -| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6' -| (dhcp_gbl_ctx.use_local6 ? -| ^ -| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr' -| &dhcp_gbl_ctx.local6_sockaddr - -Fix it by adding NSUPDATE conditional checking. - -Signed-off-by: Ming Liu ---- - includes/omapip/isclib.h | 2 ++ - omapip/isclib.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 538b927..6c20584 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -141,6 +141,8 @@ void isclib_cleanup(void); - void dhcp_signal_handler(int signal); - extern int shutdown_signal; - -+#if defined (NSUPDATE) - isc_result_t dns_client_init(); -+#endif - - #endif /* ISCLIB_H */ -diff --git a/omapip/isclib.c b/omapip/isclib.c -index db3b895..ce4b4a1 100644 ---- a/omapip/isclib.c -+++ b/omapip/isclib.c -@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) { - } - } - -+#if defined (NSUPDATE) - isc_result_t dns_client_init() { - isc_result_t result; - if (dhcp_gbl_ctx.dnsclient == NULL) { -@@ -387,3 +388,4 @@ isc_result_t dns_client_init() { - - return ISC_R_SUCCESS; - } -+#endif --- -2.7.4 - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch deleted file mode 100644 index 1bc1422..0000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [master] Added includes of new BIND9 compatibility headers - - Merges in rt48072. - -Upstream-Status: Backport -Signed-off-by: Adrian Bunk - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch index b71c93d..7b57730 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch @@ -85,9 +85,11 @@ Index: dhcp-4.4.1/relay/Makefile.am =================================================================== --- dhcp-4.4.1.orig/relay/Makefile.am +++ dhcp-4.4.1/relay/Makefile.am -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ + SUBDIRS = . tests + -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes - + sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb similarity index 74% rename from meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb rename to meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb index 020777b..b56a204 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb @@ -9,13 +9,11 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat file://0009-remove-dhclient-script-bash-dependency.patch \ file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ file://0013-fixup_use_libbind.patch \ - file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ - file://0001-Fix-a-NSUPDATE-compiling-issue.patch \ file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \ " -SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" -SRC_URI[sha256sum] = "2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608" +SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" +SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" LDFLAGS_append = " -pthread" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 7 23:06:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Feb 2020 23:06:05 +0000 Subject: [oe-commits] [openembedded-core] 16/16: systemd: upgrade 243.4 -> 244.1 In-Reply-To: <158111674981.11546.8656731558477143451@git.openembedded.org> References: <158111674981.11546.8656731558477143451@git.openembedded.org> Message-ID: <20200207230550.C4981232A3F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e5c2067a5027204e4c47068160ec616294b1a1d7 Author: Alex Kiernan AuthorDate: Thu Feb 6 16:48:13 2020 +0000 systemd: upgrade 243.4 -> 244.1 Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.4.bb => systemd-boot_244.1.bb} | 0 ...systemd-conf_243.2.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...t-install-dependency-links-at-install-tim.patch | 33 +- ...01-do-not-disable-buffer-in-writing-files.patch | 168 +++++---- .../0002-don-t-use-glibc-specific-qsort_r.patch | 26 +- ...src-login-brightness.c-include-sys-wait.h.patch | 8 +- ...pper-instead-of-looking-for-relative-opti.patch | 63 ---- ...0003-implment-systemd-sysv-install-for-OE.patch | 10 +- ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 37 +- .../0003-src-basic-copy.c-include-signal.h.patch | 12 +- ...llback-parse_printf_format-implementation.patch | 29 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 10 +- ...asic-missing.h-check-for-missing-strndupa.patch | 381 ++++++++++++++++----- .../systemd/0006-Include-netinet-if_ether.h.patch | 101 ++++-- ...-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 +- .../0008-add-missing-FTW_-macros-for-musl.patch | 10 +- ...-of-__register_atfork-for-non-glibc-build.patch | 14 +- .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 22 +- ....c-Disable-tests-for-missing-typedefs-in-.patch | 15 +- ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 +- ...c-compatible-basename-for-non-glibc-syste.patch | 18 +- ...ble-buffering-when-writing-to-oom_score_a.patch | 9 +- ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 14 +- ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 10 +- ...ing_type.h-add-__compar_d_fn_t-definition.patch | 10 +- ...id-redefinition-of-prctl_mm_map-structure.patch | 10 +- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 10 +- .../systemd/0024-test-json.c-define-M_PIl.patch | 12 +- .../systemd/{systemd_243.4.bb => systemd_244.1.bb} | 2 +- 30 files changed, 659 insertions(+), 431 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.4.bb b/meta/recipes-core/systemd/systemd-boot_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.4.bb rename to meta/recipes-core/systemd/systemd-boot_244.1.bb diff --git a/meta/recipes-core/systemd/systemd-conf_243.2.bb b/meta/recipes-core/systemd/systemd-conf_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_243.2.bb rename to meta/recipes-core/systemd/systemd-conf_244.1.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 2fca6dc..8c05a96 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,10 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" -SRCBRANCH = "v243-stable" +SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" -PV = "243.4+git${SRCPV}" - S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index ea37680..6eaaec7 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,8 +1,8 @@ -From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001 +From c73a87871df31b4f8d96c9d443759c6f702935f6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] binfmt: Don't install dependency links at install time for + the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service. @@ -18,16 +18,17 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- units/meson.build | 6 ++---- units/proc-sys-fs-binfmt_misc.automount | 3 +++ units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build +diff --git a/units/meson.build b/units/meson.build +index 6a3a0d0dea22..bbb1b78618c3 100644 +--- a/units/meson.build ++++ b/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +49,10 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 30a6bc991844..4231f3b70fe9 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,11 +60,11 @@ Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index 0c0f26451b67..763c4c466c16 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index d6d68a0..f1c7181 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 +From f4a0caaea346b70cf5064f9159a53a1b8020071e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -18,8 +18,9 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray + --- - src/basic/cgroup-util.c | 14 +++++++------- + src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- src/basic/smack-util.c | 2 +- src/basic/util.c | 2 +- @@ -31,25 +32,19 @@ Signed-off-by: Scott Murray src/login/logind-dbus.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- + src/shared/cgroup-setup.c | 4 ++-- src/shared/sysctl-util.c | 2 +- - src/sleep/sleep.c | 10 +++++----- + src/sleep/sleep.c | 8 ++++---- src/udev/udevadm-trigger.c | 2 +- src/udev/udevd.c | 2 +- src/vconsole/vconsole-setup.c | 2 +- - 17 files changed, 36 insertions(+), 36 deletions(-) + 18 files changed, 35 insertions(+), 35 deletions(-) +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index a5141f4cbedd..04c06e7a55cb 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co - - xsprintf(c, PID_FMT "\n", pid); - -- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, c, 0); - if (r < 0) - return r; - -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char +@@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -58,7 +53,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char +@@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -67,7 +62,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha +@@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -76,7 +71,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha +@@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -85,7 +80,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control +@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -94,18 +89,11 @@ Signed-off-by: Scott Murray } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -@@ -2697,7 +2697,7 @@ int cg_enable_everywhere( - return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); - } - -- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_stream(f, s, 0); - if (r < 0) { - log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", - FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index da7e836f143e..2138f20bcc03 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -121,9 +109,11 @@ Signed-off-by: Scott Murray if (r < 0) { uint64_t threads_max; +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index da9a2139d31a..5e91f5b8f5d9 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -132,9 +122,11 @@ Signed-off-by: Scott Murray if (r < 0) return r; +diff --git a/src/basic/util.c b/src/basic/util.c +index 2b3b3918a32f..aff8d0fcd473 100644 --- a/src/basic/util.c +++ b/src/basic/util.c -@@ -294,7 +294,7 @@ void disable_coredumps(void) { +@@ -267,7 +267,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; @@ -143,9 +135,11 @@ Signed-off-by: Scott Murray if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } +diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c +index 7ff844c78c3a..5c5721d7c2f7 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) +@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); @@ -154,7 +148,7 @@ Signed-off-by: Scott Murray } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) +@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); @@ -163,7 +157,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); -@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { +@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ @@ -172,9 +166,11 @@ Signed-off-by: Scott Murray STRV_FOREACH(f, files) { k = apply_file(*f, true); +diff --git a/src/core/main.c b/src/core/main.c +index c24b696b1663..195be7d2df0d 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -183,7 +179,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -192,9 +188,11 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } +diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c +index 4427397f2715..8aeb5c829513 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) +@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL @@ -216,6 +214,8 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif +diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c +index 17e7cd1a009b..87a766771663 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -227,9 +227,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; +diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c +index f35612fe12bc..20351bf7fa70 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -238,9 +240,11 @@ Signed-off-by: Scott Murray if (r < 0) { if (r == -ELOOP) return -EINVAL; +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 69b59948786f..b4973c596d48 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd +@@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; @@ -249,9 +253,11 @@ Signed-off-by: Scott Murray } return 0; +diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c +index f5048d9473cb..b6383ab5c97e 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -260,9 +266,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 873a76596f0b..4e496548bb94 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { +@@ -2425,7 +2425,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -271,7 +279,7 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3633,13 +3633,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -287,9 +295,33 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); +diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c +index e8398cbde5ba..ba682ec0c9e7 100644 +--- a/src/shared/cgroup-setup.c ++++ b/src/shared/cgroup-setup.c +@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { + + xsprintf(c, PID_FMT "\n", pid); + +- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, c, 0); + if (r < 0) + return r; + +@@ -817,7 +817,7 @@ int cg_enable_everywhere( + return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); + } + +- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_stream(f, s, 0); + if (r < 0) { + log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", + FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c +index 12fb3ef7ea0e..132ac847c091 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con +@@ -87,7 +87,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c log_debug("Setting '%s' to '%s'", p, value); @@ -298,35 +330,29 @@ Signed-off-by: Scott Murray } int sysctl_read(const char *property, char **content) { +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index 89b80367f8f4..33dbb21364d0 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info +@@ -45,7 +45,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + assert(hibernate_location->swap); + assert(hibernate_location->resume); - /* if it's a swap partition, we just write the disk to /sys/power/resume */ - if (streq(type, "partition")) { -- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); - -@@ -98,14 +98,14 @@ static int write_hibernate_location_info +- r = write_string_file("/sys/power/resume", hibernate_location->resume, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", hibernate_location->resume, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", + hibernate_location->swap->device, hibernate_location->resume); +@@ -72,7 +72,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + } - offset = fiemap->fm_extents[0].fe_physical / page_size(); - xsprintf(offset_str, "%" PRIu64, offset); + xsprintf(offset_str, "%" PRIu64, hibernate_location->resume_offset); - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume_offset", offset_str, 0); if (r < 0) - return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); - - log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str); - - xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); -- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device_str, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write device '%s': %m", device_str); - -@@ -121,7 +121,7 @@ static int write_mode(char **modes) { + return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", + hibernate_location->swap->device, offset_str); +@@ -89,7 +89,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; @@ -335,7 +361,7 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** +@@ -108,7 +108,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; @@ -344,9 +370,11 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); +diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c +index 60c68b5029cf..fdca03d3d42c 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se if (!filename) return log_oom(); @@ -355,9 +383,11 @@ Signed-off-by: Scott Murray if (r < 0) { bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 7678331897f5..6871cde7aa65 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi +@@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -366,9 +396,11 @@ Signed-off-by: Scott Murray if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; +diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c +index 9d706085fb47..30dcfa86f4d0 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na +@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index c6213ab..6b85ff0 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 +From 49501c80d32c1bc5ecb07f40c324feb82af0b057 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH 02/24] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,14 +10,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- - src/basic/sort-util.h | 14 -------------- - src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- - src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/basic/sort-util.h | 14 ------------ + src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- + src/shared/format-table.c | 36 ++++++++++++++++++++---------- 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f8646e..27d68b341c 100644 +index e029f8646eb0..27d68b341cf3 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn @@ -39,7 +40,7 @@ index e029f8646e..27d68b341c 100644 - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c -index c83575c7c8..72f8f3a050 100644 +index c83575c7c876..72f8f3a05048 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.c +++ b/src/libsystemd/sd-hwdb/hwdb-util.c @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { @@ -83,10 +84,10 @@ index c83575c7c8..72f8f3a050 100644 } diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index a5c0a99b08..d595cbe372 100644 +index 4617ae8badc4..17d6b9616256 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c -@@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t +@@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -130,7 +131,7 @@ index a5c0a99b08..d595cbe372 100644 } /* Order identical lines by the order there were originally added in */ -@@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { +@@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -144,7 +145,7 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) -@@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { +@@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -158,6 +159,3 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch index dcae668..ba7424d 100644 --- a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch @@ -1,4 +1,7 @@ -Include sys/wait.h +From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include sys/wait.h Fixes: src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? @@ -8,12 +11,13 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/login/logind-brightness.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index 8dfa97d7ae..bddd4a2727 100644 +index 3f4b65e1fdf1..5af7e3d5ce3f 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch deleted file mode 100644 index 49a334d..0000000 --- a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 27 Jun 2018 16:09:24 +0800 -Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option - for ln - -Remove file manually to avoid the 'File Exists' error when creating -symlink. This is because the original 'ln' command uses '-f' option. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - meson.build | 4 ---- - tools/meson-make-symlink.sh | 3 ++- - units/meson-add-wants.sh | 7 ++++++- - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index e5ceb1e169..79b762faeb 100644 ---- a/meson.build -+++ b/meson.build -@@ -579,10 +579,6 @@ endforeach - - conf.set_quoted('TELINIT', get_option('telinit-path')) - --if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative (added in coreutils 8.16)') --endif -- - ############################################################ - - gperf = find_program('gperf') -diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh -index da0d13a341..90bc0a93c2 100755 ---- a/tools/meson-make-symlink.sh -+++ b/tools/meson-make-symlink.sh -@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" - if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" - else -- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -+ rm -f "${DESTDIR:-}$2" -+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" - fi -diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh -index a483d75b86..3c01c523f1 100755 ---- a/units/meson-add-wants.sh -+++ b/units/meson-add-wants.sh -@@ -25,4 +25,9 @@ case "$target" in - ;; - esac - --ln -vfs --relative "$unitpath" "$dir" -+if [ -d "$dir" ]; then -+ rm -f "$dir/$unit" -+ lnr "$unitpath" "$dir/$unit" -+else -+ lnr "$unitpath" "$dir" -+fi diff --git a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch index 6695d56..c620478 100644 --- a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch @@ -1,7 +1,7 @@ -From 47864989388bcd04d647ecf618ad7e260399dbb6 Mon Sep 17 00:00:00 2001 +From f9078501a1495c9991431d1435d081cd2e830328 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 5 Sep 2015 06:31:47 +0000 -Subject: [PATCH 3/5] implment systemd-sysv-install for OE +Subject: [PATCH] implment systemd-sysv-install for OE Use update-rc.d for enabling/disabling and status command to check the status of the sysv service @@ -9,12 +9,13 @@ to check the status of the sysv service Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj + --- src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON -index 8c16cf9..9f078a1 100755 +index 8c16cf99913f..9f078a121469 100755 --- a/src/systemctl/systemd-sysv-install.SKELETON +++ b/src/systemctl/systemd-sysv-install.SKELETON @@ -32,17 +32,17 @@ case "$1" in @@ -38,6 +39,3 @@ index 8c16cf9..9f078a1 100755 ;; *) usage ;; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 2e39f7a..1404895 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,24 +1,28 @@ -From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 +From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +[Rebased for v244] Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- src/basic/missing_type.h | 9 +++++++++ src/basic/sort-util.h | 1 + + src/core/kmod-setup.c | 1 + src/journal/catalog.c | 1 + - 3 files changed, 11 insertions(+) + 4 files changed, 12 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b..2134fe5095 100644 +index bf8a6caa1b46..c487e65e7bde 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -35,29 +39,38 @@ index bf8a6caa1b..2134fe5095 100644 +typedef int (*__compar_fn_t)(const void *, const void *); +#endif diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f86..7247d40 100644 +index 27d68b341cf3..307ea4ac0e8e 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ #include #include "macro.h" -+#include "missing.h" ++#include "missing_type.h" void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *arg); +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 128674327362..09ccd613e32c 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -10,6 +10,7 @@ + #include "kmod-setup.h" + #include "macro.h" + #include "string-util.h" ++#include "missing_type.h" + + #if HAVE_KMOD + #include "module-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 7beffc1e1a..4818a2e5cc 100644 +index 70b2c8b46c4e..d574a64586f1 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c -@@ -29,6 +29,7 @@ +@@ -28,6 +28,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_type.h" const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch index 7ee0d48..538a99c 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch @@ -1,4 +1,7 @@ -Include signal.h +From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include signal.h Fixes several signal set related errors: src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] @@ -9,17 +12,18 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [ Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/basic/copy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/copy.c b/src/basic/copy.c -index ca311e021e..3cf7fc1697 100644 +index 9028868f696d..5168586fa522 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c -@@ -12,6 +12,7 @@ +@@ -8,6 +8,7 @@ + #include #include - #include #include +#include diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index a2aad40..71e52c4 100644 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 +From 142dcaef0d24a78d3c0c94168b66fdf234497e97 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH 04/24] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,11 +10,12 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- meson.build | 1 + src/basic/meson.build | 5 + - src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ - src/basic/parse-printf-format.h | 57 +++++++++ + src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++ + src/basic/parse-printf-format.h | 57 +++++++ src/basic/stdio-util.h | 2 +- src/journal/journal-send.c | 2 +- 6 files changed, 338 insertions(+), 2 deletions(-) @@ -22,10 +23,10 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 79b762faeb..7f8c679411 100644 +index 21d6968abdf4..bab0bf84806c 100644 --- a/meson.build +++ b/meson.build -@@ -613,6 +613,7 @@ endif +@@ -628,6 +628,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,10 +35,10 @@ index 79b762faeb..7f8c679411 100644 'valgrind/memcheck.h', 'valgrind/valgrind.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d6caf28f14..32c1acf349 100644 +index f70d1b8bf8a0..4cd57373e10d 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], +@@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''], endforeach basic_sources += generated_gperf_headers @@ -51,7 +52,7 @@ index d6caf28f14..32c1acf349 100644 'gcrypt-util.h') diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c new file mode 100644 -index 0000000000..49437e5445 +index 000000000000..49437e544540 --- /dev/null +++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ @@ -330,7 +331,7 @@ index 0000000000..49437e5445 +} diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h new file mode 100644 -index 0000000000..47be7522d7 +index 000000000000..47be7522d7fa --- /dev/null +++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ @@ -392,7 +393,7 @@ index 0000000000..47be7522d7 + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index c3b9448d4f..2937aa13b1 100644 +index c3b9448d4f4f..2937aa13b178 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ @@ -411,7 +412,7 @@ index c3b9448d4f..2937aa13b1 100644 #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 5ef11fa1a4..6384ab620c 100644 +index 912ecef73cce..43ed756bda53 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -2,7 +2,6 @@ @@ -420,9 +421,9 @@ index 5ef11fa1a4..6384ab620c 100644 #include -#include #include - #include #include -@@ -21,6 +20,7 @@ + #include +@@ -20,6 +19,7 @@ #include "stdio-util.h" #include "string-util.h" #include "tmpfile-util.h" diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch index 0f75e8c..685df01 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch @@ -1,4 +1,7 @@ -Handle __cpu_mask usage +From 6883ffc99168056101c667c6421f8353d5ad675a Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Handle __cpu_mask usage Fixes errors: @@ -15,13 +18,14 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Scott Murray + --- src/shared/cpu-set-util.h | 2 ++ src/test/test-sizeof.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 27812dfd59..f698f9df83 100644 +index 27812dfd5923..0ab40731ea93 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -34,7 +38,7 @@ index 27812dfd59..f698f9df83 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index a710db5370..d1601ad929 100644 +index a710db5370b8..d1601ad9292d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index adfc3b7..aa4bb06 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 399fd3eda3045636a70da438a0fd1406cc332ed1 Mon Sep 17 00:00:00 2001 +From 9597196234a0ccf30d7f65cf185a8c24cb3158b3 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 05/24] src/basic/missing.h: check for missing strndupa +Subject: [PATCH] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -13,28 +13,47 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray +Signed-off-by: Alex Kiernan +[rebased for systemd 244] + --- meson.build | 1 + src/backlight/backlight.c | 1 + + src/basic/cgroup-util.c | 1 + src/basic/env-util.c | 1 + + src/basic/log.c | 1 + src/basic/missing_stdlib.h | 12 ++++++++++++ src/basic/mkdir.c | 1 + src/basic/parse-util.c | 1 + src/basic/proc-cmdline.c | 1 + src/basic/procfs-util.c | 1 + + src/basic/selinux-util.c | 1 + src/basic/time-util.c | 1 + + src/boot/bless-boot.c | 1 + src/core/dbus-cgroup.c | 1 + + src/core/dbus-execute.c | 1 + src/core/dbus-util.c | 1 + + src/core/execute.c | 1 + src/core/kmod-setup.c | 1 + src/core/service.c | 1 + + src/coredump/coredump-vacuum.c | 1 + + src/journal-remote/journal-remote-main.c | 1 + src/journal/journalctl.c | 1 + src/libsystemd/sd-bus/bus-message.c | 1 + src/libsystemd/sd-bus/bus-objects.c | 1 + + src/libsystemd/sd-bus/bus-socket.c | 1 + + src/libsystemd/sd-bus/sd-bus.c | 1 + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + src/locale/keymap-util.c | 1 + src/login/pam_systemd.c | 1 + src/network/generator/network-generator.c | 1 + src/nspawn/nspawn-settings.c | 1 + + src/nss-mymachines/nss-mymachines.c | 1 + + src/portable/portable.c | 1 + + src/resolve/resolvectl.c | 1 + + src/shared/bus-unit-procs.c | 1 + + src/shared/bus-unit-util.c | 1 + + src/shared/bus-util.c | 1 + src/shared/dns-domain.c | 1 + src/shared/journal-importer.c | 1 + src/shared/logs-show.c | 1 + @@ -46,13 +65,13 @@ Signed-off-by: Scott Murray src/udev/udev-builtin-path_id.c | 1 + src/udev/udev-event.c | 1 + src/udev/udev-rules.c | 1 + - 32 files changed, 43 insertions(+) + 48 files changed, 59 insertions(+) diff --git a/meson.build b/meson.build -index 7f8c679411..81c061b768 100644 +index bab0bf84806c..f4e1736cf09e 100644 --- a/meson.build +++ b/meson.build -@@ -506,6 +506,7 @@ foreach ident : [ +@@ -517,6 +517,7 @@ foreach ident : [ #include '''], ['get_mempolicy', '''#include #include '''], @@ -61,31 +80,55 @@ index 7f8c679411..81c061b768 100644 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index dfd6805398..c2b2ace6ec 100644 +index 048441429025..01d74ea0ed4e 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { const char *subsystem, *sysname, *value; +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 54fc6ecf8b20..a5141f4cbedd 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -37,6 +37,7 @@ + #include "strv.h" + #include "unit-name.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { + _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index a6503cf2b6..ceef9a62c8 100644 +index b8dc98915f81..5049b37594bc 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c -@@ -16,6 +16,7 @@ +@@ -15,6 +15,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define VALID_CHARS_ENV_NAME \ DIGITS LETTERS \ +diff --git a/src/basic/log.c b/src/basic/log.c +index 17557e1844b2..6cec4d324aab 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -34,6 +34,7 @@ + #include "terminal-util.h" + #include "time-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 +index 188a8d44066a..1e16ec287aad 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -105,338 +148,506 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6b82eab640..51c6b78615 100644 +index fa682d4c438e..37902551490a 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -14,6 +14,7 @@ +@@ -13,6 +13,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { struct stat st; diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 115a1494a2..07a34bfd53 100644 +index aec6099c9cc1..744b9b134ce4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -20,6 +20,7 @@ +@@ -18,6 +18,7 @@ #include "process-util.h" #include "stat-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index 09169cf963..f411ba897f 100644 +index d3d99d9a7f90..e0b9efad03a2 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ #include "string-util.h" #include "util.h" #include "virt.h" -+#include "missing.h" ++#include "missing_stdlib.h" int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..42ce53d5aa 100644 +index 7aaf95bfced2..da7e836f143e 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ #include "procfs-util.h" #include "stdio-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; +diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c +index f35e760233be..e4b0a8aa445e 100644 +--- a/src/basic/selinux-util.c ++++ b/src/basic/selinux-util.c +@@ -26,6 +26,7 @@ + #include "selinux-util.h" + #include "stdio-util.h" + #include "time-util.h" ++#include "missing_stdlib.h" + + #if HAVE_SELINUX + DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 3018e81acb..4e2b3b66c1 100644 +index bfe2c60da173..d7ef30d2fe52 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static clockid_t map_clock_id(clockid_t c) { +diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c +index b96e1f927fff..cba979baca3e 100644 +--- a/src/boot/bless-boot.c ++++ b/src/boot/bless-boot.c +@@ -18,6 +18,7 @@ + #include "util.h" + #include "verbs.h" + #include "virt.h" ++#include "missing_stdlib.h" + + static char **arg_path = NULL; + diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 2f2313c599..c9937f9d62 100644 +index 27dc9e43c3e2..b1a83023600b 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -15,6 +15,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); + BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 1d0bc1ede3cb..313654913345 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -41,6 +41,7 @@ + #include "unit-printf.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); + static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 7862beaacb..19f6968cfe 100644 +index 7862beaacb6d..3b1ea53a5f0d 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" -+#include "missing.h" ++#include "missing_stdlib.h" int bus_property_get_triggered_unit( sd_bus *bus, +diff --git a/src/core/execute.c b/src/core/execute.c +index abc164ff5bef..f04b8ba05002 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -88,6 +88,7 @@ + #include "unit.h" + #include "user-util.h" + #include "utmp-wtmp.h" ++#include "missing_stdlib.h" + + #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) + #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index a91cfebc67..a45961013f 100644 +index 09ccd613e32c..f4e64fa283e9 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ - #include "kmod-setup.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" + #include "missing_type.h" ++#include "missing_stdlib.h" #if HAVE_KMOD - #include + #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 73b3c9c316..ef74f00a08 100644 +index 49ad166c2604..c3b14067e201 100644 --- a/src/core/service.c +++ b/src/core/service.c -@@ -43,6 +43,7 @@ +@@ -41,6 +41,7 @@ #include "unit.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, +diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c +index 35885dfb47c4..bb9f0660a6a0 100644 +--- a/src/coredump/coredump-vacuum.c ++++ b/src/coredump/coredump-vacuum.c +@@ -16,6 +16,7 @@ + #include "string-util.h" + #include "time-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ + #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index ac2bf648d2af..06c86f0201af 100644 +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -21,6 +21,7 @@ + #include "stat-util.h" + #include "string-table.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" + #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6d6bb1cf63..6666349a35 100644 +index 95b6bfee172a..e0bcfb9d4233 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -70,6 +70,7 @@ +@@ -68,6 +68,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index eb029e4453..f31fe9d5a8 100644 +index eb029e445326..8da2c5d51a75 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ #include "strv.h" #include "time-util.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index ae643cacc7..1b752271a5 100644 +index ae643cacc740..f766e235206d 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ #include "set.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int node_vtable_get_userdata( sd_bus *bus, +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 18d30d010a20..be2ab703f8ed 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -28,6 +28,7 @@ + #include "string-util.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + +diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c +index 058492a83eec..54c896f572b9 100644 +--- a/src/libsystemd/sd-bus/sd-bus.c ++++ b/src/libsystemd/sd-bus/sd-bus.c +@@ -41,6 +41,7 @@ + #include "process-util.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define log_debug_bus_message(m) \ + do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..4fd0a2e692 100644 +index 8de0a859ee94..58044b6ba908 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ #include "missing_resource.h" #include "time-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index f8c36c94f5..41f5606aea 100644 +index 519dd0d188cf..a8f536915bb2 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 3f762cbbc3..005cfea658 100644 +index aa6e5ea7aca8..c439c21b2872 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -28,6 +28,7 @@ #include "hostname-util.h" #include "login-util.h" #include "macro.h" -+#include "missing.h" ++#include "missing_stdlib.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 0b5af33566..9c808cd014 100644 +index 81afa9530762..2c5328f97c63 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ #include "string-table.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 3a99736813..279fea4d88 100644 +index 5fb5b49bbcc3..785ccc2da307 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ #include "strv.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" Settings *settings_new(void) { Settings *s; +diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c +index 364356da5622..47d4ea44e40f 100644 +--- a/src/nss-mymachines/nss-mymachines.c ++++ b/src/nss-mymachines/nss-mymachines.c +@@ -19,6 +19,7 @@ + #include "signal-util.h" + #include "string-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); + NSS_GETPW_PROTOTYPES(mymachines); +diff --git a/src/portable/portable.c b/src/portable/portable.c +index 34b123e84692..5a48504d00ac 100644 +--- a/src/portable/portable.c ++++ b/src/portable/portable.c +@@ -29,6 +29,7 @@ + #include "strv.h" + #include "tmpfile-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); + +diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c +index 0a96a18b3836..432d6ebc3730 100644 +--- a/src/resolve/resolvectl.c ++++ b/src/resolve/resolvectl.c +@@ -31,6 +31,7 @@ + #include "strv.h" + #include "terminal-util.h" + #include "verbs.h" ++#include "missing_stdlib.h" + + static int arg_family = AF_UNSPEC; + static int arg_ifindex = 0; +diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c +index b21fe393265f..af2640005c1d 100644 +--- a/src/shared/bus-unit-procs.c ++++ b/src/shared/bus-unit-procs.c +@@ -10,6 +10,7 @@ + #include "sort-util.h" + #include "string-util.h" + #include "terminal-util.h" ++#include "missing_stdlib.h" + + struct CGroupInfo { + char *cgroup_path; +diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c +index 22a15493d7f3..3f4c51975675 100644 +--- a/src/shared/bus-unit-util.c ++++ b/src/shared/bus-unit-util.c +@@ -34,6 +34,7 @@ + #include "unit-def.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { + assert(message); +diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c +index aea46d311996..223426298144 100644 +--- a/src/shared/bus-util.c ++++ b/src/shared/bus-util.c +@@ -34,6 +34,7 @@ + #include "stdio-util.h" + #include "strv.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + sd_event *e = userdata; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index f62ad0a0f5..f1a27e158d 100644 +index b812665315f6..8e68f7f8fc6c 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -24,6 +24,7 @@ +@@ -23,6 +23,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..a6ff2214df 100644 +index 7c4fc7021dec..3fbaf5a63969 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ #include "parse-util.h" #include "string-util.h" #include "unaligned.h" -+#include "missing.h" ++#include "missing_stdlib.h" enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index b615c70dff..75b26e9c21 100644 +index 95b2e3376e9a..facc23aaecd5 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c -@@ -39,6 +39,7 @@ +@@ -37,6 +37,7 @@ #include "time-util.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/pager.c b/src/shared/pager.c -index 7c20b100b4..e4209d3a95 100644 +index 1fe9db179176..67954b5cab93 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -25,6 +25,7 @@ +@@ -23,6 +23,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static pid_t pager_pid = 0; diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..f6c8009cd2 100644 +index 5b1620974536..0e7cd1c2af12 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c -@@ -20,6 +20,7 @@ +@@ -19,6 +19,7 @@ #include "tmpfile-util.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8b12b91084 100644 +index 7cb7d8a477e9..8e7d7f9e7ca6 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ #include "sort-util.h" #include "uid-range.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index abbbc9f2d6..6179b5851e 100644 +index 2fb9c854fa50..58cef31458f7 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "socket-util.h" #include "string-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..a05e7782f6 100644 +index 52217429b154..70708dedf318 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ #include "hexdecoct.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index e8f1ce1354..8693cb02a4 100644 +index ca38f5608791..9d8cf4d2807b 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include "strv.h" #include "sysexits.h" #include "udev-builtin.h" -+#include "missing.h" ++#include "missing_stdlib.h" _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 8cfa2cdf23..b0670c77ec 100644 +index 58d484280aa5..90eab6806b55 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -35,6 +35,7 @@ +@@ -34,6 +34,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 1642f10535..fe2aa75478 100644 +index 6168b332d3b2..245fe0a64d22 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -28,6 +28,7 @@ - #include "udev-event.h" +@@ -30,6 +30,7 @@ #include "udev-rules.h" #include "user-util.h" -+#include "missing.h" + #include "virt.h" ++#include "missing_stdlib.h" #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index 6d73d71..ea003fd 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,4 +1,7 @@ -Include netinet/if_ether.h +From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Oct 2017 22:10:42 -0700 +Subject: [PATCH] Include netinet/if_ether.h Fixes /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' @@ -26,11 +29,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-netlink/netlink-types.c | 1 + src/machine/machine-dbus.c | 1 + + src/network/netdev/bond.c | 1 + + src/network/netdev/bridge.c | 1 + src/network/netdev/macsec.c | 1 + + src/network/netdev/netdev-gperf.gperf | 1 + src/network/netdev/netdev.c | 1 + src/network/networkd-brvlan.c | 1 + src/network/networkd-dhcp-common.c | 1 + @@ -38,26 +45,27 @@ Signed-off-by: Scott Murray src/network/networkd-dhcp6.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-network.c | 1 + + src/network/test-network-tables.c | 1 + src/shared/ethtool-util.c | 1 + src/shared/ethtool-util.h | 1 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-net_setup_link.c | 1 + - 15 files changed, 14 insertions(+), 4 deletions(-) + 19 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index d7a5349c70..68b41dfb6c 100644 +index 5417ba8c5feb..d3aba928dd96 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c -@@ -6,7 +6,6 @@ +@@ -5,7 +5,6 @@ + #include - #include #include -#include #include #include "sd-dhcp6-client.h" diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c -index de9b8b21ab..f64f6500f7 100644 +index a55460f03407..6f9cd527c800 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ @@ -69,19 +77,41 @@ index de9b8b21ab..f64f6500f7 100644 #include #include diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 0d58b5eb8b..01093c1f62 100644 +index 3b2ac3829859..760ccb445cd0 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -4,6 +4,7 @@ - #include +@@ -3,6 +3,7 @@ + #include #include #include +#include /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX +diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c +index 185b155440e7..dc1cd236c814 100644 +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include "alloc-util.h" + #include "bond.h" + #include "conf-parser.h" +diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c +index 59a40faef8fa..8e821a3216b3 100644 +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include + + #include "bridge.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c -index cf281e75a6..269dc618ff 100644 +index 25dc23ff0338..f20d11fbcf53 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ @@ -91,8 +121,20 @@ index cf281e75a6..269dc618ff 100644 #include #include #include +diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf +index 09a5f4822e03..873299b1f98a 100644 +--- a/src/network/netdev/netdev-gperf.gperf ++++ b/src/network/netdev/netdev-gperf.gperf +@@ -2,6 +2,7 @@ + #if __GNUC__ >= 7 + _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") + #endif ++#include + #include + #include "bond.h" + #include "bridge.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index 7735b455b7..ed4eda4a44 100644 +index 6908c4e811b0..e0d8c459ab63 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ @@ -103,7 +145,7 @@ index 7735b455b7..ed4eda4a44 100644 #include diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index c3c5d535ac..ebea408c89 100644 +index c3c5d535ac66..ebea408c89a8 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ @@ -115,19 +157,19 @@ index c3c5d535ac..ebea408c89 100644 #include diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 626b975839..42fe92f320 100644 +index 6465a8cfe9c7..bd4b2cdfac15 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - +@@ -4,6 +4,7 @@ + #include "escape.h" + #include "in-addr-util.h" #include "networkd-dhcp-common.h" +#include #include "networkd-network.h" #include "parse-util.h" #include "string-table.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 662770b50e..c6ab62a94d 100644 +index 8ca87d99d4db..a66284896cf3 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,8 +1,8 @@ @@ -139,9 +181,9 @@ index 662770b50e..c6ab62a94d 100644 -#include #include "alloc-util.h" - #include "hostname-util.h" + #include "dhcp-client-internal.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index 8ad736a82b..f41b4d834e 100644 +index 647623ac3778..325c641c6231 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ @@ -156,7 +198,7 @@ index 8ad736a82b..f41b4d834e 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index f5bb78890a..f13a36b791 100644 +index 2e60adbf7818..05aa8672d585 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ @@ -170,7 +212,7 @@ index f5bb78890a..f13a36b791 100644 #include "alloc-util.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c -index 2b8d0eb2fb..2f79ef25cd 100644 +index 6e443975f171..d1aab0ca5ba2 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ @@ -180,8 +222,17 @@ index 2b8d0eb2fb..2f79ef25cd 100644 #include #include #include +diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c +index 25b939639775..530e4928835c 100644 +--- a/src/network/test-network-tables.c ++++ b/src/network/test-network-tables.c +@@ -1,3 +1,4 @@ ++#include + #include "bond.h" + #include "dhcp6-internal.h" + #include "dhcp6-protocol.h" diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c -index b0961df72e..53fcbbd84b 100644 +index 3119b2b92e3b..927ddd067eef 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ @@ -192,7 +243,7 @@ index b0961df72e..53fcbbd84b 100644 #include #include diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h -index 8b32b243f3..262b819976 100644 +index d408bcd90a0b..7a1e399af023 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -2,6 +2,7 @@ @@ -204,7 +255,7 @@ index 8b32b243f3..262b819976 100644 #include "conf-parser.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index d44af64d5e..fd052f1591 100644 +index 7b07e2f38fa8..18680a8e5484 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ @@ -215,7 +266,7 @@ index d44af64d5e..fd052f1591 100644 #include diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index ee3ca9fa38..9aa4e82874 100644 +index ee3ca9fa3846..9aa4e828741f 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch index 34f7f5f..580c49f 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch @@ -1,8 +1,7 @@ -From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 +From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined If the standard library doesn't provide brace expansion users just won't get it. @@ -17,6 +16,7 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/glob-util.c | 12 ++++++++++++ src/test/test-glob-util.c | 16 ++++++++++++++++ @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray 3 files changed, 38 insertions(+) diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index b335af8d97..2cdfc11f16 100644 +index e3aa6c2e152b..38070b79c83a 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c -@@ -14,6 +14,12 @@ +@@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" @@ -40,7 +40,7 @@ index b335af8d97..2cdfc11f16 100644 static void closedir_wrapper(void* v) { (void) closedir(v); } -@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { +@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { int safe_glob(const char *path, int flags, glob_t *pglob) { int k; @@ -48,7 +48,7 @@ index b335af8d97..2cdfc11f16 100644 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); -@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { +@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; @@ -64,10 +64,10 @@ index b335af8d97..2cdfc11f16 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index b4f41445fe..f0d474ed14 100644 +index 667d15335fbf..76a84443aacf 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c -@@ -13,6 +13,12 @@ +@@ -12,6 +12,12 @@ #include "rm-rf.h" #include "tmpfile-util.h" @@ -80,7 +80,7 @@ index b4f41445fe..f0d474ed14 100644 static void test_glob_exists(void) { char name[] = "/tmp/test-glob_exists.XXXXXX"; int fd = -1; -@@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { +@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { const char *fn; _cleanup_globfree_ glob_t g = { @@ -94,7 +94,7 @@ index b4f41445fe..f0d474ed14 100644 }; int r; -@@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { +@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); @@ -115,10 +115,10 @@ index b4f41445fe..f0d474ed14 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 3c30612af1..14bc428085 100644 +index 193ed0bc781b..2f94fd2efd8f 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c -@@ -63,6 +63,12 @@ +@@ -58,6 +58,12 @@ #include "umask-util.h" #include "user-util.h" @@ -131,7 +131,7 @@ index 3c30612af1..14bc428085 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1853,7 +1859,9 @@ finish: +@@ -1850,7 +1856,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +141,7 @@ index 3c30612af1..14bc428085 100644 }; int r = 0, k; char **fn; -@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { +@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index d5f2349..1f61893 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001 +From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 08/24] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,12 +10,13 @@ This is to avoid build failures like below for musl. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index c487e65..23602eb 100644 +index c487e65e7bde..23602ebbd533 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); @@ -42,6 +43,3 @@ index c487e65..23602eb 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 8bacd02..0de1121 100644 --- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,20 +1,21 @@ -From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 +From 5166a6657570d4072cdce118621791e4a8186e07 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:03:47 +0800 -Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds +Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/process-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 78ce43b..aec2daf 100644 +index 9b6c4c31f713..24fec5ecb53a 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -22,6 +22,9 @@ +@@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include #endif @@ -24,7 +25,7 @@ index 78ce43b..aec2daf 100644 #include "alloc-util.h" #include "architecture.h" -@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { +@@ -1114,11 +1117,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -40,6 +41,3 @@ index 78ce43b..aec2daf 100644 pid_t getpid_cached(void) { static bool installed = false; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch index d6eda9c..e00600a 100644 --- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From e3f847bd0338d27aff3335b42661d8a4b66b965e Mon Sep 17 00:00:00 2001 +From f6df7f25a6bb00d5540915216adfff8afefec2b0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 11/24] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -20,6 +20,7 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/basic/format-util.h | 8 +------- src/basic/rlimit-util.c | 10 +++++----- @@ -27,10 +28,10 @@ Signed-off-by: Chen Qi 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index dece5d3..dbb87bc 100644 +index 59622508a333..779b6826d50e 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -42,13 +42,7 @@ +@@ -44,13 +44,7 @@ # define PRI_TIMEX "li" #endif @@ -46,10 +47,10 @@ index dece5d3..dbb87bc 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 74b3a02..b02c03c 100644 +index 2dc13eabc30d..0633cc67f417 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) s = strdup("infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) @@ -67,7 +68,7 @@ index 74b3a02..b02c03c 100644 if (!s) return -ENOMEM; -@@ -404,7 +404,7 @@ int rlimit_nofile_safe(void) { +@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { rl.rlim_cur = FD_SETSIZE; if (setrlimit(RLIMIT_NOFILE, &rl) < 0) @@ -77,10 +78,10 @@ index 74b3a02..b02c03c 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index a708231..e2b8748 100644 +index f04b8ba05002..084cf1420078 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -4220,9 +4220,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -4455,9 +4455,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", @@ -92,6 +93,3 @@ index a708231..e2b8748 100644 } if (c->ioprio_set) { --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 914589d..aa23c7a 100644 --- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,22 +1,22 @@ -From d3d65d4036670cbd5129fe55c09ca391286ef4b3 Mon Sep 17 00:00:00 2001 +From 7874912817b5ac7ed7f8557359a12d9d4b2f53eb Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 28 Feb 2018 21:25:22 -0800 -Subject: [PATCH 14/24] test-sizeof.c: Disable tests for missing typedefs in - musl +Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj Signed-off-by: Chen Qi + --- src/test/test-sizeof.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 35b0876..e78e7ca 100644 +index 7fc16a62b656..a710db5370b8 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c -@@ -41,8 +41,10 @@ int main(void) { +@@ -42,8 +42,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); @@ -27,7 +27,7 @@ index 35b0876..e78e7ca 100644 info(float); info(double); -@@ -60,7 +62,9 @@ int main(void) { +@@ -61,7 +63,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); @@ -37,6 +37,3 @@ index 35b0876..e78e7ca 100644 info(pid_t); info(uid_t); info(gid_t); --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index fd407f6..efeef07 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 +From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -25,16 +25,17 @@ just historical and not actually necessary or desired behaviour? Upstream-Status: Inappropriate [musl specific] Signed-off-by: Andre McCurdy + --- src/basic/fs-util.h | 22 +++++++++++++++++++++- src/shared/base-filesystem.c | 6 +++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 7ad030b..d4cb1e9 100644 +index 78d68be9fd85..c5dc84d41868 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h -@@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); +@@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m); int fd_warn_permissions(const char *path, int fd); @@ -64,10 +65,10 @@ index 7ad030b..d4cb1e9 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 89d7a7d..34b4ad5 100644 +index 657407da2d37..fbd5782d84fc 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); for (i = 0; i < ELEMENTSOF(table); i ++) { @@ -76,7 +77,7 @@ index 89d7a7d..34b4ad5 100644 continue; if (table[i].target) { -@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -85,7 +86,7 @@ index 89d7a7d..34b4ad5 100644 continue; /* check if a specific file exists at the target path */ -@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); @@ -94,6 +95,3 @@ index 89d7a7d..34b4ad5 100644 continue; } --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch index d556569..19a3eef 100644 --- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,8 +1,7 @@ -From af76c973e41929360a6e021f2ff9a7fc1d7994e9 Mon Sep 17 00:00:00 2001 +From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 16/24] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -10,25 +9,24 @@ using non-posix basename implementation, we have a way out Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj + --- - src/machine/machine-dbus.c | 4 ++++ - 1 file changed, 4 insertions(+) + src/machine/machine-dbus.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 7a558df..eca7d4b 100644 +index 760ccb445cd0..0df20f3864b3 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -11,6 +11,10 @@ +@@ -11,6 +11,11 @@ #include #undef basename +#if !defined(__GLIBC__) ++#include +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 24e24e8..56f4538 100644 --- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 +From a6f3359042219abaa8ae06dfcce41a4721e8c21f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 17/24] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -19,15 +19,16 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/process-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index b1c08fcade..0a7a1f7d89 100644 +index 24fec5ecb53a..642b02443c85 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { +@@ -1492,7 +1492,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 5901772..84a492f 100644 --- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 +From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 18/24] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -18,16 +18,17 @@ assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/journal/journal-send.c | 5 +++++ src/libsystemd/sd-bus/bus-error.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 3fea912..4f1e592 100644 +index 43ed756bda53..227ea64dbb48 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c -@@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove +@@ -336,7 +336,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; @@ -41,7 +42,7 @@ index 3fea912..4f1e592 100644 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index dc95237..bdda30f 100644 +index f760f0fdd21c..28a5159c4480 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { @@ -57,6 +58,3 @@ index dc95237..bdda30f 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 35cc66f..3b80646 100644 --- a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,7 +1,7 @@ -From 969ab9e68249fd383f4b513b1c9306bdac4ae9b2 Mon Sep 17 00:00:00 2001 +From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH 19/24] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP +Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP for currently unknown reasons they get exported to the shared libries even without being listed in the sym file @@ -11,12 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/libsystemd/sd-bus/bus-error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index bdda30f..e21853c 100644 +index 28a5159c4480..962a4de10c56 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { @@ -30,6 +31,3 @@ index bdda30f..e21853c 100644 /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch index 753d511..db4041b 100644 --- a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,7 +1,7 @@ -From 75c06e3e2a4760b36fffd95cdf5535b8ad73c481 Mon Sep 17 00:00:00 2001 +From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH 20/24] missing_type.h: add __compar_d_fn_t definition +Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition Fix the following compile failure: src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? @@ -9,12 +9,13 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 7d7c1e4..85902ab 100644 +index 23602ebbd533..917d314a81bf 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -13,6 +13,7 @@ @@ -25,6 +26,3 @@ index 7d7c1e4..85902ab 100644 #endif #ifndef __COMPAR_FN_T --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch index cdddf83..7dacc36 100644 --- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 +From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -9,12 +9,13 @@ error: redefinition of 'struct prctl_mm_map' Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index f80cd17..47e4893 100644 +index f80cd17f346b..47e489354053 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ @@ -27,6 +28,3 @@ index f80cd17..47e4893 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch index e266b9b..33c5758 100644 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch @@ -1,4 +1,4 @@ -From 6bcf562bd1e541c7aa46923d9a14201c7f785261 Mon Sep 17 00:00:00 2001 +From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Dec 2019 12:49:07 -0800 Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout @@ -11,15 +11,16 @@ purposes Upstream-Status: Pending Signed-off-by: Khem Raj Upstream-Status: Pending + --- src/basic/time-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index bfe2c60da1..8cf682b36a 100644 +index d7ef30d2fe52..4d3219f114b5 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1486,7 +1486,7 @@ int time_change_fd(void) { +@@ -1487,7 +1487,7 @@ int time_change_fd(void) { /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ static const struct itimerspec its = { @@ -28,6 +29,3 @@ index bfe2c60da1..8cf682b36a 100644 }; _cleanup_close_ int fd; --- -2.24.1 - diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch index 0e5629d..80beada 100644 --- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch @@ -1,7 +1,7 @@ -From 902412c271e0c5d9cb93b10ec0fb5b119b393474 Mon Sep 17 00:00:00 2001 +From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 16:53:06 +0800 -Subject: [PATCH 24/24] test-json.c: define M_PIl +Subject: [PATCH] test-json.c: define M_PIl Fix the following compile failure: src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? @@ -9,15 +9,16 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/test/test-json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-json.c b/src/test/test-json.c -index 9b8a2a9..efc746c 100644 +index a6613043b924..ca823ea79f05 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c -@@ -11,6 +11,10 @@ +@@ -12,6 +12,10 @@ #include "tests.h" #include "util.h" @@ -28,6 +29,3 @@ index 9b8a2a9..efc746c 100644 static void test_tokenizer(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd_243.4.bb b/meta/recipes-core/systemd/systemd_244.1.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.4.bb rename to meta/recipes-core/systemd/systemd_244.1.bb index a0d10e0..b686519 100644 --- a/meta/recipes-core/systemd/systemd_243.4.bb +++ b/meta/recipes-core/systemd/systemd_244.1.bb @@ -18,7 +18,6 @@ SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://99-default.preset \ " @@ -591,6 +590,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/ata_id \ ${rootlibexecdir}/udev/cdrom_id \ ${rootlibexecdir}/udev/collect \ + ${rootlibexecdir}/udev/fido_id \ ${rootlibexecdir}/udev/findkeyboards \ ${rootlibexecdir}/udev/keyboard-force-release.sh \ ${rootlibexecdir}/udev/keymap \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 02:07:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 02:07:51 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: modemmanager: Add a PACKAGECONFIG for the new --with-at-command-via-dbus option Message-ID: <158112767136.11002.6732749816120368686@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new a30ceda modemmanager: Add a PACKAGECONFIG for the new --with-at-command-via-dbus option a30ceda is described below commit a30cedacfcc442b0ad18300ed0c41122620b9391 Author: Adrian Bunk AuthorDate: Sat Feb 8 00:09:10 2020 +0200 modemmanager: Add a PACKAGECONFIG for the new --with-at-command-via-dbus option Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb index 3639f02..1f64be0 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb @@ -23,6 +23,7 @@ PACKAGECONFIG ??= "mbim qmi \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ " +PACKAGECONFIG[at] = "--with-at-command-via-dbus" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" # Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:30 +0000 Subject: [oe-commits] [openembedded-core] 01/19: sysvinit: Fix Reproducibility issue In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.0592A232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 829cff04d189283cb373f9f5b9f95e47d8fa31b6 Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 2b146b1..21ef0e9 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -29,6 +29,7 @@ B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:32 +0000 Subject: [oe-commits] [openembedded-core] 03/19: perl: Fix various reproducibile build issues In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.1C57D232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 515bd7b36d6819f1b76a9c408931cfd223d05f04 Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb6..5d76271 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:29 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (e5c2067 -> ddc9bc0) Message-ID: <158114816969.12678.15915060957519247541@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard e5c2067 systemd: upgrade 243.4 -> 244.1 discard 252016e dhcp: upgrade 4.4.1 -> 4.4.2 discard 9d24982 lighttpd: upgrade 1.4.54 -> 1.4.55 discard b82e236 procps: upgrade 3.3.15 -> 3.3.16 discard 02848bc python3: Do not hardcode "lib" for distutils discard 62a2f4a python3: fix the installation path of libpython3.7m.a for multilib discard 9bfb29d sstate.bbclass: fix issue while handling long sstate filenames discard d46f846 mesa: upgrade 19.3.1 -> 19.3.3 discard b62bd73 qemu: Upgrade to 4.2.0 discard 1346e32 pciutils: upgrade 3.6.2 -> 3.6.4 discard 83caf46 package.bbclass: Support stripping and debug copy of static libraries discard 0310f25 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs discard 671be79 package.bbclass: Fix debug source processing for static libraries discard 15163bc chkconfig: remove the recipe discard b1a9300 xserver-xorg: upgrade 1.20.6 -> 1.20.7 discard 392f6dd cryptodev: update to Jan.23, 2020 discard fe0ddc3 ncurses: Fix reproducibility issue discard 696e8fc kern-tools: fix merge_config when LD contains parameters discard b305acf perl: Fix various reproducibile build issues discard afb0419 libevdev: Fix determinism issue discard 6340d87 sysvinit: Fix Reproducibility issue new 829cff0 sysvinit: Fix Reproducibility issue new 91abfa2 libevdev: Fix determinism issue new 515bd7b perl: Fix various reproducibile build issues new b8b49db kern-tools: fix merge_config when LD contains parameters new dbade8b ncurses: Fix reproducibility issue new 5697c27 cryptodev: update to Jan.23, 2020 new 47ca5df xserver-xorg: upgrade 1.20.6 -> 1.20.7 new 78a51b5 chkconfig: remove the recipe new 4cc3cac package.bbclass: Fix debug source processing for static libraries new 98b2ca9 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs new 75ff6a0 package.bbclass: Support stripping and debug copy of static libraries new 92fb0b7 mesa: upgrade 19.3.1 -> 19.3.3 new 6d8fe44 sstate.bbclass: fix issue while handling long sstate filenames new 3fed1ef python3: fix the installation path of libpython3.7m.a for multilib new 76181c6 python3: Do not hardcode "lib" for distutils new 4de9661 procps: upgrade 3.3.15 -> 3.3.16 new 87dce69 lighttpd: upgrade 1.4.54 -> 1.4.55 new d433e9d dhcp: upgrade 4.4.1 -> 4.4.2 new ddc9bc0 systemd: upgrade 243.4 -> 244.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e5c2067) \ N -- N -- N refs/heads/master-next (ddc9bc0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- .../{pciutils_3.6.4.bb => pciutils_3.6.2.bb} | 4 +- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.2.0.bb => qemu-native_4.1.0.bb} | 0 ...native_4.2.0.bb => qemu-system-native_4.1.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 6 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +-- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 +-- ...0-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 ...0011-linux-user-remove-host-stime-syscall.patch | 61 ++++++++++++ .../qemu/qemu/CVE-2019-12068.patch | 108 +++++++++++++++++++++ .../qemu/{qemu_4.2.0.bb => qemu_4.1.0.bb} | 0 22 files changed, 231 insertions(+), 56 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.6.4.bb => pciutils_3.6.2.bb} (92%) rename meta/recipes-devtools/qemu/{qemu-native_4.2.0.bb => qemu-native_4.1.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.2.0.bb => qemu-system-native_4.1.0.bb} (100%) rename meta/recipes-devtools/qemu/qemu/{0011-fix-libcap-header-issue-on-some-distro.patch => 0010-fix-libcap-header-issue-on-some-distro.patch} (100%) rename meta/recipes-devtools/qemu/qemu/{0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.2.0.bb => qemu_4.1.0.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:33 +0000 Subject: [oe-commits] [openembedded-core] 04/19: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.286DF232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b8b49dbc531ca7a688401ca9c446d828600da27e Author: Bruce Ashfield AuthorDate: Fri Feb 7 09:52:04 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..44863ad 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:31 +0000 Subject: [oe-commits] [openembedded-core] 02/19: libevdev: Fix determinism issue In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.1049A232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 91abfa2bd11234874af6dd63d82a2c268d7ddb2c Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:34 +0000 Subject: [oe-commits] [openembedded-core] 05/19: ncurses: Fix reproducibility issue In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.31432232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dbade8ba71e6986f5bc2aa925ac70db8094bf045 Author: Richard Purdie AuthorDate: Fri Feb 7 15:09:48 2020 +0000 ncurses: Fix reproducibility issue The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35..b7bf4c0 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:38 +0000 Subject: [oe-commits] [openembedded-core] 09/19: package.bbclass: Fix debug source processing for static libraries In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.5B455232A39@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4cc3cac599b04c396672c62880f0cad00823ecb7 Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:06 2020 -0600 package.bbclass: Fix debug source processing for static libraries Format of the sources list is the [ (file, [source, ...]), ... ] before this change, the static libraries were processed but the items were included incorrectly causing no sources for static libraries to be included. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ef3de35..46ec9b6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1051,7 +1051,7 @@ python split_and_strip_files () { if debugsrcdir and not targetos.startswith("mingw"): for file in staticlibs: - results.extend(source_info(file, d, fatal=False)) + results.append( (file, source_info(file, d, fatal=False)) ) sources = set() for r in results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:39 +0000 Subject: [oe-commits] [openembedded-core] 10/19: package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.6454C232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 98b2ca9567d1b8443b573c06571a855c2afb8640 Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:07 2020 -0600 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs Change the order of the skip processing to happen before any .ko and static library processing. This will allow these types of files to be individually skipped if necessary. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 46ec9b6..7080d63 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -955,12 +955,6 @@ python split_and_strip_files () { for root, dirs, files in cpath.walk(dvar): for f in files: file = os.path.join(root, f) - if file.endswith(".ko") and file.find("/lib/modules/") != -1: - kernmods.append(file) - continue - if oe.package.is_static_lib(file): - staticlibs.append(file) - continue # Skip debug files if debugappend and file.endswith(debugappend): @@ -971,6 +965,13 @@ python split_and_strip_files () { if file in skipfiles: continue + if file.endswith(".ko") and file.find("/lib/modules/") != -1: + kernmods.append(file) + continue + if oe.package.is_static_lib(file): + staticlibs.append(file) + continue + try: ltarget = cpath.realpath(file, dvar, False) s = cpath.lstat(ltarget) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:35 +0000 Subject: [oe-commits] [openembedded-core] 06/19: cryptodev: update to Jan.23, 2020 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.3BB2A232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5697c274d04908f887027eb14f9ca24d14c8ebdd Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 6 12:57:43 2020 -0800 cryptodev: update to Jan.23, 2020 * Remove backported patches: 0001-Fix-module-loading-with-Linux-v5.0-rc5.patch Update to latest cryptodev dated Jan.23, 2020. Fixes build on kernel v5.5+ Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- ...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 ---------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 9d8ba44..f99f8bc 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -4,9 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \ - file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \ " -SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29" +SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch deleted file mode 100644 index 34ec872..0000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c] - -Backport patch from upstream to fix module cryptodev loading error. - -Signed-off-by: Kai Kang - -From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001 -From: "Derald D. Woods" -Date: Sun, 10 Feb 2019 13:22:19 -0600 -Subject: [PATCH] Fix module loading with Linux v5.0-rc5 - -This commit fixes this module load error: -[...] -[ 29.112091] cryptodev: loading out-of-tree module taints kernel. -[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter -[...] - -Upstream Linux support for unused GIVCIPHER, and others, was dropped here: - -c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators) - -Signed-off-by: Derald D. Woods ---- - cryptlib.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/cryptlib.c b/cryptlib.c -index 6e66698..4a87037 100644 ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -38,7 +38,9 @@ - #include "cryptodev_int.h" - #include "cipherapi.h" - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) - extern const struct crypto_type crypto_givcipher_type; -+#endif - - static void cryptodev_complete(struct crypto_async_request *req, int err) - { -@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) - tfm = crypto_skcipher_tfm(out->async.s); -- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) || -- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) { -+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) -+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) -+#endif -+ ) { - struct ablkcipher_alg *alg; - - alg = &tfm->__crt_alg->cra_ablkcipher; --- -2.20.0 - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:37 +0000 Subject: [oe-commits] [openembedded-core] 08/19: chkconfig: remove the recipe In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.5128D232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 78a51b532a51ba15be70afa55f347cf9a833e973 Author: Alexander Kanavin AuthorDate: Fri Feb 7 20:45:59 2020 +0100 chkconfig: remove the recipe chkconfig is one of the options for virtual/update-alternatives, however opkg-utils have been used as the default for a very long time, while chkconfig isn't anymore tested in any way, and is stuck at a very old version due to newer versions requiring selinux. [YOCTO #11264] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 - .../packagegroups/packagegroup-self-hosted.bb | 1 - .../chkconfig-alternatives-native_1.3.59.bb | 44 -------------- .../chkconfig/chkconfig/replace_caddr_t.patch | 33 ---------- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 71 ---------------------- 5 files changed, 151 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a80e85a..c68e9ed 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal " RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ccache = "Robert Yang " RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ea6d567..9a70b18 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ RDEPENDS_packagegroup-self-hosted-extended = "\ bzip2 \ - chkconfig \ chrpath \ cpio \ curl \ diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb deleted file mode 100644 index 87fa8eb..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb +++ /dev/null @@ -1,44 +0,0 @@ -require recipes-extended/chkconfig/chkconfig_1.3.58.bb - -SUMMARY = "${SUMMARY_chkconfig-alternatives}" -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" -DEPENDS = "" -PROVIDES += "virtual/update-alternatives-native" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -# The sysroot branch is 1.3.59 + some git commits from master + --sysroot -# support for alternatives. -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" -S = "${WORKDIR}/git" -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" - -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" -PV = "1.3.59+${SRCPV}" - -inherit native - -# We want our native recipes to build using the target paths rather than paths -# into the sysroot, as we may use them to construct the rootfs. As such, we -# only adjust the paths to match the metadata for the target, not native. -obey_variables () { - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c -} - -do_compile () { - oe_runmake alternatives -} - -do_install () { - install -d ${D}${sysconfdir}/alternatives \ - ${D}${localstatedir}/lib/alternatives - - install -D -m 0755 alternatives ${D}${bindir}/alternatives - install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 - - ln -s alternatives ${D}${bindir}/update-alternatives - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 -} - -do_install_append_linuxstdbase() { - rm -rf ${D}${libdir}/lsb -} diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch deleted file mode 100644 index 96d1938..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -caddr_t is a legacy BSD type which was rejected by the POSIX standard. -Use void * instead. - -sys/unitstd.h is not needed and moreover its not available on all C library -implementations e.g. musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Index: chkconfig-1.3.58/alternatives.c -=================================================================== ---- chkconfig-1.3.58.orig/alternatives.c -+++ chkconfig-1.3.58/alternatives.c -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - - #define FLAGS_TEST (1 << 0) -Index: chkconfig-1.3.58/leveldb.c -=================================================================== ---- chkconfig-1.3.58.orig/leveldb.c -+++ chkconfig-1.3.58/leveldb.c -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name - fstat(fd, &sb); - - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); -- if (bufstart == ((caddr_t) -1)) { -+ if (bufstart == ((void*) -1)) { - close(fd); - return -1; - } diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb deleted file mode 100644 index d21dd69..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" -DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ -information for system services. Chkconfig manipulates the numerous \ -symbolic links in /etc/rc.d, to relieve system administrators of some \ -of the drudgery of manually editing the symbolic links." - -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" - -HOMEPAGE = "https://github.com/fedora-sysv" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -DEPENDS = "libnewt popt" -PROVIDES += "virtual/update-alternatives" - -PR = "r7" - -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" - -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ - file://replace_caddr_t.patch \ - " - -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit gettext - -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS -# -EXTRA_OEMAKE = "\ - 'RPM_OPT_FLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'BINDIR=${base_sbindir}' \ - 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' \ - 'ALTDIR=${localstatedir}/lib/alternatives' \ - 'ALTDATADIR=${sysconfdir}/alternatives' \ -" - -do_unpack[postfuncs] += "obey_variables" -do_unpack[vardeps] += "obey_variables" -obey_variables () { - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ - -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c -} - -do_install() { - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ - 'BINDIR=${sbindir}' install - install -d ${D}${sysconfdir}/chkconfig.d -} - -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ -information about the symbolic links comprising the alternatives system." -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" -DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ -This package contains documentation." -RPROVIDES_${PN}-alternatives += "update-alternatives" -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" -FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ - ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ - ${mandir}/man8/update-alternatives.8" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:42 +0000 Subject: [oe-commits] [openembedded-core] 13/19: sstate.bbclass: fix issue while handling long sstate filenames In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.83E17232A3D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6d8fe44e7e89c36c5c8fa99bdb337793433deb03 Author: Jaewon Lee AuthorDate: Thu Feb 6 13:45:11 2020 -0800 sstate.bbclass: fix issue while handling long sstate filenames When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Using '//' instead to do the division to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 > components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..0beeb33 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators - avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 + avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3 components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:41 +0000 Subject: [oe-commits] [openembedded-core] 12/19: mesa: upgrade 19.3.1 -> 19.3.3 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.79C6A232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 92fb0b70620452b7d6a48901d8102edb22e46677 Author: Wang Mingyu AuthorDate: Thu Feb 6 11:02:54 2020 -0800 mesa: upgrade 19.3.1 -> 19.3.3 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.1.bb b/meta/recipes-graphics/mesa/mesa_19.3.3.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa_19.3.3.bb index b889f09..7e0c5d6 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.1.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.3.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "5c5965db31993af47fee82c9a7ccba5e" -SRC_URI[sha256sum] = "cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4eb8274723e033beae59" +SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" +SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:36 +0000 Subject: [oe-commits] [openembedded-core] 07/19: xserver-xorg: upgrade 1.20.6 -> 1.20.7 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.459EE232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 47ca5dfa9bb6a1016dd8f5f10c9cbf6d4ad324a0 Author: Alexander Kanavin AuthorDate: Fri Feb 7 20:45:58 2020 +0100 xserver-xorg: upgrade 1.20.6 -> 1.20.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...rmmode_display.c-add-missing-mi.h-include.patch | 23 ++++++++++++++++++++++ ...erver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 ++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch new file mode 100644 index 0000000..4b8e43f --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch @@ -0,0 +1,23 @@ +From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 7 Feb 2020 20:36:45 +0100 +Subject: [PATCH] drmmode_display.c: add missing mi.h include + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +index e18cc37..3445cce 100644 +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c ++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -46,6 +46,7 @@ + #include "xf86Crtc.h" + #include "drmmode_display.h" + #include "present.h" ++#include "mi.h" + + #include + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb similarity index 71% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb index a1cd490..998b98a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb @@ -1,12 +1,13 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ - file://pkgconfig.patch \ - file://0001-test-xtest-Initialize-array-with-braces.patch \ - file://sdksyms-no-build-path.patch \ - " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" + file://pkgconfig.patch \ + file://0001-test-xtest-Initialize-array-with-braces.patch \ + file://sdksyms-no-build-path.patch \ + file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ + " +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:40 +0000 Subject: [oe-commits] [openembedded-core] 11/19: package.bbclass: Support stripping and debug copy of static libraries In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.6FDC6232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 75ff6a0f0b83fabcb2182da1113866d0d7541cbe Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:08 2020 -0600 package.bbclass: Support stripping and debug copy of static libraries By default, we won't copy and strip static libraries. However, this functionality can be useful in some cases where people are doing development on the target, and don't generally want the larger debug capable static libraries. To enable the new functionality set: PACKAGE_DEBUG_STATIC_SPLIT = '1' Add a new function splitstaticdebuginfo. Thus function will copy the unmodified static library into the specific debug directory location. By keeping an unmodified version, it is possible for a user trying to debug something to use -L /usr/lib/.debug-static and their existing build commands to switch from stripped to full debug versions. The PACKAGE_DEBUG_SPLIT_STYLE will select between two different approaches, /usr/lib/debug-static or /.debug-static. Additionally you can now choose to strip static libraries to conserve space. If either 'PACKAGE_DEBUG_STATIC_SPLIT' or 'PACKAGE_STRIP_STATIC' is set to 1, the static library will be stripped. (This is not on by default, as it could make diagnosing static library usage difficult in some cases.) Add to insane.bbclass a skip to the staticdev warning for the specific -dbg package versions. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- meta/classes/package.bbclass | 67 ++++++++++++++++++++++++++++++++++++++++++-- meta/conf/bitbake.conf | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..7425b8c 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -182,7 +182,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages): libgcc.a, libgcov.a will be skipped in their packages """ - if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a"): + if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a") and not '/usr/lib/debug-static/' in path and not '/.debug-static/' in path: package_qa_add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7080d63..1efc396 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -416,6 +416,49 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, return (file, sources) +def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d): + # Unlike the function above, there is no way to split a static library + # two components. So to get similar results we will copy the unmodified + # static library (containing the debug symbols) into a new directory. + # We will then strip (preserving symbols) the static library in the + # typical location. + # + # return a mapping of files:debugsources + + import stat + import shutil + + src = file[len(dvar):] + dest = debugstaticlibdir + os.path.dirname(src) + debugstaticdir + "/" + os.path.basename(src) + debugstaticappend + debugfile = dvar + dest + sources = [] + + # Copy the file... + bb.utils.mkdirhier(os.path.dirname(debugfile)) + #bb.note("Copy %s -> %s" % (file, debugfile)) + + dvar = d.getVar('PKGD') + + newmode = None + if not os.access(file, os.W_OK) or os.access(file, os.R_OK): + origmode = os.stat(file)[stat.ST_MODE] + newmode = origmode | stat.S_IWRITE | stat.S_IREAD + os.chmod(file, newmode) + + # We need to extract the debug src information here... + if debugsrcdir: + sources = source_info(file, d) + + bb.utils.mkdirhier(os.path.dirname(debugfile)) + + # Copy the unmodified item to the debug directory + shutil.copy2(file, debugfile) + + if newmode: + os.chmod(file, origmode) + + return (file, sources) + def copydebugsources(debugsrcdir, sources, d): # The debug src information written out to sourcefile is further processed # and copied to the destination here. @@ -916,25 +959,37 @@ python split_and_strip_files () { if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory': # Single debug-file-directory style debug info debugappend = ".debug" + debugstaticappend = "" debugdir = "" + debugstaticdir = "" debuglibdir = "/usr/lib/debug" + debugstaticlibdir = "/usr/lib/debug-static" debugsrcdir = "/usr/src/debug" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-without-src': # Original OE-core, a.k.a. ".debug", style debug info, but without sources in /usr/src/debug debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg': debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" else: # Original OE-core, a.k.a. ".debug", style debug info debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" # @@ -1051,8 +1106,11 @@ python split_and_strip_files () { results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) if debugsrcdir and not targetos.startswith("mingw"): - for file in staticlibs: - results.append( (file, source_info(file, d, fatal=False)) ) + if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d)) + else: + for file in staticlibs: + results.append( (file,source_info(file, d)) ) sources = set() for r in results: @@ -1121,6 +1179,9 @@ python split_and_strip_files () { sfiles.append((file, elf_file, strip)) for f in kernmods: sfiles.append((f, 16, strip)) + if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + for f in staticlibs: + sfiles.append((f, 16, strip)) oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d) @@ -1188,7 +1249,7 @@ python populate_packages () { dir = os.sep for f in (files + dirs): path = "." + os.path.join(dir, f) - if "/.debug/" in path or path.endswith("/.debug"): + if "/.debug/" in path or "/.debug-static/" in path or path.endswith("/.debug"): debug.append(path) for pkg in packages: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8b4621f..954c06b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -325,7 +325,7 @@ FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a" SECTION_${PN}-staticdev = "devel" RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" -FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" +FILES_${PN}-dbg = "/usr/lib/debug /usr/lib/debug-static /usr/src/debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:45 +0000 Subject: [oe-commits] [openembedded-core] 16/19: procps: upgrade 3.3.15 -> 3.3.16 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.A3121232A40@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4de9661cda4466abaca1b25e7cc658c3f1ff9981 Author: Yi Zhao AuthorDate: Thu Feb 6 19:18:12 2020 +0800 procps: upgrade 3.3.15 -> 3.3.16 Drop 0001-Fix-out-of-tree-builds.patch since it has been merged upstream. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../procps/0001-Fix-out-of-tree-builds.patch | 24 ---------------------- .../procps/{procps_3.3.15.bb => procps_3.3.16.bb} | 5 ++--- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index e548194..0000000 --- a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Apr 2018 14:09:45 +0300 -Subject: [PATCH] Fix out of tree builds - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - include/nls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/nls.h b/include/nls.h -index 1166b7b..f5abe05 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -6,7 +6,7 @@ - #define PROCPS_NG_NLS_H - - /* programs issuing textdomain() need PACKAGE string */ --#include "../config.h" -+#include "config.h" - - /* programs issuing bindtextdomain() also need LOCALEDIR string */ - #ifndef LOCALEDIR diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.16.bb similarity index 93% rename from meta/recipes-extended/procps/procps_3.3.15.bb rename to meta/recipes-extended/procps/procps_3.3.16.bb index 17abd96..60f9097 100644 --- a/meta/recipes-extended/procps/procps_3.3.15.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -14,11 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ file://sysctl.conf \ - file://0001-Fix-out-of-tree-builds.patch \ " -SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" -SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" +SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" +SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" S = "${WORKDIR}/procps-ng-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:43 +0000 Subject: [oe-commits] [openembedded-core] 14/19: python3: fix the installation path of libpython3.7m.a for multilib In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.8E3DB232A3E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3fed1efc7c23c9c99b58a5036c97972ae8284498 Author: Changqing Li AuthorDate: Fri Feb 7 14:07:43 2020 +0800 python3: fix the installation path of libpython3.7m.a for multilib Fix the installation path of libpython3.7m.a on mulitlib lib64 platform to lib64 instead of lib Signed-off-by: Li Zhou Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- .../python3/0001-configure.ac-fix-LIBPL.patch | 35 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 5 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch new file mode 100644 index 0000000..123ce3a --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch @@ -0,0 +1,35 @@ +From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:36:25 +0800 +Subject: [PATCH] configure.ac: fix LIBPL + +Use LIBDIR rather than prefix/lib, so that it would work when lib64. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Robert Yang +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce04258..915f475 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4532,9 +4532,9 @@ fi + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) + if test x$PLATFORM_TRIPLET = x; then +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" + else +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + fi + AC_SUBST(LIBPL) + +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index a71c207..981b52e 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -29,6 +29,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ + file://0001-configure.ac-fix-LIBPL.patch \ " SRC_URI_append_class-native = " \ @@ -174,7 +175,7 @@ py_package_preprocess () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config @@ -322,7 +323,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv" # package libpython3 PACKAGES =+ "libpython3 libpython3-staticdev" FILES_libpython3 = "${libdir}/libpython*.so.*" -FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" +FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:46 +0000 Subject: [oe-commits] [openembedded-core] 17/19: lighttpd: upgrade 1.4.54 -> 1.4.55 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.AE4D6232A41@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 87dce6922bb0853b079dc3c55472f41d698b84b9 Author: Wang Mingyu AuthorDate: Thu Feb 6 06:52:26 2020 -0800 lighttpd: upgrade 1.4.54 -> 1.4.55 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb similarity index 96% rename from meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb rename to meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb index 20ce698..7a255ce 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb @@ -19,8 +19,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "7abc776243c811e9872f73ab38b7f8b5" -SRC_URI[sha256sum] = "cf14cce2254a96d8fcb6d3181e1a3c29a8f832531c3e86ff6f2524ecda9a8721" +SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" +SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:47 +0000 Subject: [oe-commits] [openembedded-core] 18/19: dhcp: upgrade 4.4.1 -> 4.4.2 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.B747A232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d433e9dd9d7a082b7c94486ef5330b9b75135532 Author: Wang Mingyu AuthorDate: Thu Feb 6 06:53:22 2020 -0800 dhcp: upgrade 4.4.1 -> 4.4.2 0001-Fix-a-NSUPDATE-compiling-issue.patch 0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch Removed since they are included in 4.4.2. refresh the following patch: 0004-Fix-out-of-tree-builds.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ------------------- ...d-includes-of-new-BIND9-compatibility-hea.patch | 79 ---------------------- .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- 4 files changed, 6 insertions(+), 153 deletions(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch deleted file mode 100644 index f12a112..0000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Tue, 14 May 2019 11:07:15 +0200 -Subject: [PATCH] Fix a NSUPDATE compiling issue - -Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] - -A following error was observed when NSUPDATE is not defined: -| omapip/isclib.c: In function 'dns_client_init': -| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| if (dhcp_gbl_ctx.dnsclient == NULL) { -| ^ -| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| &dhcp_gbl_ctx.dnsclient, -| ^ -| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4' -| (dhcp_gbl_ctx.use_local4 ? -| ^ -| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr' -| &dhcp_gbl_ctx.local4_sockaddr -| ^ -| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6' -| (dhcp_gbl_ctx.use_local6 ? -| ^ -| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr' -| &dhcp_gbl_ctx.local6_sockaddr - -Fix it by adding NSUPDATE conditional checking. - -Signed-off-by: Ming Liu ---- - includes/omapip/isclib.h | 2 ++ - omapip/isclib.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 538b927..6c20584 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -141,6 +141,8 @@ void isclib_cleanup(void); - void dhcp_signal_handler(int signal); - extern int shutdown_signal; - -+#if defined (NSUPDATE) - isc_result_t dns_client_init(); -+#endif - - #endif /* ISCLIB_H */ -diff --git a/omapip/isclib.c b/omapip/isclib.c -index db3b895..ce4b4a1 100644 ---- a/omapip/isclib.c -+++ b/omapip/isclib.c -@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) { - } - } - -+#if defined (NSUPDATE) - isc_result_t dns_client_init() { - isc_result_t result; - if (dhcp_gbl_ctx.dnsclient == NULL) { -@@ -387,3 +388,4 @@ isc_result_t dns_client_init() { - - return ISC_R_SUCCESS; - } -+#endif --- -2.7.4 - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch deleted file mode 100644 index 1bc1422..0000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [master] Added includes of new BIND9 compatibility headers - - Merges in rt48072. - -Upstream-Status: Backport -Signed-off-by: Adrian Bunk - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch index b71c93d..7b57730 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch @@ -85,9 +85,11 @@ Index: dhcp-4.4.1/relay/Makefile.am =================================================================== --- dhcp-4.4.1.orig/relay/Makefile.am +++ dhcp-4.4.1/relay/Makefile.am -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ + SUBDIRS = . tests + -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes - + sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb similarity index 74% rename from meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb rename to meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb index 020777b..b56a204 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb @@ -9,13 +9,11 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat file://0009-remove-dhclient-script-bash-dependency.patch \ file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ file://0013-fixup_use_libbind.patch \ - file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ - file://0001-Fix-a-NSUPDATE-compiling-issue.patch \ file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \ " -SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" -SRC_URI[sha256sum] = "2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608" +SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" +SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" LDFLAGS_append = " -pthread" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:44 +0000 Subject: [oe-commits] [openembedded-core] 15/19: python3: Do not hardcode "lib" for distutils In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.98DDB232A3F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 76181c6d19c27c790bcee7942eaa3456097f7a5d Author: Changqing Li AuthorDate: Fri Feb 7 14:07:44 2020 +0800 python3: Do not hardcode "lib" for distutils Get the sys.lib from python3 itself and do not use hardcoded value of 'lib' for distutils. Solve the error below that occurs when run "python3 setup.py install" on lib64 multilib platform: [Errno 2] No such file or directory: '/usr/lib/python3.7/site-packages/test-easy-install-1828.write-test' Signed-off-by: Li Zhou Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- ...python3-Do-not-hardcode-lib-for-distutils.patch | 43 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 44 insertions(+) diff --git a/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch new file mode 100644 index 0000000..fe031b9 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch @@ -0,0 +1,43 @@ +From bb711b53f10d32a90a27ccf4b0dc51e4a701d862 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:42:09 +0800 +Subject: [PATCH] python3: Do not hardcode "lib" for distutils + +Get the sys.lib from python3 itself and do not use +hardcoded value of 'lib' for distutils. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + Lib/distutils/command/install.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index c625c95..8e32f54 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -19,6 +19,8 @@ from site import USER_BASE + from site import USER_SITE + HAS_USER_SITE = True + ++libname = sys.lib ++ + WINDOWS_SCHEME = { + 'purelib': '$base/Lib/site-packages', + 'platlib': '$base/Lib/site-packages', +@@ -29,8 +31,8 @@ WINDOWS_SCHEME = { + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/' + libname + '/python$py_version_short/site-packages', ++ 'platlib': '$platbase/' + libname + '/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 981b52e..c836066 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -30,6 +30,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ + file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 07:49:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 07:49:48 +0000 Subject: [oe-commits] [openembedded-core] 19/19: systemd: upgrade 243.4 -> 244.1 In-Reply-To: <158114816969.12678.15915060957519247541@git.openembedded.org> References: <158114816969.12678.15915060957519247541@git.openembedded.org> Message-ID: <20200208074930.CDFAF232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ddc9bc02594e1dbf5f8126a5e68477d1cdb8a1cb Author: Alex Kiernan AuthorDate: Thu Feb 6 16:48:13 2020 +0000 systemd: upgrade 243.4 -> 244.1 Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.4.bb => systemd-boot_244.1.bb} | 0 ...systemd-conf_243.2.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...t-install-dependency-links-at-install-tim.patch | 33 +- ...01-do-not-disable-buffer-in-writing-files.patch | 168 +++++---- .../0002-don-t-use-glibc-specific-qsort_r.patch | 26 +- ...src-login-brightness.c-include-sys-wait.h.patch | 8 +- ...pper-instead-of-looking-for-relative-opti.patch | 63 ---- ...0003-implment-systemd-sysv-install-for-OE.patch | 10 +- ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 37 +- .../0003-src-basic-copy.c-include-signal.h.patch | 12 +- ...llback-parse_printf_format-implementation.patch | 29 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 10 +- ...asic-missing.h-check-for-missing-strndupa.patch | 381 ++++++++++++++++----- .../systemd/0006-Include-netinet-if_ether.h.patch | 101 ++++-- ...-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 +- .../0008-add-missing-FTW_-macros-for-musl.patch | 10 +- ...-of-__register_atfork-for-non-glibc-build.patch | 14 +- .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 22 +- ....c-Disable-tests-for-missing-typedefs-in-.patch | 15 +- ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 +- ...c-compatible-basename-for-non-glibc-syste.patch | 18 +- ...ble-buffering-when-writing-to-oom_score_a.patch | 9 +- ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 14 +- ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 10 +- ...ing_type.h-add-__compar_d_fn_t-definition.patch | 10 +- ...id-redefinition-of-prctl_mm_map-structure.patch | 10 +- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 10 +- .../systemd/0024-test-json.c-define-M_PIl.patch | 12 +- .../systemd/{systemd_243.4.bb => systemd_244.1.bb} | 2 +- 30 files changed, 659 insertions(+), 431 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.4.bb b/meta/recipes-core/systemd/systemd-boot_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.4.bb rename to meta/recipes-core/systemd/systemd-boot_244.1.bb diff --git a/meta/recipes-core/systemd/systemd-conf_243.2.bb b/meta/recipes-core/systemd/systemd-conf_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_243.2.bb rename to meta/recipes-core/systemd/systemd-conf_244.1.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 2fca6dc..8c05a96 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,10 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" -SRCBRANCH = "v243-stable" +SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" -PV = "243.4+git${SRCPV}" - S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index ea37680..6eaaec7 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,8 +1,8 @@ -From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001 +From c73a87871df31b4f8d96c9d443759c6f702935f6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] binfmt: Don't install dependency links at install time for + the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service. @@ -18,16 +18,17 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- units/meson.build | 6 ++---- units/proc-sys-fs-binfmt_misc.automount | 3 +++ units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build +diff --git a/units/meson.build b/units/meson.build +index 6a3a0d0dea22..bbb1b78618c3 100644 +--- a/units/meson.build ++++ b/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +49,10 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 30a6bc991844..4231f3b70fe9 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,11 +60,11 @@ Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index 0c0f26451b67..763c4c466c16 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index d6d68a0..f1c7181 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 +From f4a0caaea346b70cf5064f9159a53a1b8020071e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -18,8 +18,9 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray + --- - src/basic/cgroup-util.c | 14 +++++++------- + src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- src/basic/smack-util.c | 2 +- src/basic/util.c | 2 +- @@ -31,25 +32,19 @@ Signed-off-by: Scott Murray src/login/logind-dbus.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- + src/shared/cgroup-setup.c | 4 ++-- src/shared/sysctl-util.c | 2 +- - src/sleep/sleep.c | 10 +++++----- + src/sleep/sleep.c | 8 ++++---- src/udev/udevadm-trigger.c | 2 +- src/udev/udevd.c | 2 +- src/vconsole/vconsole-setup.c | 2 +- - 17 files changed, 36 insertions(+), 36 deletions(-) + 18 files changed, 35 insertions(+), 35 deletions(-) +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index a5141f4cbedd..04c06e7a55cb 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co - - xsprintf(c, PID_FMT "\n", pid); - -- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, c, 0); - if (r < 0) - return r; - -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char +@@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -58,7 +53,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char +@@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -67,7 +62,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha +@@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -76,7 +71,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha +@@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -85,7 +80,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control +@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -94,18 +89,11 @@ Signed-off-by: Scott Murray } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -@@ -2697,7 +2697,7 @@ int cg_enable_everywhere( - return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); - } - -- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_stream(f, s, 0); - if (r < 0) { - log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", - FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index da7e836f143e..2138f20bcc03 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -121,9 +109,11 @@ Signed-off-by: Scott Murray if (r < 0) { uint64_t threads_max; +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index da9a2139d31a..5e91f5b8f5d9 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -132,9 +122,11 @@ Signed-off-by: Scott Murray if (r < 0) return r; +diff --git a/src/basic/util.c b/src/basic/util.c +index 2b3b3918a32f..aff8d0fcd473 100644 --- a/src/basic/util.c +++ b/src/basic/util.c -@@ -294,7 +294,7 @@ void disable_coredumps(void) { +@@ -267,7 +267,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; @@ -143,9 +135,11 @@ Signed-off-by: Scott Murray if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } +diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c +index 7ff844c78c3a..5c5721d7c2f7 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) +@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); @@ -154,7 +148,7 @@ Signed-off-by: Scott Murray } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) +@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); @@ -163,7 +157,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); -@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { +@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ @@ -172,9 +166,11 @@ Signed-off-by: Scott Murray STRV_FOREACH(f, files) { k = apply_file(*f, true); +diff --git a/src/core/main.c b/src/core/main.c +index c24b696b1663..195be7d2df0d 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -183,7 +179,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -192,9 +188,11 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } +diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c +index 4427397f2715..8aeb5c829513 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) +@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL @@ -216,6 +214,8 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif +diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c +index 17e7cd1a009b..87a766771663 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -227,9 +227,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; +diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c +index f35612fe12bc..20351bf7fa70 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -238,9 +240,11 @@ Signed-off-by: Scott Murray if (r < 0) { if (r == -ELOOP) return -EINVAL; +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 69b59948786f..b4973c596d48 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd +@@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; @@ -249,9 +253,11 @@ Signed-off-by: Scott Murray } return 0; +diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c +index f5048d9473cb..b6383ab5c97e 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -260,9 +266,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 873a76596f0b..4e496548bb94 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { +@@ -2425,7 +2425,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -271,7 +279,7 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3633,13 +3633,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -287,9 +295,33 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); +diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c +index e8398cbde5ba..ba682ec0c9e7 100644 +--- a/src/shared/cgroup-setup.c ++++ b/src/shared/cgroup-setup.c +@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { + + xsprintf(c, PID_FMT "\n", pid); + +- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, c, 0); + if (r < 0) + return r; + +@@ -817,7 +817,7 @@ int cg_enable_everywhere( + return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); + } + +- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_stream(f, s, 0); + if (r < 0) { + log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", + FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c +index 12fb3ef7ea0e..132ac847c091 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con +@@ -87,7 +87,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c log_debug("Setting '%s' to '%s'", p, value); @@ -298,35 +330,29 @@ Signed-off-by: Scott Murray } int sysctl_read(const char *property, char **content) { +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index 89b80367f8f4..33dbb21364d0 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info +@@ -45,7 +45,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + assert(hibernate_location->swap); + assert(hibernate_location->resume); - /* if it's a swap partition, we just write the disk to /sys/power/resume */ - if (streq(type, "partition")) { -- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); - -@@ -98,14 +98,14 @@ static int write_hibernate_location_info +- r = write_string_file("/sys/power/resume", hibernate_location->resume, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", hibernate_location->resume, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", + hibernate_location->swap->device, hibernate_location->resume); +@@ -72,7 +72,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + } - offset = fiemap->fm_extents[0].fe_physical / page_size(); - xsprintf(offset_str, "%" PRIu64, offset); + xsprintf(offset_str, "%" PRIu64, hibernate_location->resume_offset); - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume_offset", offset_str, 0); if (r < 0) - return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); - - log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str); - - xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); -- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device_str, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write device '%s': %m", device_str); - -@@ -121,7 +121,7 @@ static int write_mode(char **modes) { + return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", + hibernate_location->swap->device, offset_str); +@@ -89,7 +89,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; @@ -335,7 +361,7 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** +@@ -108,7 +108,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; @@ -344,9 +370,11 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); +diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c +index 60c68b5029cf..fdca03d3d42c 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se if (!filename) return log_oom(); @@ -355,9 +383,11 @@ Signed-off-by: Scott Murray if (r < 0) { bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 7678331897f5..6871cde7aa65 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi +@@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -366,9 +396,11 @@ Signed-off-by: Scott Murray if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; +diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c +index 9d706085fb47..30dcfa86f4d0 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na +@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index c6213ab..6b85ff0 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 +From 49501c80d32c1bc5ecb07f40c324feb82af0b057 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH 02/24] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,14 +10,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- - src/basic/sort-util.h | 14 -------------- - src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- - src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/basic/sort-util.h | 14 ------------ + src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- + src/shared/format-table.c | 36 ++++++++++++++++++++---------- 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f8646e..27d68b341c 100644 +index e029f8646eb0..27d68b341cf3 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn @@ -39,7 +40,7 @@ index e029f8646e..27d68b341c 100644 - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c -index c83575c7c8..72f8f3a050 100644 +index c83575c7c876..72f8f3a05048 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.c +++ b/src/libsystemd/sd-hwdb/hwdb-util.c @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { @@ -83,10 +84,10 @@ index c83575c7c8..72f8f3a050 100644 } diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index a5c0a99b08..d595cbe372 100644 +index 4617ae8badc4..17d6b9616256 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c -@@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t +@@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -130,7 +131,7 @@ index a5c0a99b08..d595cbe372 100644 } /* Order identical lines by the order there were originally added in */ -@@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { +@@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -144,7 +145,7 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) -@@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { +@@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -158,6 +159,3 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch index dcae668..ba7424d 100644 --- a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch @@ -1,4 +1,7 @@ -Include sys/wait.h +From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include sys/wait.h Fixes: src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? @@ -8,12 +11,13 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/login/logind-brightness.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index 8dfa97d7ae..bddd4a2727 100644 +index 3f4b65e1fdf1..5af7e3d5ce3f 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch deleted file mode 100644 index 49a334d..0000000 --- a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 27 Jun 2018 16:09:24 +0800 -Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option - for ln - -Remove file manually to avoid the 'File Exists' error when creating -symlink. This is because the original 'ln' command uses '-f' option. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - meson.build | 4 ---- - tools/meson-make-symlink.sh | 3 ++- - units/meson-add-wants.sh | 7 ++++++- - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index e5ceb1e169..79b762faeb 100644 ---- a/meson.build -+++ b/meson.build -@@ -579,10 +579,6 @@ endforeach - - conf.set_quoted('TELINIT', get_option('telinit-path')) - --if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative (added in coreutils 8.16)') --endif -- - ############################################################ - - gperf = find_program('gperf') -diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh -index da0d13a341..90bc0a93c2 100755 ---- a/tools/meson-make-symlink.sh -+++ b/tools/meson-make-symlink.sh -@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" - if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" - else -- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -+ rm -f "${DESTDIR:-}$2" -+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" - fi -diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh -index a483d75b86..3c01c523f1 100755 ---- a/units/meson-add-wants.sh -+++ b/units/meson-add-wants.sh -@@ -25,4 +25,9 @@ case "$target" in - ;; - esac - --ln -vfs --relative "$unitpath" "$dir" -+if [ -d "$dir" ]; then -+ rm -f "$dir/$unit" -+ lnr "$unitpath" "$dir/$unit" -+else -+ lnr "$unitpath" "$dir" -+fi diff --git a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch index 6695d56..c620478 100644 --- a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch @@ -1,7 +1,7 @@ -From 47864989388bcd04d647ecf618ad7e260399dbb6 Mon Sep 17 00:00:00 2001 +From f9078501a1495c9991431d1435d081cd2e830328 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 5 Sep 2015 06:31:47 +0000 -Subject: [PATCH 3/5] implment systemd-sysv-install for OE +Subject: [PATCH] implment systemd-sysv-install for OE Use update-rc.d for enabling/disabling and status command to check the status of the sysv service @@ -9,12 +9,13 @@ to check the status of the sysv service Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj + --- src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON -index 8c16cf9..9f078a1 100755 +index 8c16cf99913f..9f078a121469 100755 --- a/src/systemctl/systemd-sysv-install.SKELETON +++ b/src/systemctl/systemd-sysv-install.SKELETON @@ -32,17 +32,17 @@ case "$1" in @@ -38,6 +39,3 @@ index 8c16cf9..9f078a1 100755 ;; *) usage ;; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 2e39f7a..1404895 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,24 +1,28 @@ -From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 +From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +[Rebased for v244] Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- src/basic/missing_type.h | 9 +++++++++ src/basic/sort-util.h | 1 + + src/core/kmod-setup.c | 1 + src/journal/catalog.c | 1 + - 3 files changed, 11 insertions(+) + 4 files changed, 12 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b..2134fe5095 100644 +index bf8a6caa1b46..c487e65e7bde 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -35,29 +39,38 @@ index bf8a6caa1b..2134fe5095 100644 +typedef int (*__compar_fn_t)(const void *, const void *); +#endif diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f86..7247d40 100644 +index 27d68b341cf3..307ea4ac0e8e 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ #include #include "macro.h" -+#include "missing.h" ++#include "missing_type.h" void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *arg); +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 128674327362..09ccd613e32c 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -10,6 +10,7 @@ + #include "kmod-setup.h" + #include "macro.h" + #include "string-util.h" ++#include "missing_type.h" + + #if HAVE_KMOD + #include "module-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 7beffc1e1a..4818a2e5cc 100644 +index 70b2c8b46c4e..d574a64586f1 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c -@@ -29,6 +29,7 @@ +@@ -28,6 +28,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_type.h" const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch index 7ee0d48..538a99c 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch @@ -1,4 +1,7 @@ -Include signal.h +From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include signal.h Fixes several signal set related errors: src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] @@ -9,17 +12,18 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [ Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/basic/copy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/copy.c b/src/basic/copy.c -index ca311e021e..3cf7fc1697 100644 +index 9028868f696d..5168586fa522 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c -@@ -12,6 +12,7 @@ +@@ -8,6 +8,7 @@ + #include #include - #include #include +#include diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index a2aad40..71e52c4 100644 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 +From 142dcaef0d24a78d3c0c94168b66fdf234497e97 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH 04/24] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,11 +10,12 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- meson.build | 1 + src/basic/meson.build | 5 + - src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ - src/basic/parse-printf-format.h | 57 +++++++++ + src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++ + src/basic/parse-printf-format.h | 57 +++++++ src/basic/stdio-util.h | 2 +- src/journal/journal-send.c | 2 +- 6 files changed, 338 insertions(+), 2 deletions(-) @@ -22,10 +23,10 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 79b762faeb..7f8c679411 100644 +index 21d6968abdf4..bab0bf84806c 100644 --- a/meson.build +++ b/meson.build -@@ -613,6 +613,7 @@ endif +@@ -628,6 +628,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,10 +35,10 @@ index 79b762faeb..7f8c679411 100644 'valgrind/memcheck.h', 'valgrind/valgrind.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d6caf28f14..32c1acf349 100644 +index f70d1b8bf8a0..4cd57373e10d 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], +@@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''], endforeach basic_sources += generated_gperf_headers @@ -51,7 +52,7 @@ index d6caf28f14..32c1acf349 100644 'gcrypt-util.h') diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c new file mode 100644 -index 0000000000..49437e5445 +index 000000000000..49437e544540 --- /dev/null +++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ @@ -330,7 +331,7 @@ index 0000000000..49437e5445 +} diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h new file mode 100644 -index 0000000000..47be7522d7 +index 000000000000..47be7522d7fa --- /dev/null +++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ @@ -392,7 +393,7 @@ index 0000000000..47be7522d7 + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index c3b9448d4f..2937aa13b1 100644 +index c3b9448d4f4f..2937aa13b178 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ @@ -411,7 +412,7 @@ index c3b9448d4f..2937aa13b1 100644 #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 5ef11fa1a4..6384ab620c 100644 +index 912ecef73cce..43ed756bda53 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -2,7 +2,6 @@ @@ -420,9 +421,9 @@ index 5ef11fa1a4..6384ab620c 100644 #include -#include #include - #include #include -@@ -21,6 +20,7 @@ + #include +@@ -20,6 +19,7 @@ #include "stdio-util.h" #include "string-util.h" #include "tmpfile-util.h" diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch index 0f75e8c..685df01 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch @@ -1,4 +1,7 @@ -Handle __cpu_mask usage +From 6883ffc99168056101c667c6421f8353d5ad675a Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Handle __cpu_mask usage Fixes errors: @@ -15,13 +18,14 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Scott Murray + --- src/shared/cpu-set-util.h | 2 ++ src/test/test-sizeof.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 27812dfd59..f698f9df83 100644 +index 27812dfd5923..0ab40731ea93 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -34,7 +38,7 @@ index 27812dfd59..f698f9df83 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index a710db5370..d1601ad929 100644 +index a710db5370b8..d1601ad9292d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index adfc3b7..aa4bb06 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 399fd3eda3045636a70da438a0fd1406cc332ed1 Mon Sep 17 00:00:00 2001 +From 9597196234a0ccf30d7f65cf185a8c24cb3158b3 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 05/24] src/basic/missing.h: check for missing strndupa +Subject: [PATCH] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -13,28 +13,47 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray +Signed-off-by: Alex Kiernan +[rebased for systemd 244] + --- meson.build | 1 + src/backlight/backlight.c | 1 + + src/basic/cgroup-util.c | 1 + src/basic/env-util.c | 1 + + src/basic/log.c | 1 + src/basic/missing_stdlib.h | 12 ++++++++++++ src/basic/mkdir.c | 1 + src/basic/parse-util.c | 1 + src/basic/proc-cmdline.c | 1 + src/basic/procfs-util.c | 1 + + src/basic/selinux-util.c | 1 + src/basic/time-util.c | 1 + + src/boot/bless-boot.c | 1 + src/core/dbus-cgroup.c | 1 + + src/core/dbus-execute.c | 1 + src/core/dbus-util.c | 1 + + src/core/execute.c | 1 + src/core/kmod-setup.c | 1 + src/core/service.c | 1 + + src/coredump/coredump-vacuum.c | 1 + + src/journal-remote/journal-remote-main.c | 1 + src/journal/journalctl.c | 1 + src/libsystemd/sd-bus/bus-message.c | 1 + src/libsystemd/sd-bus/bus-objects.c | 1 + + src/libsystemd/sd-bus/bus-socket.c | 1 + + src/libsystemd/sd-bus/sd-bus.c | 1 + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + src/locale/keymap-util.c | 1 + src/login/pam_systemd.c | 1 + src/network/generator/network-generator.c | 1 + src/nspawn/nspawn-settings.c | 1 + + src/nss-mymachines/nss-mymachines.c | 1 + + src/portable/portable.c | 1 + + src/resolve/resolvectl.c | 1 + + src/shared/bus-unit-procs.c | 1 + + src/shared/bus-unit-util.c | 1 + + src/shared/bus-util.c | 1 + src/shared/dns-domain.c | 1 + src/shared/journal-importer.c | 1 + src/shared/logs-show.c | 1 + @@ -46,13 +65,13 @@ Signed-off-by: Scott Murray src/udev/udev-builtin-path_id.c | 1 + src/udev/udev-event.c | 1 + src/udev/udev-rules.c | 1 + - 32 files changed, 43 insertions(+) + 48 files changed, 59 insertions(+) diff --git a/meson.build b/meson.build -index 7f8c679411..81c061b768 100644 +index bab0bf84806c..f4e1736cf09e 100644 --- a/meson.build +++ b/meson.build -@@ -506,6 +506,7 @@ foreach ident : [ +@@ -517,6 +517,7 @@ foreach ident : [ #include '''], ['get_mempolicy', '''#include #include '''], @@ -61,31 +80,55 @@ index 7f8c679411..81c061b768 100644 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index dfd6805398..c2b2ace6ec 100644 +index 048441429025..01d74ea0ed4e 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { const char *subsystem, *sysname, *value; +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 54fc6ecf8b20..a5141f4cbedd 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -37,6 +37,7 @@ + #include "strv.h" + #include "unit-name.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { + _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index a6503cf2b6..ceef9a62c8 100644 +index b8dc98915f81..5049b37594bc 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c -@@ -16,6 +16,7 @@ +@@ -15,6 +15,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define VALID_CHARS_ENV_NAME \ DIGITS LETTERS \ +diff --git a/src/basic/log.c b/src/basic/log.c +index 17557e1844b2..6cec4d324aab 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -34,6 +34,7 @@ + #include "terminal-util.h" + #include "time-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 +index 188a8d44066a..1e16ec287aad 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -105,338 +148,506 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6b82eab640..51c6b78615 100644 +index fa682d4c438e..37902551490a 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -14,6 +14,7 @@ +@@ -13,6 +13,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { struct stat st; diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 115a1494a2..07a34bfd53 100644 +index aec6099c9cc1..744b9b134ce4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -20,6 +20,7 @@ +@@ -18,6 +18,7 @@ #include "process-util.h" #include "stat-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index 09169cf963..f411ba897f 100644 +index d3d99d9a7f90..e0b9efad03a2 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ #include "string-util.h" #include "util.h" #include "virt.h" -+#include "missing.h" ++#include "missing_stdlib.h" int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..42ce53d5aa 100644 +index 7aaf95bfced2..da7e836f143e 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ #include "procfs-util.h" #include "stdio-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; +diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c +index f35e760233be..e4b0a8aa445e 100644 +--- a/src/basic/selinux-util.c ++++ b/src/basic/selinux-util.c +@@ -26,6 +26,7 @@ + #include "selinux-util.h" + #include "stdio-util.h" + #include "time-util.h" ++#include "missing_stdlib.h" + + #if HAVE_SELINUX + DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 3018e81acb..4e2b3b66c1 100644 +index bfe2c60da173..d7ef30d2fe52 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static clockid_t map_clock_id(clockid_t c) { +diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c +index b96e1f927fff..cba979baca3e 100644 +--- a/src/boot/bless-boot.c ++++ b/src/boot/bless-boot.c +@@ -18,6 +18,7 @@ + #include "util.h" + #include "verbs.h" + #include "virt.h" ++#include "missing_stdlib.h" + + static char **arg_path = NULL; + diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 2f2313c599..c9937f9d62 100644 +index 27dc9e43c3e2..b1a83023600b 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -15,6 +15,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); + BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 1d0bc1ede3cb..313654913345 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -41,6 +41,7 @@ + #include "unit-printf.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); + static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 7862beaacb..19f6968cfe 100644 +index 7862beaacb6d..3b1ea53a5f0d 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" -+#include "missing.h" ++#include "missing_stdlib.h" int bus_property_get_triggered_unit( sd_bus *bus, +diff --git a/src/core/execute.c b/src/core/execute.c +index abc164ff5bef..f04b8ba05002 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -88,6 +88,7 @@ + #include "unit.h" + #include "user-util.h" + #include "utmp-wtmp.h" ++#include "missing_stdlib.h" + + #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) + #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index a91cfebc67..a45961013f 100644 +index 09ccd613e32c..f4e64fa283e9 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ - #include "kmod-setup.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" + #include "missing_type.h" ++#include "missing_stdlib.h" #if HAVE_KMOD - #include + #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 73b3c9c316..ef74f00a08 100644 +index 49ad166c2604..c3b14067e201 100644 --- a/src/core/service.c +++ b/src/core/service.c -@@ -43,6 +43,7 @@ +@@ -41,6 +41,7 @@ #include "unit.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, +diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c +index 35885dfb47c4..bb9f0660a6a0 100644 +--- a/src/coredump/coredump-vacuum.c ++++ b/src/coredump/coredump-vacuum.c +@@ -16,6 +16,7 @@ + #include "string-util.h" + #include "time-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ + #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index ac2bf648d2af..06c86f0201af 100644 +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -21,6 +21,7 @@ + #include "stat-util.h" + #include "string-table.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" + #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6d6bb1cf63..6666349a35 100644 +index 95b6bfee172a..e0bcfb9d4233 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -70,6 +70,7 @@ +@@ -68,6 +68,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index eb029e4453..f31fe9d5a8 100644 +index eb029e445326..8da2c5d51a75 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ #include "strv.h" #include "time-util.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index ae643cacc7..1b752271a5 100644 +index ae643cacc740..f766e235206d 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ #include "set.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int node_vtable_get_userdata( sd_bus *bus, +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 18d30d010a20..be2ab703f8ed 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -28,6 +28,7 @@ + #include "string-util.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + +diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c +index 058492a83eec..54c896f572b9 100644 +--- a/src/libsystemd/sd-bus/sd-bus.c ++++ b/src/libsystemd/sd-bus/sd-bus.c +@@ -41,6 +41,7 @@ + #include "process-util.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define log_debug_bus_message(m) \ + do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..4fd0a2e692 100644 +index 8de0a859ee94..58044b6ba908 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ #include "missing_resource.h" #include "time-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index f8c36c94f5..41f5606aea 100644 +index 519dd0d188cf..a8f536915bb2 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 3f762cbbc3..005cfea658 100644 +index aa6e5ea7aca8..c439c21b2872 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -28,6 +28,7 @@ #include "hostname-util.h" #include "login-util.h" #include "macro.h" -+#include "missing.h" ++#include "missing_stdlib.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 0b5af33566..9c808cd014 100644 +index 81afa9530762..2c5328f97c63 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ #include "string-table.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 3a99736813..279fea4d88 100644 +index 5fb5b49bbcc3..785ccc2da307 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ #include "strv.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" Settings *settings_new(void) { Settings *s; +diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c +index 364356da5622..47d4ea44e40f 100644 +--- a/src/nss-mymachines/nss-mymachines.c ++++ b/src/nss-mymachines/nss-mymachines.c +@@ -19,6 +19,7 @@ + #include "signal-util.h" + #include "string-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); + NSS_GETPW_PROTOTYPES(mymachines); +diff --git a/src/portable/portable.c b/src/portable/portable.c +index 34b123e84692..5a48504d00ac 100644 +--- a/src/portable/portable.c ++++ b/src/portable/portable.c +@@ -29,6 +29,7 @@ + #include "strv.h" + #include "tmpfile-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); + +diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c +index 0a96a18b3836..432d6ebc3730 100644 +--- a/src/resolve/resolvectl.c ++++ b/src/resolve/resolvectl.c +@@ -31,6 +31,7 @@ + #include "strv.h" + #include "terminal-util.h" + #include "verbs.h" ++#include "missing_stdlib.h" + + static int arg_family = AF_UNSPEC; + static int arg_ifindex = 0; +diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c +index b21fe393265f..af2640005c1d 100644 +--- a/src/shared/bus-unit-procs.c ++++ b/src/shared/bus-unit-procs.c +@@ -10,6 +10,7 @@ + #include "sort-util.h" + #include "string-util.h" + #include "terminal-util.h" ++#include "missing_stdlib.h" + + struct CGroupInfo { + char *cgroup_path; +diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c +index 22a15493d7f3..3f4c51975675 100644 +--- a/src/shared/bus-unit-util.c ++++ b/src/shared/bus-unit-util.c +@@ -34,6 +34,7 @@ + #include "unit-def.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { + assert(message); +diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c +index aea46d311996..223426298144 100644 +--- a/src/shared/bus-util.c ++++ b/src/shared/bus-util.c +@@ -34,6 +34,7 @@ + #include "stdio-util.h" + #include "strv.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + sd_event *e = userdata; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index f62ad0a0f5..f1a27e158d 100644 +index b812665315f6..8e68f7f8fc6c 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -24,6 +24,7 @@ +@@ -23,6 +23,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..a6ff2214df 100644 +index 7c4fc7021dec..3fbaf5a63969 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ #include "parse-util.h" #include "string-util.h" #include "unaligned.h" -+#include "missing.h" ++#include "missing_stdlib.h" enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index b615c70dff..75b26e9c21 100644 +index 95b2e3376e9a..facc23aaecd5 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c -@@ -39,6 +39,7 @@ +@@ -37,6 +37,7 @@ #include "time-util.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/pager.c b/src/shared/pager.c -index 7c20b100b4..e4209d3a95 100644 +index 1fe9db179176..67954b5cab93 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -25,6 +25,7 @@ +@@ -23,6 +23,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static pid_t pager_pid = 0; diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..f6c8009cd2 100644 +index 5b1620974536..0e7cd1c2af12 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c -@@ -20,6 +20,7 @@ +@@ -19,6 +19,7 @@ #include "tmpfile-util.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8b12b91084 100644 +index 7cb7d8a477e9..8e7d7f9e7ca6 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ #include "sort-util.h" #include "uid-range.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index abbbc9f2d6..6179b5851e 100644 +index 2fb9c854fa50..58cef31458f7 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "socket-util.h" #include "string-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..a05e7782f6 100644 +index 52217429b154..70708dedf318 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ #include "hexdecoct.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index e8f1ce1354..8693cb02a4 100644 +index ca38f5608791..9d8cf4d2807b 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include "strv.h" #include "sysexits.h" #include "udev-builtin.h" -+#include "missing.h" ++#include "missing_stdlib.h" _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 8cfa2cdf23..b0670c77ec 100644 +index 58d484280aa5..90eab6806b55 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -35,6 +35,7 @@ +@@ -34,6 +34,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 1642f10535..fe2aa75478 100644 +index 6168b332d3b2..245fe0a64d22 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -28,6 +28,7 @@ - #include "udev-event.h" +@@ -30,6 +30,7 @@ #include "udev-rules.h" #include "user-util.h" -+#include "missing.h" + #include "virt.h" ++#include "missing_stdlib.h" #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index 6d73d71..ea003fd 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,4 +1,7 @@ -Include netinet/if_ether.h +From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Oct 2017 22:10:42 -0700 +Subject: [PATCH] Include netinet/if_ether.h Fixes /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' @@ -26,11 +29,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-netlink/netlink-types.c | 1 + src/machine/machine-dbus.c | 1 + + src/network/netdev/bond.c | 1 + + src/network/netdev/bridge.c | 1 + src/network/netdev/macsec.c | 1 + + src/network/netdev/netdev-gperf.gperf | 1 + src/network/netdev/netdev.c | 1 + src/network/networkd-brvlan.c | 1 + src/network/networkd-dhcp-common.c | 1 + @@ -38,26 +45,27 @@ Signed-off-by: Scott Murray src/network/networkd-dhcp6.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-network.c | 1 + + src/network/test-network-tables.c | 1 + src/shared/ethtool-util.c | 1 + src/shared/ethtool-util.h | 1 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-net_setup_link.c | 1 + - 15 files changed, 14 insertions(+), 4 deletions(-) + 19 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index d7a5349c70..68b41dfb6c 100644 +index 5417ba8c5feb..d3aba928dd96 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c -@@ -6,7 +6,6 @@ +@@ -5,7 +5,6 @@ + #include - #include #include -#include #include #include "sd-dhcp6-client.h" diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c -index de9b8b21ab..f64f6500f7 100644 +index a55460f03407..6f9cd527c800 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ @@ -69,19 +77,41 @@ index de9b8b21ab..f64f6500f7 100644 #include #include diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 0d58b5eb8b..01093c1f62 100644 +index 3b2ac3829859..760ccb445cd0 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -4,6 +4,7 @@ - #include +@@ -3,6 +3,7 @@ + #include #include #include +#include /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX +diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c +index 185b155440e7..dc1cd236c814 100644 +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include "alloc-util.h" + #include "bond.h" + #include "conf-parser.h" +diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c +index 59a40faef8fa..8e821a3216b3 100644 +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include + + #include "bridge.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c -index cf281e75a6..269dc618ff 100644 +index 25dc23ff0338..f20d11fbcf53 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ @@ -91,8 +121,20 @@ index cf281e75a6..269dc618ff 100644 #include #include #include +diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf +index 09a5f4822e03..873299b1f98a 100644 +--- a/src/network/netdev/netdev-gperf.gperf ++++ b/src/network/netdev/netdev-gperf.gperf +@@ -2,6 +2,7 @@ + #if __GNUC__ >= 7 + _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") + #endif ++#include + #include + #include "bond.h" + #include "bridge.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index 7735b455b7..ed4eda4a44 100644 +index 6908c4e811b0..e0d8c459ab63 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ @@ -103,7 +145,7 @@ index 7735b455b7..ed4eda4a44 100644 #include diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index c3c5d535ac..ebea408c89 100644 +index c3c5d535ac66..ebea408c89a8 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ @@ -115,19 +157,19 @@ index c3c5d535ac..ebea408c89 100644 #include diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 626b975839..42fe92f320 100644 +index 6465a8cfe9c7..bd4b2cdfac15 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - +@@ -4,6 +4,7 @@ + #include "escape.h" + #include "in-addr-util.h" #include "networkd-dhcp-common.h" +#include #include "networkd-network.h" #include "parse-util.h" #include "string-table.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 662770b50e..c6ab62a94d 100644 +index 8ca87d99d4db..a66284896cf3 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,8 +1,8 @@ @@ -139,9 +181,9 @@ index 662770b50e..c6ab62a94d 100644 -#include #include "alloc-util.h" - #include "hostname-util.h" + #include "dhcp-client-internal.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index 8ad736a82b..f41b4d834e 100644 +index 647623ac3778..325c641c6231 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ @@ -156,7 +198,7 @@ index 8ad736a82b..f41b4d834e 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index f5bb78890a..f13a36b791 100644 +index 2e60adbf7818..05aa8672d585 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ @@ -170,7 +212,7 @@ index f5bb78890a..f13a36b791 100644 #include "alloc-util.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c -index 2b8d0eb2fb..2f79ef25cd 100644 +index 6e443975f171..d1aab0ca5ba2 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ @@ -180,8 +222,17 @@ index 2b8d0eb2fb..2f79ef25cd 100644 #include #include #include +diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c +index 25b939639775..530e4928835c 100644 +--- a/src/network/test-network-tables.c ++++ b/src/network/test-network-tables.c +@@ -1,3 +1,4 @@ ++#include + #include "bond.h" + #include "dhcp6-internal.h" + #include "dhcp6-protocol.h" diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c -index b0961df72e..53fcbbd84b 100644 +index 3119b2b92e3b..927ddd067eef 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ @@ -192,7 +243,7 @@ index b0961df72e..53fcbbd84b 100644 #include #include diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h -index 8b32b243f3..262b819976 100644 +index d408bcd90a0b..7a1e399af023 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -2,6 +2,7 @@ @@ -204,7 +255,7 @@ index 8b32b243f3..262b819976 100644 #include "conf-parser.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index d44af64d5e..fd052f1591 100644 +index 7b07e2f38fa8..18680a8e5484 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ @@ -215,7 +266,7 @@ index d44af64d5e..fd052f1591 100644 #include diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index ee3ca9fa38..9aa4e82874 100644 +index ee3ca9fa3846..9aa4e828741f 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch index 34f7f5f..580c49f 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch @@ -1,8 +1,7 @@ -From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 +From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined If the standard library doesn't provide brace expansion users just won't get it. @@ -17,6 +16,7 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/glob-util.c | 12 ++++++++++++ src/test/test-glob-util.c | 16 ++++++++++++++++ @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray 3 files changed, 38 insertions(+) diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index b335af8d97..2cdfc11f16 100644 +index e3aa6c2e152b..38070b79c83a 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c -@@ -14,6 +14,12 @@ +@@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" @@ -40,7 +40,7 @@ index b335af8d97..2cdfc11f16 100644 static void closedir_wrapper(void* v) { (void) closedir(v); } -@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { +@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { int safe_glob(const char *path, int flags, glob_t *pglob) { int k; @@ -48,7 +48,7 @@ index b335af8d97..2cdfc11f16 100644 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); -@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { +@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; @@ -64,10 +64,10 @@ index b335af8d97..2cdfc11f16 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index b4f41445fe..f0d474ed14 100644 +index 667d15335fbf..76a84443aacf 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c -@@ -13,6 +13,12 @@ +@@ -12,6 +12,12 @@ #include "rm-rf.h" #include "tmpfile-util.h" @@ -80,7 +80,7 @@ index b4f41445fe..f0d474ed14 100644 static void test_glob_exists(void) { char name[] = "/tmp/test-glob_exists.XXXXXX"; int fd = -1; -@@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { +@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { const char *fn; _cleanup_globfree_ glob_t g = { @@ -94,7 +94,7 @@ index b4f41445fe..f0d474ed14 100644 }; int r; -@@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { +@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); @@ -115,10 +115,10 @@ index b4f41445fe..f0d474ed14 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 3c30612af1..14bc428085 100644 +index 193ed0bc781b..2f94fd2efd8f 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c -@@ -63,6 +63,12 @@ +@@ -58,6 +58,12 @@ #include "umask-util.h" #include "user-util.h" @@ -131,7 +131,7 @@ index 3c30612af1..14bc428085 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1853,7 +1859,9 @@ finish: +@@ -1850,7 +1856,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +141,7 @@ index 3c30612af1..14bc428085 100644 }; int r = 0, k; char **fn; -@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { +@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index d5f2349..1f61893 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001 +From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 08/24] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,12 +10,13 @@ This is to avoid build failures like below for musl. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index c487e65..23602eb 100644 +index c487e65e7bde..23602ebbd533 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); @@ -42,6 +43,3 @@ index c487e65..23602eb 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 8bacd02..0de1121 100644 --- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,20 +1,21 @@ -From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 +From 5166a6657570d4072cdce118621791e4a8186e07 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:03:47 +0800 -Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds +Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/process-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 78ce43b..aec2daf 100644 +index 9b6c4c31f713..24fec5ecb53a 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -22,6 +22,9 @@ +@@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include #endif @@ -24,7 +25,7 @@ index 78ce43b..aec2daf 100644 #include "alloc-util.h" #include "architecture.h" -@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { +@@ -1114,11 +1117,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -40,6 +41,3 @@ index 78ce43b..aec2daf 100644 pid_t getpid_cached(void) { static bool installed = false; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch index d6eda9c..e00600a 100644 --- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From e3f847bd0338d27aff3335b42661d8a4b66b965e Mon Sep 17 00:00:00 2001 +From f6df7f25a6bb00d5540915216adfff8afefec2b0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 11/24] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -20,6 +20,7 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/basic/format-util.h | 8 +------- src/basic/rlimit-util.c | 10 +++++----- @@ -27,10 +28,10 @@ Signed-off-by: Chen Qi 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index dece5d3..dbb87bc 100644 +index 59622508a333..779b6826d50e 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -42,13 +42,7 @@ +@@ -44,13 +44,7 @@ # define PRI_TIMEX "li" #endif @@ -46,10 +47,10 @@ index dece5d3..dbb87bc 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 74b3a02..b02c03c 100644 +index 2dc13eabc30d..0633cc67f417 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) s = strdup("infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) @@ -67,7 +68,7 @@ index 74b3a02..b02c03c 100644 if (!s) return -ENOMEM; -@@ -404,7 +404,7 @@ int rlimit_nofile_safe(void) { +@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { rl.rlim_cur = FD_SETSIZE; if (setrlimit(RLIMIT_NOFILE, &rl) < 0) @@ -77,10 +78,10 @@ index 74b3a02..b02c03c 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index a708231..e2b8748 100644 +index f04b8ba05002..084cf1420078 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -4220,9 +4220,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -4455,9 +4455,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", @@ -92,6 +93,3 @@ index a708231..e2b8748 100644 } if (c->ioprio_set) { --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 914589d..aa23c7a 100644 --- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,22 +1,22 @@ -From d3d65d4036670cbd5129fe55c09ca391286ef4b3 Mon Sep 17 00:00:00 2001 +From 7874912817b5ac7ed7f8557359a12d9d4b2f53eb Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 28 Feb 2018 21:25:22 -0800 -Subject: [PATCH 14/24] test-sizeof.c: Disable tests for missing typedefs in - musl +Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj Signed-off-by: Chen Qi + --- src/test/test-sizeof.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 35b0876..e78e7ca 100644 +index 7fc16a62b656..a710db5370b8 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c -@@ -41,8 +41,10 @@ int main(void) { +@@ -42,8 +42,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); @@ -27,7 +27,7 @@ index 35b0876..e78e7ca 100644 info(float); info(double); -@@ -60,7 +62,9 @@ int main(void) { +@@ -61,7 +63,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); @@ -37,6 +37,3 @@ index 35b0876..e78e7ca 100644 info(pid_t); info(uid_t); info(gid_t); --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index fd407f6..efeef07 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 +From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -25,16 +25,17 @@ just historical and not actually necessary or desired behaviour? Upstream-Status: Inappropriate [musl specific] Signed-off-by: Andre McCurdy + --- src/basic/fs-util.h | 22 +++++++++++++++++++++- src/shared/base-filesystem.c | 6 +++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 7ad030b..d4cb1e9 100644 +index 78d68be9fd85..c5dc84d41868 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h -@@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); +@@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m); int fd_warn_permissions(const char *path, int fd); @@ -64,10 +65,10 @@ index 7ad030b..d4cb1e9 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 89d7a7d..34b4ad5 100644 +index 657407da2d37..fbd5782d84fc 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); for (i = 0; i < ELEMENTSOF(table); i ++) { @@ -76,7 +77,7 @@ index 89d7a7d..34b4ad5 100644 continue; if (table[i].target) { -@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -85,7 +86,7 @@ index 89d7a7d..34b4ad5 100644 continue; /* check if a specific file exists at the target path */ -@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); @@ -94,6 +95,3 @@ index 89d7a7d..34b4ad5 100644 continue; } --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch index d556569..19a3eef 100644 --- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,8 +1,7 @@ -From af76c973e41929360a6e021f2ff9a7fc1d7994e9 Mon Sep 17 00:00:00 2001 +From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 16/24] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -10,25 +9,24 @@ using non-posix basename implementation, we have a way out Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj + --- - src/machine/machine-dbus.c | 4 ++++ - 1 file changed, 4 insertions(+) + src/machine/machine-dbus.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 7a558df..eca7d4b 100644 +index 760ccb445cd0..0df20f3864b3 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -11,6 +11,10 @@ +@@ -11,6 +11,11 @@ #include #undef basename +#if !defined(__GLIBC__) ++#include +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 24e24e8..56f4538 100644 --- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 +From a6f3359042219abaa8ae06dfcce41a4721e8c21f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 17/24] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -19,15 +19,16 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/process-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index b1c08fcade..0a7a1f7d89 100644 +index 24fec5ecb53a..642b02443c85 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { +@@ -1492,7 +1492,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 5901772..84a492f 100644 --- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 +From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 18/24] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -18,16 +18,17 @@ assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/journal/journal-send.c | 5 +++++ src/libsystemd/sd-bus/bus-error.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 3fea912..4f1e592 100644 +index 43ed756bda53..227ea64dbb48 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c -@@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove +@@ -336,7 +336,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; @@ -41,7 +42,7 @@ index 3fea912..4f1e592 100644 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index dc95237..bdda30f 100644 +index f760f0fdd21c..28a5159c4480 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { @@ -57,6 +58,3 @@ index dc95237..bdda30f 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 35cc66f..3b80646 100644 --- a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,7 +1,7 @@ -From 969ab9e68249fd383f4b513b1c9306bdac4ae9b2 Mon Sep 17 00:00:00 2001 +From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH 19/24] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP +Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP for currently unknown reasons they get exported to the shared libries even without being listed in the sym file @@ -11,12 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/libsystemd/sd-bus/bus-error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index bdda30f..e21853c 100644 +index 28a5159c4480..962a4de10c56 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { @@ -30,6 +31,3 @@ index bdda30f..e21853c 100644 /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch index 753d511..db4041b 100644 --- a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,7 +1,7 @@ -From 75c06e3e2a4760b36fffd95cdf5535b8ad73c481 Mon Sep 17 00:00:00 2001 +From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH 20/24] missing_type.h: add __compar_d_fn_t definition +Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition Fix the following compile failure: src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? @@ -9,12 +9,13 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 7d7c1e4..85902ab 100644 +index 23602ebbd533..917d314a81bf 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -13,6 +13,7 @@ @@ -25,6 +26,3 @@ index 7d7c1e4..85902ab 100644 #endif #ifndef __COMPAR_FN_T --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch index cdddf83..7dacc36 100644 --- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 +From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -9,12 +9,13 @@ error: redefinition of 'struct prctl_mm_map' Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index f80cd17..47e4893 100644 +index f80cd17f346b..47e489354053 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ @@ -27,6 +28,3 @@ index f80cd17..47e4893 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch index e266b9b..33c5758 100644 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch @@ -1,4 +1,4 @@ -From 6bcf562bd1e541c7aa46923d9a14201c7f785261 Mon Sep 17 00:00:00 2001 +From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Dec 2019 12:49:07 -0800 Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout @@ -11,15 +11,16 @@ purposes Upstream-Status: Pending Signed-off-by: Khem Raj Upstream-Status: Pending + --- src/basic/time-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index bfe2c60da1..8cf682b36a 100644 +index d7ef30d2fe52..4d3219f114b5 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1486,7 +1486,7 @@ int time_change_fd(void) { +@@ -1487,7 +1487,7 @@ int time_change_fd(void) { /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ static const struct itimerspec its = { @@ -28,6 +29,3 @@ index bfe2c60da1..8cf682b36a 100644 }; _cleanup_close_ int fd; --- -2.24.1 - diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch index 0e5629d..80beada 100644 --- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch @@ -1,7 +1,7 @@ -From 902412c271e0c5d9cb93b10ec0fb5b119b393474 Mon Sep 17 00:00:00 2001 +From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 16:53:06 +0800 -Subject: [PATCH 24/24] test-json.c: define M_PIl +Subject: [PATCH] test-json.c: define M_PIl Fix the following compile failure: src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? @@ -9,15 +9,16 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/test/test-json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-json.c b/src/test/test-json.c -index 9b8a2a9..efc746c 100644 +index a6613043b924..ca823ea79f05 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c -@@ -11,6 +11,10 @@ +@@ -12,6 +12,10 @@ #include "tests.h" #include "util.h" @@ -28,6 +29,3 @@ index 9b8a2a9..efc746c 100644 static void test_tokenizer(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd_243.4.bb b/meta/recipes-core/systemd/systemd_244.1.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.4.bb rename to meta/recipes-core/systemd/systemd_244.1.bb index a0d10e0..b686519 100644 --- a/meta/recipes-core/systemd/systemd_243.4.bb +++ b/meta/recipes-core/systemd/systemd_244.1.bb @@ -18,7 +18,6 @@ SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://99-default.preset \ " @@ -591,6 +590,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/ata_id \ ${rootlibexecdir}/udev/cdrom_id \ ${rootlibexecdir}/udev/collect \ + ${rootlibexecdir}/udev/fido_id \ ${rootlibexecdir}/udev/findkeyboards \ ${rootlibexecdir}/udev/keyboard-force-release.sh \ ${rootlibexecdir}/udev/keymap \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:56 +0000 Subject: [oe-commits] [openembedded-core] 04/37: iputils: Fix build determinism In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132052.E65AB232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8b00ec484fb851c301f13145e17707c0167feab1 Author: Richard Purdie AuthorDate: Thu Feb 6 23:34:46 2020 +0000 iputils: Fix build determinism The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index a672ccd..e0d2ae1 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -34,7 +34,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:53 +0000 Subject: [oe-commits] [openembedded-core] 01/37: perl: do not install files that contain build host specific data In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132052.C5D5D232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2e0f30c4680221c693495e3a0327378d502a518b Author: Alexander Kanavin AuthorDate: Thu Feb 6 23:14:38 2020 +0100 perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057..98e3361 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 3634122..dcdabb6 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -144,6 +144,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:55 +0000 Subject: [oe-commits] [openembedded-core] 03/37: openssl: Fix reproducibility issue In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132052.DA9F2232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 37db519eedb7eb5cd4f14d05f30f5d580aa7458d Author: Richard Purdie AuthorDate: Thu Feb 6 22:47:07 2020 +0000 openssl: Fix reproducibility issue There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000..a24260c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 7fd0f9a..c2ba005 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:54 +0000 Subject: [oe-commits] [openembedded-core] 02/37: perl: Fix various reproducibile build issues In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132052.D01BE232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 482fd0d99f989b5a72a25bdf402fb2f219420b5d Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb6..5d76271 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:52 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (6f6a6bb -> 44a4ac2) Message-ID: <158116805239.25941.1617719248824315399@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 6f6a6bb microblaze: Adjust Linux items from microblazeeb to microblaze new 2e0f30c perl: do not install files that contain build host specific data new 482fd0d perl: Fix various reproducibile build issues new 37db519 openssl: Fix reproducibility issue new 8b00ec4 iputils: Fix build determinism new c3f6a61 libinput: Fix determinism issue new 506b36b libgcrypt: Fix determinism issue new 61650dd sudo: specify where target tools are new 0227e92 sysvinit: Fix Reproducibility issue new 75e4ced libevdev: Fix determinism issue new 09c8a28 ncurses: Fix reproducibility issue new eaa8345 kern-tools: tweak symbol_why to be python safe new fa96457 kern-tools: integrate merge_config fix for gold linker new 83a552d kern-tools-native: use more common S value and oe_runmake new 48d8f97 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass new ee358e0 kernel-yocto: Drop setting of unused variables in do_kernel_metadata new 613c43f kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set new 36fe2ef kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh new ec281a9 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created new 06577d4 kernel-yocto: fix defconfig detection in find_sccs() new a60c4c1 kern-tools: fix merge_config when LD contains parameters new 84eb1dc oeqa: Use cpio 2.13 as testcase new eadb899 qemurunner.py: add try/except for pid handling race new 61efc1e chkconfig: remove the recipe new fa356b2 package.bbclass: Fix debug source processing for static libraries new c50fcd5 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs new 17fa66c package.bbclass: Support stripping and debug copy of static libraries new 2acfee6 sstate.bbclass: fix issue while handling long sstate filenames new 877d3ff cryptodev: update to Jan.23, 2020 new da9b363 bison: Upgrade to 3.5.1 new cad375e xserver-xorg: upgrade 1.20.6 -> 1.20.7 new a3f8270 mesa: upgrade 19.3.1 -> 19.3.3 new 3081d39 python3: fix the installation path of libpython3.7m.a for multilib new fb33127 python3: Do not hardcode "lib" for distutils new c3df7ee procps: upgrade 3.3.15 -> 3.3.16 new e669dd9 lighttpd: upgrade 1.4.54 -> 1.4.55 new d3c6f7e dhcp: upgrade 4.4.1 -> 4.4.2 new 44a4ac2 systemd: upgrade 243.4 -> 244.1 The 37 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 2 +- meta/classes/kernel-yocto.bbclass | 49 ++- meta/classes/package.bbclass | 80 ++++- meta/classes/sstate.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- meta/conf/distro/include/maintainers.inc | 2 - meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 4 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- meta/lib/oeqa/utils/qemurunner.py | 5 +- .../dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ---- ...d-includes-of-new-BIND9-compatibility-hea.patch | 79 ----- .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- .../openssl/openssl/reproducible.patch | 32 ++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + meta/recipes-core/ncurses/ncurses.inc | 1 + .../packagegroups/packagegroup-self-hosted.bb | 1 - ...systemd-boot_243.4.bb => systemd-boot_244.1.bb} | 0 ...systemd-conf_243.2.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...t-install-dependency-links-at-install-tim.patch | 33 +- ...01-do-not-disable-buffer-in-writing-files.patch | 168 +++++---- .../0002-don-t-use-glibc-specific-qsort_r.patch | 26 +- ...src-login-brightness.c-include-sys-wait.h.patch | 8 +- ...pper-instead-of-looking-for-relative-opti.patch | 63 ---- ...0003-implment-systemd-sysv-install-for-OE.patch | 10 +- ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 37 +- .../0003-src-basic-copy.c-include-signal.h.patch | 12 +- ...llback-parse_printf_format-implementation.patch | 29 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 10 +- ...asic-missing.h-check-for-missing-strndupa.patch | 381 ++++++++++++++++----- .../systemd/0006-Include-netinet-if_ether.h.patch | 101 ++++-- ...-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 +- .../0008-add-missing-FTW_-macros-for-musl.patch | 10 +- ...-of-__register_atfork-for-non-glibc-build.patch | 14 +- .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 22 +- ....c-Disable-tests-for-missing-typedefs-in-.patch | 15 +- ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 +- ...c-compatible-basename-for-non-glibc-syste.patch | 18 +- ...ble-buffering-when-writing-to-oom_score_a.patch | 9 +- ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 14 +- ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 10 +- ...ing_type.h-add-__compar_d_fn_t-definition.patch | 10 +- ...id-redefinition-of-prctl_mm_map-structure.patch | 10 +- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 10 +- .../systemd/0024-test-json.c-define-M_PIl.patch | 12 +- .../systemd/{systemd_243.4.bb => systemd_244.1.bb} | 2 +- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + .../bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 +- meta/recipes-devtools/perl/files/determinism.patch | 81 +++++ meta/recipes-devtools/perl/perl-ptest.inc | 3 + meta/recipes-devtools/perl/perl_5.30.1.bb | 4 + .../python3/0001-configure.ac-fix-LIBPL.patch | 35 ++ ...python3-Do-not-hardcode-lib-for-distutils.patch | 43 +++ meta/recipes-devtools/python/python3_3.8.1.bb | 6 +- .../chkconfig-alternatives-native_1.3.59.bb | 44 --- .../chkconfig/chkconfig/replace_caddr_t.patch | 33 -- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 71 ---- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 +- .../{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 +- .../procps/0001-Fix-out-of-tree-builds.patch | 24 -- .../procps/{procps_3.3.15.bb => procps_3.3.16.bb} | 5 +- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 +- .../mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} | 0 .../mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} | 4 +- .../wayland/libinput/determinism.patch | 21 ++ meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 + ...rmmode_display.c-add-missing-mi.h-include.patch | 23 ++ ...erver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 +- meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- ...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 ---- .../kern-tools/kern-tools-native_git.bb | 13 +- meta/recipes-kernel/linux/linux-yocto.inc | 21 -- .../libevdev/libevdev/determinism.patch | 34 ++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- .../libgcrypt/files/determinism.patch | 32 ++ meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb | 1 + 79 files changed, 1135 insertions(+), 899 deletions(-) delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch rename meta/recipes-connectivity/dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} (74%) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch rename meta/recipes-core/systemd/{systemd-boot_243.4.bb => systemd-boot_244.1.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_243.2.bb => systemd-conf_244.1.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch rename meta/recipes-core/systemd/{systemd_243.4.bb => systemd_244.1.bb} (99%) rename meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} (90%) create mode 100644 meta/recipes-devtools/perl/files/determinism.patch create mode 100644 meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch create mode 100644 meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch delete mode 100644 meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb delete mode 100644 meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb rename meta/recipes-extended/lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} (96%) delete mode 100644 meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch rename meta/recipes-extended/procps/{procps_3.3.15.bb => procps_3.3.16.bb} (93%) rename meta/recipes-graphics/mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} (88%) create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (71%) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:00 +0000 Subject: [oe-commits] [openembedded-core] 08/37: sysvinit: Fix Reproducibility issue In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.192FF232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0227e929021263c51d2e7db36224000fecb01f1c Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 2b146b1..21ef0e9 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -29,6 +29,7 @@ B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:57 +0000 Subject: [oe-commits] [openembedded-core] 05/37: libinput: Fix determinism issue In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132052.EFD33232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c3f6a6113f562ecdb13386c3ff52adb7973980a4 Author: Richard Purdie AuthorDate: Thu Feb 6 23:57:28 2020 +0000 libinput: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb index 46d46c5..bc5a76d 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.3.bb @@ -14,6 +14,7 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:59 +0000 Subject: [oe-commits] [openembedded-core] 07/37: sudo: specify where target tools are In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.0F396232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 61650dd8498a093f3bfa93202c9cd2e9a7fb7834 Author: Ross Burton AuthorDate: Fri Feb 7 14:29:28 2020 +0000 sudo: specify where target tools are sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 67815fa..3b314dd 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb index 6ea06a9..9d014d2 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -13,8 +13,15 @@ SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:04 +0000 Subject: [oe-commits] [openembedded-core] 12/37: kern-tools: integrate merge_config fix for gold linker In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.41470232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fa964575f9e00d8530563e61075992c5b69df137 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:45 2020 -0500 kern-tools: integrate merge_config fix for gold linker Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1ab..3f9cfe7 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:02 +0000 Subject: [oe-commits] [openembedded-core] 10/37: ncurses: Fix reproducibility issue In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.2D343232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 09c8a28893e7ca94a44232d802e1cb02a8f34b87 Author: Richard Purdie AuthorDate: Fri Feb 7 15:09:48 2020 +0000 ncurses: Fix reproducibility issue The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35..b7bf4c0 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:03 +0000 Subject: [oe-commits] [openembedded-core] 11/37: kern-tools: tweak symbol_why to be python safe In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.37D38232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eaa83453fe206567253257fcefdbf6feb6d53d72 Author: Bruce Ashfield AuthorDate: Thu Feb 6 12:35:44 2020 -0500 kern-tools: tweak symbol_why to be python safe Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6f..57ec1ab 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:20:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:20:58 +0000 Subject: [oe-commits] [openembedded-core] 06/37: libgcrypt: Fix determinism issue In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.054A6232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 506b36b6d86b3454fcc3cb85f6229cbe8d14f5b5 Author: Richard Purdie AuthorDate: Thu Feb 6 23:58:46 2020 +0000 libgcrypt: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000..ad0b8c7 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb index 0478557..4e0eb0a 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-Prefetch-GCM-look-up-tables.patch \ file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:05 +0000 Subject: [oe-commits] [openembedded-core] 13/37: kern-tools-native: use more common S value and oe_runmake In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.4BBB7232A3D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 83a552d0aea7f789b3a5a7ff96f3d3a5e346cc2c Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:46 2020 -0500 kern-tools-native: use more common S value and oe_runmake Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7..f263421 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:01 +0000 Subject: [oe-commits] [openembedded-core] 09/37: libevdev: Fix determinism issue In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.23596232A39@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 75e4cedb986379db2e8a897df52ee1363f9a9a80 Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:06 +0000 Subject: [oe-commits] [openembedded-core] 14/37: kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.56811232A3E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 48d8f97975c0b167c0f4f32145813f00b8c8a7a8 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:47 2020 -0500 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeaf..a0362f6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946..91df9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:07 +0000 Subject: [oe-commits] [openembedded-core] 15/37: kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.611EA232A3F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ee358e03b1ad6eb0624cee0306fef807de0116a6 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:48 2020 -0500 kernel-yocto: Drop setting of unused variables in do_kernel_metadata The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6..9a4d286 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:09 +0000 Subject: [oe-commits] [openembedded-core] 17/37: kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.772BE232A41@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 36fe2efc91fec5a52374a2dc4814a69076a2d28e Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:50 2020 -0500 kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', ' [...] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-compo [...] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f..f71aa7d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:10 +0000 Subject: [oe-commits] [openembedded-core] 18/37: kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.81DA9232A42@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ec281a948a23365bd4536139dac077fb1a5eae6d Author: Martin Jansa AuthorDate: Thu Feb 6 12:35:51 2020 -0500 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d..d961901 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:14 +0000 Subject: [oe-commits] [openembedded-core] 22/37: qemurunner.py: add try/except for pid handling race In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.B5FD5232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eadb899e23b18eb9eaff145c3bf5b20fb417c3e8 Author: Trevor Gamblin AuthorDate: Fri Feb 7 08:46:52 2020 -0500 qemurunner.py: add try/except for pid handling race In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. [YOCTO #13675] Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35..4704422 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -406,7 +406,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:16 +0000 Subject: [oe-commits] [openembedded-core] 24/37: package.bbclass: Fix debug source processing for static libraries In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.C7493232A43@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fa356b23c2f4599681693bba50d36659b07a8125 Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:06 2020 -0600 package.bbclass: Fix debug source processing for static libraries Format of the sources list is the [ (file, [source, ...]), ... ] before this change, the static libraries were processed but the items were included incorrectly causing no sources for static libraries to be included. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ef3de35..46ec9b6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1051,7 +1051,7 @@ python split_and_strip_files () { if debugsrcdir and not targetos.startswith("mingw"): for file in staticlibs: - results.extend(source_info(file, d, fatal=False)) + results.append( (file, source_info(file, d, fatal=False)) ) sources = set() for r in results: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:15 +0000 Subject: [oe-commits] [openembedded-core] 23/37: chkconfig: remove the recipe In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.BE6CE232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 61efc1e287326f52810a439ccde996f45ef89733 Author: Alexander Kanavin AuthorDate: Fri Feb 7 20:45:59 2020 +0100 chkconfig: remove the recipe chkconfig is one of the options for virtual/update-alternatives, however opkg-utils have been used as the default for a very long time, while chkconfig isn't anymore tested in any way, and is stuck at a very old version due to newer versions requiring selinux. [YOCTO #11264] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 - .../packagegroups/packagegroup-self-hosted.bb | 1 - .../chkconfig-alternatives-native_1.3.59.bb | 44 -------------- .../chkconfig/chkconfig/replace_caddr_t.patch | 33 ---------- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 71 ---------------------- 5 files changed, 151 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a80e85a..c68e9ed 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal " RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ccache = "Robert Yang " RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ea6d567..9a70b18 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ RDEPENDS_packagegroup-self-hosted-extended = "\ bzip2 \ - chkconfig \ chrpath \ cpio \ curl \ diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb deleted file mode 100644 index 87fa8eb..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb +++ /dev/null @@ -1,44 +0,0 @@ -require recipes-extended/chkconfig/chkconfig_1.3.58.bb - -SUMMARY = "${SUMMARY_chkconfig-alternatives}" -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" -DEPENDS = "" -PROVIDES += "virtual/update-alternatives-native" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -# The sysroot branch is 1.3.59 + some git commits from master + --sysroot -# support for alternatives. -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" -S = "${WORKDIR}/git" -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" - -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" -PV = "1.3.59+${SRCPV}" - -inherit native - -# We want our native recipes to build using the target paths rather than paths -# into the sysroot, as we may use them to construct the rootfs. As such, we -# only adjust the paths to match the metadata for the target, not native. -obey_variables () { - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c -} - -do_compile () { - oe_runmake alternatives -} - -do_install () { - install -d ${D}${sysconfdir}/alternatives \ - ${D}${localstatedir}/lib/alternatives - - install -D -m 0755 alternatives ${D}${bindir}/alternatives - install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 - - ln -s alternatives ${D}${bindir}/update-alternatives - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 -} - -do_install_append_linuxstdbase() { - rm -rf ${D}${libdir}/lsb -} diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch deleted file mode 100644 index 96d1938..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -caddr_t is a legacy BSD type which was rejected by the POSIX standard. -Use void * instead. - -sys/unitstd.h is not needed and moreover its not available on all C library -implementations e.g. musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Index: chkconfig-1.3.58/alternatives.c -=================================================================== ---- chkconfig-1.3.58.orig/alternatives.c -+++ chkconfig-1.3.58/alternatives.c -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - - #define FLAGS_TEST (1 << 0) -Index: chkconfig-1.3.58/leveldb.c -=================================================================== ---- chkconfig-1.3.58.orig/leveldb.c -+++ chkconfig-1.3.58/leveldb.c -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name - fstat(fd, &sb); - - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); -- if (bufstart == ((caddr_t) -1)) { -+ if (bufstart == ((void*) -1)) { - close(fd); - return -1; - } diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb deleted file mode 100644 index d21dd69..0000000 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" -DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ -information for system services. Chkconfig manipulates the numerous \ -symbolic links in /etc/rc.d, to relieve system administrators of some \ -of the drudgery of manually editing the symbolic links." - -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" - -HOMEPAGE = "https://github.com/fedora-sysv" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -DEPENDS = "libnewt popt" -PROVIDES += "virtual/update-alternatives" - -PR = "r7" - -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" - -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ - file://replace_caddr_t.patch \ - " - -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit gettext - -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS -# -EXTRA_OEMAKE = "\ - 'RPM_OPT_FLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'BINDIR=${base_sbindir}' \ - 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' \ - 'ALTDIR=${localstatedir}/lib/alternatives' \ - 'ALTDATADIR=${sysconfdir}/alternatives' \ -" - -do_unpack[postfuncs] += "obey_variables" -do_unpack[vardeps] += "obey_variables" -obey_variables () { - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ - -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c -} - -do_install() { - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ - 'BINDIR=${sbindir}' install - install -d ${D}${sysconfdir}/chkconfig.d -} - -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ -information about the symbolic links comprising the alternatives system." -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" -DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ -This package contains documentation." -RPROVIDES_${PN}-alternatives += "update-alternatives" -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" -FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ - ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ - ${mandir}/man8/update-alternatives.8" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:17 +0000 Subject: [oe-commits] [openembedded-core] 25/37: package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.D0D6C232A44@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c50fcd54ffe60b63d042d05e6cf538a593dc410f Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:07 2020 -0600 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs Change the order of the skip processing to happen before any .ko and static library processing. This will allow these types of files to be individually skipped if necessary. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 46ec9b6..7080d63 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -955,12 +955,6 @@ python split_and_strip_files () { for root, dirs, files in cpath.walk(dvar): for f in files: file = os.path.join(root, f) - if file.endswith(".ko") and file.find("/lib/modules/") != -1: - kernmods.append(file) - continue - if oe.package.is_static_lib(file): - staticlibs.append(file) - continue # Skip debug files if debugappend and file.endswith(debugappend): @@ -971,6 +965,13 @@ python split_and_strip_files () { if file in skipfiles: continue + if file.endswith(".ko") and file.find("/lib/modules/") != -1: + kernmods.append(file) + continue + if oe.package.is_static_lib(file): + staticlibs.append(file) + continue + try: ltarget = cpath.realpath(file, dvar, False) s = cpath.lstat(ltarget) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:13 +0000 Subject: [oe-commits] [openembedded-core] 21/37: oeqa: Use cpio 2.13 as testcase In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.AC467232A30@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 84eb1dc4fe8a11cd2d05b703070a6fb6de05b873 Author: Khem Raj AuthorDate: Tue Feb 4 21:41:19 2020 -0800 oeqa: Use cpio 2.13 as testcase cpio 2.12 was released in 2015 and might have used older autotools which could result in errors like https://bugzilla.yoctoproject.org/show_bug.cgi?id=13779 Bumping to 2.13 will help in matching the tool versions A good change on top would be to run aclocal -I .; autoheader; autoconf; automake --add-missing -c before running configure step perhaps [YOCTO #13779] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 4 ++-- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index f4e871e..4bd72dd 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -12,7 +12,7 @@ class BuildCpioTest(OERuntimeTestCase): @classmethod def setUpClass(cls): - uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.12.tar.gz' + uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.13.tar.gz' cls.project = TargetBuildProject(cls.tc.target, uri, dl_dir = cls.tc.td['DL_DIR']) diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 0a5e68d..b0beafb 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -17,10 +17,10 @@ class BuildCpioTest(OESDKTestCase): """ def test_cpio(self): with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz") + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz") dirs = {} - dirs["source"] = os.path.join(testdir, "cpio-2.12") + dirs["source"] = os.path.join(testdir, "cpio-2.13") dirs["build"] = os.path.join(testdir, "build") dirs["install"] = os.path.join(testdir, "install") diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 03901a2..8091425 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -40,7 +40,7 @@ class MetaIDE(OESelftestTestCase): def test_meta_ide_can_build_cpio_project(self): dl_dir = self.td.get('DL_DIR', None) self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, - "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz", + "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() self.assertEqual(self.project.run_configure(), 0, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:18 +0000 Subject: [oe-commits] [openembedded-core] 26/37: package.bbclass: Support stripping and debug copy of static libraries In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.DBD71232A45@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 17fa66c8199d73f0b59b2b3e609075933bf1e74b Author: Mark Hatle AuthorDate: Fri Feb 7 14:20:08 2020 -0600 package.bbclass: Support stripping and debug copy of static libraries By default, we won't copy and strip static libraries. However, this functionality can be useful in some cases where people are doing development on the target, and don't generally want the larger debug capable static libraries. To enable the new functionality set: PACKAGE_DEBUG_STATIC_SPLIT = '1' Add a new function splitstaticdebuginfo. Thus function will copy the unmodified static library into the specific debug directory location. By keeping an unmodified version, it is possible for a user trying to debug something to use -L /usr/lib/.debug-static and their existing build commands to switch from stripped to full debug versions. The PACKAGE_DEBUG_SPLIT_STYLE will select between two different approaches, /usr/lib/debug-static or /.debug-static. Additionally you can now choose to strip static libraries to conserve space. If either 'PACKAGE_DEBUG_STATIC_SPLIT' or 'PACKAGE_STRIP_STATIC' is set to 1, the static library will be stripped. (This is not on by default, as it could make diagnosing static library usage difficult in some cases.) Add to insane.bbclass a skip to the staticdev warning for the specific -dbg package versions. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- meta/classes/package.bbclass | 67 ++++++++++++++++++++++++++++++++++++++++++-- meta/conf/bitbake.conf | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9..7425b8c 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -182,7 +182,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages): libgcc.a, libgcov.a will be skipped in their packages """ - if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a"): + if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a") and not '/usr/lib/debug-static/' in path and not '/.debug-static/' in path: package_qa_add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7080d63..1efc396 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -416,6 +416,49 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, return (file, sources) +def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d): + # Unlike the function above, there is no way to split a static library + # two components. So to get similar results we will copy the unmodified + # static library (containing the debug symbols) into a new directory. + # We will then strip (preserving symbols) the static library in the + # typical location. + # + # return a mapping of files:debugsources + + import stat + import shutil + + src = file[len(dvar):] + dest = debugstaticlibdir + os.path.dirname(src) + debugstaticdir + "/" + os.path.basename(src) + debugstaticappend + debugfile = dvar + dest + sources = [] + + # Copy the file... + bb.utils.mkdirhier(os.path.dirname(debugfile)) + #bb.note("Copy %s -> %s" % (file, debugfile)) + + dvar = d.getVar('PKGD') + + newmode = None + if not os.access(file, os.W_OK) or os.access(file, os.R_OK): + origmode = os.stat(file)[stat.ST_MODE] + newmode = origmode | stat.S_IWRITE | stat.S_IREAD + os.chmod(file, newmode) + + # We need to extract the debug src information here... + if debugsrcdir: + sources = source_info(file, d) + + bb.utils.mkdirhier(os.path.dirname(debugfile)) + + # Copy the unmodified item to the debug directory + shutil.copy2(file, debugfile) + + if newmode: + os.chmod(file, origmode) + + return (file, sources) + def copydebugsources(debugsrcdir, sources, d): # The debug src information written out to sourcefile is further processed # and copied to the destination here. @@ -916,25 +959,37 @@ python split_and_strip_files () { if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory': # Single debug-file-directory style debug info debugappend = ".debug" + debugstaticappend = "" debugdir = "" + debugstaticdir = "" debuglibdir = "/usr/lib/debug" + debugstaticlibdir = "/usr/lib/debug-static" debugsrcdir = "/usr/src/debug" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-without-src': # Original OE-core, a.k.a. ".debug", style debug info, but without sources in /usr/src/debug debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg': debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" else: # Original OE-core, a.k.a. ".debug", style debug info debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" # @@ -1051,8 +1106,11 @@ python split_and_strip_files () { results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) if debugsrcdir and not targetos.startswith("mingw"): - for file in staticlibs: - results.append( (file, source_info(file, d, fatal=False)) ) + if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d)) + else: + for file in staticlibs: + results.append( (file,source_info(file, d)) ) sources = set() for r in results: @@ -1121,6 +1179,9 @@ python split_and_strip_files () { sfiles.append((file, elf_file, strip)) for f in kernmods: sfiles.append((f, 16, strip)) + if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + for f in staticlibs: + sfiles.append((f, 16, strip)) oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d) @@ -1188,7 +1249,7 @@ python populate_packages () { dir = os.sep for f in (files + dirs): path = "." + os.path.join(dir, f) - if "/.debug/" in path or path.endswith("/.debug"): + if "/.debug/" in path or "/.debug-static/" in path or path.endswith("/.debug"): debug.append(path) for pkg in packages: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8b4621f..954c06b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -325,7 +325,7 @@ FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a" SECTION_${PN}-staticdev = "devel" RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" -FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" +FILES_${PN}-dbg = "/usr/lib/debug /usr/lib/debug-static /usr/src/debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:11 +0000 Subject: [oe-commits] [openembedded-core] 19/37: kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.94638232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 06577d49c50b7e9f1f40fe5b52ec88d1bdc1430c Author: Gavin Li AuthorDate: Thu Feb 6 12:35:52 2020 -0500 kernel-yocto: fix defconfig detection in find_sccs() The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901..918d101 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:08 +0000 Subject: [oe-commits] [openembedded-core] 16/37: kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.6C56F232A40@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 613c43f910cbdf5e03ef3d5bbf92de69082a30c9 Author: Paul Barker AuthorDate: Thu Feb 6 12:35:49 2020 -0500 kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d286..e8a9b1f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:26 +0000 Subject: [oe-commits] [openembedded-core] 34/37: procps: upgrade 3.3.15 -> 3.3.16 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.4E571232A39@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c3df7eec1ba99a34b4037da786863de87073576d Author: Yi Zhao AuthorDate: Thu Feb 6 19:18:12 2020 +0800 procps: upgrade 3.3.15 -> 3.3.16 Drop 0001-Fix-out-of-tree-builds.patch since it has been merged upstream. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../procps/0001-Fix-out-of-tree-builds.patch | 24 ---------------------- .../procps/{procps_3.3.15.bb => procps_3.3.16.bb} | 5 ++--- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index e548194..0000000 --- a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Apr 2018 14:09:45 +0300 -Subject: [PATCH] Fix out of tree builds - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - include/nls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/nls.h b/include/nls.h -index 1166b7b..f5abe05 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -6,7 +6,7 @@ - #define PROCPS_NG_NLS_H - - /* programs issuing textdomain() need PACKAGE string */ --#include "../config.h" -+#include "config.h" - - /* programs issuing bindtextdomain() also need LOCALEDIR string */ - #ifndef LOCALEDIR diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.16.bb similarity index 93% rename from meta/recipes-extended/procps/procps_3.3.15.bb rename to meta/recipes-extended/procps/procps_3.3.16.bb index 17abd96..60f9097 100644 --- a/meta/recipes-extended/procps/procps_3.3.15.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -14,11 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ file://sysctl.conf \ - file://0001-Fix-out-of-tree-builds.patch \ " -SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" -SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" +SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" +SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" S = "${WORKDIR}/procps-ng-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:27 +0000 Subject: [oe-commits] [openembedded-core] 35/37: lighttpd: upgrade 1.4.54 -> 1.4.55 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.59EF9232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e669dd946956fed178c377fb9559a52c5885e71c Author: Wang Mingyu AuthorDate: Thu Feb 6 06:52:26 2020 -0800 lighttpd: upgrade 1.4.54 -> 1.4.55 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb similarity index 96% rename from meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb rename to meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb index 20ce698..7a255ce 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb @@ -19,8 +19,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "7abc776243c811e9872f73ab38b7f8b5" -SRC_URI[sha256sum] = "cf14cce2254a96d8fcb6d3181e1a3c29a8f832531c3e86ff6f2524ecda9a8721" +SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" +SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:12 +0000 Subject: [oe-commits] [openembedded-core] 20/37: kern-tools: fix merge_config when LD contains parameters In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.9F679232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a60c4c116efecd7a6ee5a11b1d366bb00b9d23ce Author: Bruce Ashfield AuthorDate: Fri Feb 7 09:52:04 2020 -0500 kern-tools: fix merge_config when LD contains parameters To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101..44863ad 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421..4f1af73 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:19 +0000 Subject: [oe-commits] [openembedded-core] 27/37: sstate.bbclass: fix issue while handling long sstate filenames In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.E6D39232A46@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2acfee61a062c6520a413b2a797544d968bb0c76 Author: Jaewon Lee AuthorDate: Thu Feb 6 13:45:11 2020 -0800 sstate.bbclass: fix issue while handling long sstate filenames When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Using '//' instead to do the division to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 > components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..0beeb33 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators - avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 + avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3 components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:21 +0000 Subject: [oe-commits] [openembedded-core] 29/37: bison: Upgrade to 3.5.1 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.07947232A48@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit da9b363acea2545721702fc7c39c4589b666c61b Author: Khem Raj AuthorDate: Tue Feb 4 17:08:19 2020 -0800 bison: Upgrade to 3.5.1 Minor upgrade on 3.5 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.bb rename to meta/recipes-devtools/bison/bison_3.5.1.bb index 3d8f657..e70252d 100644 --- a/meta/recipes-devtools/bison/bison_3.5.bb +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:25 +0000 Subject: [oe-commits] [openembedded-core] 33/37: python3: Do not hardcode "lib" for distutils In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.44470232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fb33127de5d80f5bcb84edf6cf4007bca73fa863 Author: Changqing Li AuthorDate: Fri Feb 7 14:07:44 2020 +0800 python3: Do not hardcode "lib" for distutils Get the sys.lib from python3 itself and do not use hardcoded value of 'lib' for distutils. Solve the error below that occurs when run "python3 setup.py install" on lib64 multilib platform: [Errno 2] No such file or directory: '/usr/lib/python3.7/site-packages/test-easy-install-1828.write-test' Signed-off-by: Li Zhou Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- ...python3-Do-not-hardcode-lib-for-distutils.patch | 43 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 44 insertions(+) diff --git a/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch new file mode 100644 index 0000000..fe031b9 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch @@ -0,0 +1,43 @@ +From bb711b53f10d32a90a27ccf4b0dc51e4a701d862 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:42:09 +0800 +Subject: [PATCH] python3: Do not hardcode "lib" for distutils + +Get the sys.lib from python3 itself and do not use +hardcoded value of 'lib' for distutils. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + Lib/distutils/command/install.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index c625c95..8e32f54 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -19,6 +19,8 @@ from site import USER_BASE + from site import USER_SITE + HAS_USER_SITE = True + ++libname = sys.lib ++ + WINDOWS_SCHEME = { + 'purelib': '$base/Lib/site-packages', + 'platlib': '$base/Lib/site-packages', +@@ -29,8 +31,8 @@ WINDOWS_SCHEME = { + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/' + libname + '/python$py_version_short/site-packages', ++ 'platlib': '$platbase/' + libname + '/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 981b52e..c836066 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -30,6 +30,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ + file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:23 +0000 Subject: [oe-commits] [openembedded-core] 31/37: mesa: upgrade 19.3.1 -> 19.3.3 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.23A8A232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a3f8270d023cd19c64d491c970f7ff87bb4355c7 Author: Wang Mingyu AuthorDate: Thu Feb 6 11:02:54 2020 -0800 mesa: upgrade 19.3.1 -> 19.3.3 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.1.bb b/meta/recipes-graphics/mesa/mesa_19.3.3.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa_19.3.3.bb index b889f09..7e0c5d6 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.1.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.3.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "5c5965db31993af47fee82c9a7ccba5e" -SRC_URI[sha256sum] = "cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4eb8274723e033beae59" +SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" +SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:28 +0000 Subject: [oe-commits] [openembedded-core] 36/37: dhcp: upgrade 4.4.1 -> 4.4.2 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.65476232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d3c6f7e689a743fd060755eceb60353093013e84 Author: Wang Mingyu AuthorDate: Thu Feb 6 06:53:22 2020 -0800 dhcp: upgrade 4.4.1 -> 4.4.2 0001-Fix-a-NSUPDATE-compiling-issue.patch 0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch Removed since they are included in 4.4.2. refresh the following patch: 0004-Fix-out-of-tree-builds.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ------------------- ...d-includes-of-new-BIND9-compatibility-hea.patch | 79 ---------------------- .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- 4 files changed, 6 insertions(+), 153 deletions(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch deleted file mode 100644 index f12a112..0000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Tue, 14 May 2019 11:07:15 +0200 -Subject: [PATCH] Fix a NSUPDATE compiling issue - -Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] - -A following error was observed when NSUPDATE is not defined: -| omapip/isclib.c: In function 'dns_client_init': -| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| if (dhcp_gbl_ctx.dnsclient == NULL) { -| ^ -| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| &dhcp_gbl_ctx.dnsclient, -| ^ -| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4' -| (dhcp_gbl_ctx.use_local4 ? -| ^ -| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr' -| &dhcp_gbl_ctx.local4_sockaddr -| ^ -| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6' -| (dhcp_gbl_ctx.use_local6 ? -| ^ -| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr' -| &dhcp_gbl_ctx.local6_sockaddr - -Fix it by adding NSUPDATE conditional checking. - -Signed-off-by: Ming Liu ---- - includes/omapip/isclib.h | 2 ++ - omapip/isclib.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 538b927..6c20584 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -141,6 +141,8 @@ void isclib_cleanup(void); - void dhcp_signal_handler(int signal); - extern int shutdown_signal; - -+#if defined (NSUPDATE) - isc_result_t dns_client_init(); -+#endif - - #endif /* ISCLIB_H */ -diff --git a/omapip/isclib.c b/omapip/isclib.c -index db3b895..ce4b4a1 100644 ---- a/omapip/isclib.c -+++ b/omapip/isclib.c -@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) { - } - } - -+#if defined (NSUPDATE) - isc_result_t dns_client_init() { - isc_result_t result; - if (dhcp_gbl_ctx.dnsclient == NULL) { -@@ -387,3 +388,4 @@ isc_result_t dns_client_init() { - - return ISC_R_SUCCESS; - } -+#endif --- -2.7.4 - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch deleted file mode 100644 index 1bc1422..0000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [master] Added includes of new BIND9 compatibility headers - - Merges in rt48072. - -Upstream-Status: Backport -Signed-off-by: Adrian Bunk - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch index b71c93d..7b57730 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch @@ -85,9 +85,11 @@ Index: dhcp-4.4.1/relay/Makefile.am =================================================================== --- dhcp-4.4.1.orig/relay/Makefile.am +++ dhcp-4.4.1/relay/Makefile.am -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ + SUBDIRS = . tests + -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes - + sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb similarity index 74% rename from meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb rename to meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb index 020777b..b56a204 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb @@ -9,13 +9,11 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat file://0009-remove-dhclient-script-bash-dependency.patch \ file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ file://0013-fixup_use_libbind.patch \ - file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ - file://0001-Fix-a-NSUPDATE-compiling-issue.patch \ file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \ " -SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" -SRC_URI[sha256sum] = "2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608" +SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" +SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" LDFLAGS_append = " -pthread" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:20 +0000 Subject: [oe-commits] [openembedded-core] 28/37: cryptodev: update to Jan.23, 2020 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132053.F1420232A47@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 877d3ff61fbd55baa5e5fd00bd8a58b31e214cc9 Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 6 12:57:43 2020 -0800 cryptodev: update to Jan.23, 2020 * Remove backported patches: 0001-Fix-module-loading-with-Linux-v5.0-rc5.patch Update to latest cryptodev dated Jan.23, 2020. Fixes build on kernel v5.5+ Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- ...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 ---------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 9d8ba44..f99f8bc 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -4,9 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \ - file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \ " -SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29" +SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch deleted file mode 100644 index 34ec872..0000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c] - -Backport patch from upstream to fix module cryptodev loading error. - -Signed-off-by: Kai Kang - -From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001 -From: "Derald D. Woods" -Date: Sun, 10 Feb 2019 13:22:19 -0600 -Subject: [PATCH] Fix module loading with Linux v5.0-rc5 - -This commit fixes this module load error: -[...] -[ 29.112091] cryptodev: loading out-of-tree module taints kernel. -[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter -[...] - -Upstream Linux support for unused GIVCIPHER, and others, was dropped here: - -c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators) - -Signed-off-by: Derald D. Woods ---- - cryptlib.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/cryptlib.c b/cryptlib.c -index 6e66698..4a87037 100644 ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -38,7 +38,9 @@ - #include "cryptodev_int.h" - #include "cipherapi.h" - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) - extern const struct crypto_type crypto_givcipher_type; -+#endif - - static void cryptodev_complete(struct crypto_async_request *req, int err) - { -@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) - tfm = crypto_skcipher_tfm(out->async.s); -- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) || -- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) { -+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) -+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) -+#endif -+ ) { - struct ablkcipher_alg *alg; - - alg = &tfm->__crt_alg->cra_ablkcipher; --- -2.20.0 - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:22 +0000 Subject: [oe-commits] [openembedded-core] 30/37: xserver-xorg: upgrade 1.20.6 -> 1.20.7 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.17A04232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cad375e113b52069eaa24d7b07a97cc63ae9da46 Author: Alexander Kanavin AuthorDate: Fri Feb 7 20:45:58 2020 +0100 xserver-xorg: upgrade 1.20.6 -> 1.20.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...rmmode_display.c-add-missing-mi.h-include.patch | 23 ++++++++++++++++++++++ ...erver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 ++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch new file mode 100644 index 0000000..4b8e43f --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch @@ -0,0 +1,23 @@ +From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 7 Feb 2020 20:36:45 +0100 +Subject: [PATCH] drmmode_display.c: add missing mi.h include + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +index e18cc37..3445cce 100644 +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c ++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -46,6 +46,7 @@ + #include "xf86Crtc.h" + #include "drmmode_display.h" + #include "present.h" ++#include "mi.h" + + #include + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb similarity index 71% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb index a1cd490..998b98a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb @@ -1,12 +1,13 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ - file://pkgconfig.patch \ - file://0001-test-xtest-Initialize-array-with-braces.patch \ - file://sdksyms-no-build-path.patch \ - " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" + file://pkgconfig.patch \ + file://0001-test-xtest-Initialize-array-with-braces.patch \ + file://sdksyms-no-build-path.patch \ + file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ + " +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:24 +0000 Subject: [oe-commits] [openembedded-core] 32/37: python3: fix the installation path of libpython3.7m.a for multilib In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.34422232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3081d3993095d2e4817bbef33c9c90dd814a45d7 Author: Changqing Li AuthorDate: Fri Feb 7 14:07:43 2020 +0800 python3: fix the installation path of libpython3.7m.a for multilib Fix the installation path of libpython3.7m.a on mulitlib lib64 platform to lib64 instead of lib Signed-off-by: Li Zhou Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- .../python3/0001-configure.ac-fix-LIBPL.patch | 35 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 5 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch new file mode 100644 index 0000000..123ce3a --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch @@ -0,0 +1,35 @@ +From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:36:25 +0800 +Subject: [PATCH] configure.ac: fix LIBPL + +Use LIBDIR rather than prefix/lib, so that it would work when lib64. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Robert Yang +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce04258..915f475 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4532,9 +4532,9 @@ fi + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) + if test x$PLATFORM_TRIPLET = x; then +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" + else +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + fi + AC_SUBST(LIBPL) + +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index a71c207..981b52e 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -29,6 +29,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ + file://0001-configure.ac-fix-LIBPL.patch \ " SRC_URI_append_class-native = " \ @@ -174,7 +175,7 @@ py_package_preprocess () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config @@ -322,7 +323,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv" # package libpython3 PACKAGES =+ "libpython3 libpython3-staticdev" FILES_libpython3 = "${libdir}/libpython*.so.*" -FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" +FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:29 +0000 Subject: [oe-commits] [openembedded-core] 37/37: systemd: upgrade 243.4 -> 244.1 In-Reply-To: <158116805239.25941.1617719248824315399@git.openembedded.org> References: <158116805239.25941.1617719248824315399@git.openembedded.org> Message-ID: <20200208132054.7E0B7232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 44a4ac2294da0f53cbbfabc7ece836fe97f4d3f7 Author: Alex Kiernan AuthorDate: Thu Feb 6 16:48:13 2020 +0000 systemd: upgrade 243.4 -> 244.1 Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_243.4.bb => systemd-boot_244.1.bb} | 0 ...systemd-conf_243.2.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...t-install-dependency-links-at-install-tim.patch | 33 +- ...01-do-not-disable-buffer-in-writing-files.patch | 168 +++++---- .../0002-don-t-use-glibc-specific-qsort_r.patch | 26 +- ...src-login-brightness.c-include-sys-wait.h.patch | 8 +- ...pper-instead-of-looking-for-relative-opti.patch | 63 ---- ...0003-implment-systemd-sysv-install-for-OE.patch | 10 +- ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 37 +- .../0003-src-basic-copy.c-include-signal.h.patch | 12 +- ...llback-parse_printf_format-implementation.patch | 29 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 10 +- ...asic-missing.h-check-for-missing-strndupa.patch | 381 ++++++++++++++++----- .../systemd/0006-Include-netinet-if_ether.h.patch | 101 ++++-- ...-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 +- .../0008-add-missing-FTW_-macros-for-musl.patch | 10 +- ...-of-__register_atfork-for-non-glibc-build.patch | 14 +- .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 22 +- ....c-Disable-tests-for-missing-typedefs-in-.patch | 15 +- ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 +- ...c-compatible-basename-for-non-glibc-syste.patch | 18 +- ...ble-buffering-when-writing-to-oom_score_a.patch | 9 +- ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 14 +- ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 10 +- ...ing_type.h-add-__compar_d_fn_t-definition.patch | 10 +- ...id-redefinition-of-prctl_mm_map-structure.patch | 10 +- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 10 +- .../systemd/0024-test-json.c-define-M_PIl.patch | 12 +- .../systemd/{systemd_243.4.bb => systemd_244.1.bb} | 2 +- 30 files changed, 659 insertions(+), 431 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_243.4.bb b/meta/recipes-core/systemd/systemd-boot_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.4.bb rename to meta/recipes-core/systemd/systemd-boot_244.1.bb diff --git a/meta/recipes-core/systemd/systemd-conf_243.2.bb b/meta/recipes-core/systemd/systemd-conf_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_243.2.bb rename to meta/recipes-core/systemd/systemd-conf_244.1.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 2fca6dc..8c05a96 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,10 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" -SRCBRANCH = "v243-stable" +SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" -PV = "243.4+git${SRCPV}" - S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index ea37680..6eaaec7 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,8 +1,8 @@ -From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001 +From c73a87871df31b4f8d96c9d443759c6f702935f6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] binfmt: Don't install dependency links at install time for + the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service. @@ -18,16 +18,17 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- units/meson.build | 6 ++---- units/proc-sys-fs-binfmt_misc.automount | 3 +++ units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build +diff --git a/units/meson.build b/units/meson.build +index 6a3a0d0dea22..bbb1b78618c3 100644 +--- a/units/meson.build ++++ b/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +49,10 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 30a6bc991844..4231f3b70fe9 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,11 +60,11 @@ Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index 0c0f26451b67..763c4c466c16 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index d6d68a0..f1c7181 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 +From f4a0caaea346b70cf5064f9159a53a1b8020071e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -18,8 +18,9 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray + --- - src/basic/cgroup-util.c | 14 +++++++------- + src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- src/basic/smack-util.c | 2 +- src/basic/util.c | 2 +- @@ -31,25 +32,19 @@ Signed-off-by: Scott Murray src/login/logind-dbus.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- + src/shared/cgroup-setup.c | 4 ++-- src/shared/sysctl-util.c | 2 +- - src/sleep/sleep.c | 10 +++++----- + src/sleep/sleep.c | 8 ++++---- src/udev/udevadm-trigger.c | 2 +- src/udev/udevd.c | 2 +- src/vconsole/vconsole-setup.c | 2 +- - 17 files changed, 36 insertions(+), 36 deletions(-) + 18 files changed, 35 insertions(+), 35 deletions(-) +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index a5141f4cbedd..04c06e7a55cb 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co - - xsprintf(c, PID_FMT "\n", pid); - -- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, c, 0); - if (r < 0) - return r; - -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char +@@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -58,7 +53,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char +@@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -67,7 +62,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha +@@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -76,7 +71,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha +@@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -85,7 +80,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control +@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -94,18 +89,11 @@ Signed-off-by: Scott Murray } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -@@ -2697,7 +2697,7 @@ int cg_enable_everywhere( - return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); - } - -- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_stream(f, s, 0); - if (r < 0) { - log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", - FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index da7e836f143e..2138f20bcc03 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -121,9 +109,11 @@ Signed-off-by: Scott Murray if (r < 0) { uint64_t threads_max; +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index da9a2139d31a..5e91f5b8f5d9 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -132,9 +122,11 @@ Signed-off-by: Scott Murray if (r < 0) return r; +diff --git a/src/basic/util.c b/src/basic/util.c +index 2b3b3918a32f..aff8d0fcd473 100644 --- a/src/basic/util.c +++ b/src/basic/util.c -@@ -294,7 +294,7 @@ void disable_coredumps(void) { +@@ -267,7 +267,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; @@ -143,9 +135,11 @@ Signed-off-by: Scott Murray if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } +diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c +index 7ff844c78c3a..5c5721d7c2f7 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) +@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); @@ -154,7 +148,7 @@ Signed-off-by: Scott Murray } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) +@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); @@ -163,7 +157,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); -@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { +@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ @@ -172,9 +166,11 @@ Signed-off-by: Scott Murray STRV_FOREACH(f, files) { k = apply_file(*f, true); +diff --git a/src/core/main.c b/src/core/main.c +index c24b696b1663..195be7d2df0d 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -183,7 +179,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -192,9 +188,11 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } +diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c +index 4427397f2715..8aeb5c829513 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) +@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL @@ -216,6 +214,8 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif +diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c +index 17e7cd1a009b..87a766771663 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -227,9 +227,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; +diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c +index f35612fe12bc..20351bf7fa70 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -238,9 +240,11 @@ Signed-off-by: Scott Murray if (r < 0) { if (r == -ELOOP) return -EINVAL; +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 69b59948786f..b4973c596d48 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd +@@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; @@ -249,9 +253,11 @@ Signed-off-by: Scott Murray } return 0; +diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c +index f5048d9473cb..b6383ab5c97e 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -260,9 +266,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 873a76596f0b..4e496548bb94 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { +@@ -2425,7 +2425,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -271,7 +279,7 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3633,13 +3633,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -287,9 +295,33 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); +diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c +index e8398cbde5ba..ba682ec0c9e7 100644 +--- a/src/shared/cgroup-setup.c ++++ b/src/shared/cgroup-setup.c +@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { + + xsprintf(c, PID_FMT "\n", pid); + +- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, c, 0); + if (r < 0) + return r; + +@@ -817,7 +817,7 @@ int cg_enable_everywhere( + return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); + } + +- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_stream(f, s, 0); + if (r < 0) { + log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", + FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c +index 12fb3ef7ea0e..132ac847c091 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con +@@ -87,7 +87,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c log_debug("Setting '%s' to '%s'", p, value); @@ -298,35 +330,29 @@ Signed-off-by: Scott Murray } int sysctl_read(const char *property, char **content) { +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index 89b80367f8f4..33dbb21364d0 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info +@@ -45,7 +45,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + assert(hibernate_location->swap); + assert(hibernate_location->resume); - /* if it's a swap partition, we just write the disk to /sys/power/resume */ - if (streq(type, "partition")) { -- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); - -@@ -98,14 +98,14 @@ static int write_hibernate_location_info +- r = write_string_file("/sys/power/resume", hibernate_location->resume, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", hibernate_location->resume, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", + hibernate_location->swap->device, hibernate_location->resume); +@@ -72,7 +72,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + } - offset = fiemap->fm_extents[0].fe_physical / page_size(); - xsprintf(offset_str, "%" PRIu64, offset); + xsprintf(offset_str, "%" PRIu64, hibernate_location->resume_offset); - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume_offset", offset_str, 0); if (r < 0) - return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); - - log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str); - - xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); -- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device_str, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write device '%s': %m", device_str); - -@@ -121,7 +121,7 @@ static int write_mode(char **modes) { + return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", + hibernate_location->swap->device, offset_str); +@@ -89,7 +89,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; @@ -335,7 +361,7 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** +@@ -108,7 +108,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; @@ -344,9 +370,11 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); +diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c +index 60c68b5029cf..fdca03d3d42c 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se if (!filename) return log_oom(); @@ -355,9 +383,11 @@ Signed-off-by: Scott Murray if (r < 0) { bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 7678331897f5..6871cde7aa65 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi +@@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -366,9 +396,11 @@ Signed-off-by: Scott Murray if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; +diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c +index 9d706085fb47..30dcfa86f4d0 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na +@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index c6213ab..6b85ff0 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 +From 49501c80d32c1bc5ecb07f40c324feb82af0b057 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH 02/24] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,14 +10,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- - src/basic/sort-util.h | 14 -------------- - src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- - src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/basic/sort-util.h | 14 ------------ + src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- + src/shared/format-table.c | 36 ++++++++++++++++++++---------- 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f8646e..27d68b341c 100644 +index e029f8646eb0..27d68b341cf3 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn @@ -39,7 +40,7 @@ index e029f8646e..27d68b341c 100644 - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c -index c83575c7c8..72f8f3a050 100644 +index c83575c7c876..72f8f3a05048 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.c +++ b/src/libsystemd/sd-hwdb/hwdb-util.c @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { @@ -83,10 +84,10 @@ index c83575c7c8..72f8f3a050 100644 } diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index a5c0a99b08..d595cbe372 100644 +index 4617ae8badc4..17d6b9616256 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c -@@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t +@@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -130,7 +131,7 @@ index a5c0a99b08..d595cbe372 100644 } /* Order identical lines by the order there were originally added in */ -@@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { +@@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -144,7 +145,7 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) -@@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { +@@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -158,6 +159,3 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch index dcae668..ba7424d 100644 --- a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch @@ -1,4 +1,7 @@ -Include sys/wait.h +From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include sys/wait.h Fixes: src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? @@ -8,12 +11,13 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/login/logind-brightness.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index 8dfa97d7ae..bddd4a2727 100644 +index 3f4b65e1fdf1..5af7e3d5ce3f 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch deleted file mode 100644 index 49a334d..0000000 --- a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 27 Jun 2018 16:09:24 +0800 -Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option - for ln - -Remove file manually to avoid the 'File Exists' error when creating -symlink. This is because the original 'ln' command uses '-f' option. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - meson.build | 4 ---- - tools/meson-make-symlink.sh | 3 ++- - units/meson-add-wants.sh | 7 ++++++- - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index e5ceb1e169..79b762faeb 100644 ---- a/meson.build -+++ b/meson.build -@@ -579,10 +579,6 @@ endforeach - - conf.set_quoted('TELINIT', get_option('telinit-path')) - --if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative (added in coreutils 8.16)') --endif -- - ############################################################ - - gperf = find_program('gperf') -diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh -index da0d13a341..90bc0a93c2 100755 ---- a/tools/meson-make-symlink.sh -+++ b/tools/meson-make-symlink.sh -@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" - if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" - else -- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -+ rm -f "${DESTDIR:-}$2" -+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" - fi -diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh -index a483d75b86..3c01c523f1 100755 ---- a/units/meson-add-wants.sh -+++ b/units/meson-add-wants.sh -@@ -25,4 +25,9 @@ case "$target" in - ;; - esac - --ln -vfs --relative "$unitpath" "$dir" -+if [ -d "$dir" ]; then -+ rm -f "$dir/$unit" -+ lnr "$unitpath" "$dir/$unit" -+else -+ lnr "$unitpath" "$dir" -+fi diff --git a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch index 6695d56..c620478 100644 --- a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch @@ -1,7 +1,7 @@ -From 47864989388bcd04d647ecf618ad7e260399dbb6 Mon Sep 17 00:00:00 2001 +From f9078501a1495c9991431d1435d081cd2e830328 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 5 Sep 2015 06:31:47 +0000 -Subject: [PATCH 3/5] implment systemd-sysv-install for OE +Subject: [PATCH] implment systemd-sysv-install for OE Use update-rc.d for enabling/disabling and status command to check the status of the sysv service @@ -9,12 +9,13 @@ to check the status of the sysv service Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj + --- src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON -index 8c16cf9..9f078a1 100755 +index 8c16cf99913f..9f078a121469 100755 --- a/src/systemctl/systemd-sysv-install.SKELETON +++ b/src/systemctl/systemd-sysv-install.SKELETON @@ -32,17 +32,17 @@ case "$1" in @@ -38,6 +39,3 @@ index 8c16cf9..9f078a1 100755 ;; *) usage ;; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 2e39f7a..1404895 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,24 +1,28 @@ -From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 +From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +[Rebased for v244] Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- src/basic/missing_type.h | 9 +++++++++ src/basic/sort-util.h | 1 + + src/core/kmod-setup.c | 1 + src/journal/catalog.c | 1 + - 3 files changed, 11 insertions(+) + 4 files changed, 12 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b..2134fe5095 100644 +index bf8a6caa1b46..c487e65e7bde 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -35,29 +39,38 @@ index bf8a6caa1b..2134fe5095 100644 +typedef int (*__compar_fn_t)(const void *, const void *); +#endif diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f86..7247d40 100644 +index 27d68b341cf3..307ea4ac0e8e 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ #include #include "macro.h" -+#include "missing.h" ++#include "missing_type.h" void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *arg); +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 128674327362..09ccd613e32c 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -10,6 +10,7 @@ + #include "kmod-setup.h" + #include "macro.h" + #include "string-util.h" ++#include "missing_type.h" + + #if HAVE_KMOD + #include "module-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 7beffc1e1a..4818a2e5cc 100644 +index 70b2c8b46c4e..d574a64586f1 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c -@@ -29,6 +29,7 @@ +@@ -28,6 +28,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_type.h" const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch index 7ee0d48..538a99c 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch @@ -1,4 +1,7 @@ -Include signal.h +From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include signal.h Fixes several signal set related errors: src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] @@ -9,17 +12,18 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [ Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/basic/copy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/copy.c b/src/basic/copy.c -index ca311e021e..3cf7fc1697 100644 +index 9028868f696d..5168586fa522 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c -@@ -12,6 +12,7 @@ +@@ -8,6 +8,7 @@ + #include #include - #include #include +#include diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index a2aad40..71e52c4 100644 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 +From 142dcaef0d24a78d3c0c94168b66fdf234497e97 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH 04/24] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,11 +10,12 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- meson.build | 1 + src/basic/meson.build | 5 + - src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ - src/basic/parse-printf-format.h | 57 +++++++++ + src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++ + src/basic/parse-printf-format.h | 57 +++++++ src/basic/stdio-util.h | 2 +- src/journal/journal-send.c | 2 +- 6 files changed, 338 insertions(+), 2 deletions(-) @@ -22,10 +23,10 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 79b762faeb..7f8c679411 100644 +index 21d6968abdf4..bab0bf84806c 100644 --- a/meson.build +++ b/meson.build -@@ -613,6 +613,7 @@ endif +@@ -628,6 +628,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,10 +35,10 @@ index 79b762faeb..7f8c679411 100644 'valgrind/memcheck.h', 'valgrind/valgrind.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d6caf28f14..32c1acf349 100644 +index f70d1b8bf8a0..4cd57373e10d 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], +@@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''], endforeach basic_sources += generated_gperf_headers @@ -51,7 +52,7 @@ index d6caf28f14..32c1acf349 100644 'gcrypt-util.h') diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c new file mode 100644 -index 0000000000..49437e5445 +index 000000000000..49437e544540 --- /dev/null +++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ @@ -330,7 +331,7 @@ index 0000000000..49437e5445 +} diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h new file mode 100644 -index 0000000000..47be7522d7 +index 000000000000..47be7522d7fa --- /dev/null +++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ @@ -392,7 +393,7 @@ index 0000000000..47be7522d7 + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index c3b9448d4f..2937aa13b1 100644 +index c3b9448d4f4f..2937aa13b178 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ @@ -411,7 +412,7 @@ index c3b9448d4f..2937aa13b1 100644 #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 5ef11fa1a4..6384ab620c 100644 +index 912ecef73cce..43ed756bda53 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -2,7 +2,6 @@ @@ -420,9 +421,9 @@ index 5ef11fa1a4..6384ab620c 100644 #include -#include #include - #include #include -@@ -21,6 +20,7 @@ + #include +@@ -20,6 +19,7 @@ #include "stdio-util.h" #include "string-util.h" #include "tmpfile-util.h" diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch index 0f75e8c..685df01 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch @@ -1,4 +1,7 @@ -Handle __cpu_mask usage +From 6883ffc99168056101c667c6421f8353d5ad675a Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Handle __cpu_mask usage Fixes errors: @@ -15,13 +18,14 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Scott Murray + --- src/shared/cpu-set-util.h | 2 ++ src/test/test-sizeof.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 27812dfd59..f698f9df83 100644 +index 27812dfd5923..0ab40731ea93 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -34,7 +38,7 @@ index 27812dfd59..f698f9df83 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index a710db5370..d1601ad929 100644 +index a710db5370b8..d1601ad9292d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index adfc3b7..aa4bb06 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 399fd3eda3045636a70da438a0fd1406cc332ed1 Mon Sep 17 00:00:00 2001 +From 9597196234a0ccf30d7f65cf185a8c24cb3158b3 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 05/24] src/basic/missing.h: check for missing strndupa +Subject: [PATCH] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -13,28 +13,47 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray +Signed-off-by: Alex Kiernan +[rebased for systemd 244] + --- meson.build | 1 + src/backlight/backlight.c | 1 + + src/basic/cgroup-util.c | 1 + src/basic/env-util.c | 1 + + src/basic/log.c | 1 + src/basic/missing_stdlib.h | 12 ++++++++++++ src/basic/mkdir.c | 1 + src/basic/parse-util.c | 1 + src/basic/proc-cmdline.c | 1 + src/basic/procfs-util.c | 1 + + src/basic/selinux-util.c | 1 + src/basic/time-util.c | 1 + + src/boot/bless-boot.c | 1 + src/core/dbus-cgroup.c | 1 + + src/core/dbus-execute.c | 1 + src/core/dbus-util.c | 1 + + src/core/execute.c | 1 + src/core/kmod-setup.c | 1 + src/core/service.c | 1 + + src/coredump/coredump-vacuum.c | 1 + + src/journal-remote/journal-remote-main.c | 1 + src/journal/journalctl.c | 1 + src/libsystemd/sd-bus/bus-message.c | 1 + src/libsystemd/sd-bus/bus-objects.c | 1 + + src/libsystemd/sd-bus/bus-socket.c | 1 + + src/libsystemd/sd-bus/sd-bus.c | 1 + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + src/locale/keymap-util.c | 1 + src/login/pam_systemd.c | 1 + src/network/generator/network-generator.c | 1 + src/nspawn/nspawn-settings.c | 1 + + src/nss-mymachines/nss-mymachines.c | 1 + + src/portable/portable.c | 1 + + src/resolve/resolvectl.c | 1 + + src/shared/bus-unit-procs.c | 1 + + src/shared/bus-unit-util.c | 1 + + src/shared/bus-util.c | 1 + src/shared/dns-domain.c | 1 + src/shared/journal-importer.c | 1 + src/shared/logs-show.c | 1 + @@ -46,13 +65,13 @@ Signed-off-by: Scott Murray src/udev/udev-builtin-path_id.c | 1 + src/udev/udev-event.c | 1 + src/udev/udev-rules.c | 1 + - 32 files changed, 43 insertions(+) + 48 files changed, 59 insertions(+) diff --git a/meson.build b/meson.build -index 7f8c679411..81c061b768 100644 +index bab0bf84806c..f4e1736cf09e 100644 --- a/meson.build +++ b/meson.build -@@ -506,6 +506,7 @@ foreach ident : [ +@@ -517,6 +517,7 @@ foreach ident : [ #include '''], ['get_mempolicy', '''#include #include '''], @@ -61,31 +80,55 @@ index 7f8c679411..81c061b768 100644 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index dfd6805398..c2b2ace6ec 100644 +index 048441429025..01d74ea0ed4e 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { const char *subsystem, *sysname, *value; +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 54fc6ecf8b20..a5141f4cbedd 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -37,6 +37,7 @@ + #include "strv.h" + #include "unit-name.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { + _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index a6503cf2b6..ceef9a62c8 100644 +index b8dc98915f81..5049b37594bc 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c -@@ -16,6 +16,7 @@ +@@ -15,6 +15,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define VALID_CHARS_ENV_NAME \ DIGITS LETTERS \ +diff --git a/src/basic/log.c b/src/basic/log.c +index 17557e1844b2..6cec4d324aab 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -34,6 +34,7 @@ + #include "terminal-util.h" + #include "time-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 +index 188a8d44066a..1e16ec287aad 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -105,338 +148,506 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6b82eab640..51c6b78615 100644 +index fa682d4c438e..37902551490a 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -14,6 +14,7 @@ +@@ -13,6 +13,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { struct stat st; diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 115a1494a2..07a34bfd53 100644 +index aec6099c9cc1..744b9b134ce4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -20,6 +20,7 @@ +@@ -18,6 +18,7 @@ #include "process-util.h" #include "stat-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index 09169cf963..f411ba897f 100644 +index d3d99d9a7f90..e0b9efad03a2 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ #include "string-util.h" #include "util.h" #include "virt.h" -+#include "missing.h" ++#include "missing_stdlib.h" int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..42ce53d5aa 100644 +index 7aaf95bfced2..da7e836f143e 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ #include "procfs-util.h" #include "stdio-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; +diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c +index f35e760233be..e4b0a8aa445e 100644 +--- a/src/basic/selinux-util.c ++++ b/src/basic/selinux-util.c +@@ -26,6 +26,7 @@ + #include "selinux-util.h" + #include "stdio-util.h" + #include "time-util.h" ++#include "missing_stdlib.h" + + #if HAVE_SELINUX + DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 3018e81acb..4e2b3b66c1 100644 +index bfe2c60da173..d7ef30d2fe52 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static clockid_t map_clock_id(clockid_t c) { +diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c +index b96e1f927fff..cba979baca3e 100644 +--- a/src/boot/bless-boot.c ++++ b/src/boot/bless-boot.c +@@ -18,6 +18,7 @@ + #include "util.h" + #include "verbs.h" + #include "virt.h" ++#include "missing_stdlib.h" + + static char **arg_path = NULL; + diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 2f2313c599..c9937f9d62 100644 +index 27dc9e43c3e2..b1a83023600b 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -15,6 +15,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); + BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 1d0bc1ede3cb..313654913345 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -41,6 +41,7 @@ + #include "unit-printf.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); + static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 7862beaacb..19f6968cfe 100644 +index 7862beaacb6d..3b1ea53a5f0d 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" -+#include "missing.h" ++#include "missing_stdlib.h" int bus_property_get_triggered_unit( sd_bus *bus, +diff --git a/src/core/execute.c b/src/core/execute.c +index abc164ff5bef..f04b8ba05002 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -88,6 +88,7 @@ + #include "unit.h" + #include "user-util.h" + #include "utmp-wtmp.h" ++#include "missing_stdlib.h" + + #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) + #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index a91cfebc67..a45961013f 100644 +index 09ccd613e32c..f4e64fa283e9 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ - #include "kmod-setup.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" + #include "missing_type.h" ++#include "missing_stdlib.h" #if HAVE_KMOD - #include + #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 73b3c9c316..ef74f00a08 100644 +index 49ad166c2604..c3b14067e201 100644 --- a/src/core/service.c +++ b/src/core/service.c -@@ -43,6 +43,7 @@ +@@ -41,6 +41,7 @@ #include "unit.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, +diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c +index 35885dfb47c4..bb9f0660a6a0 100644 +--- a/src/coredump/coredump-vacuum.c ++++ b/src/coredump/coredump-vacuum.c +@@ -16,6 +16,7 @@ + #include "string-util.h" + #include "time-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ + #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index ac2bf648d2af..06c86f0201af 100644 +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -21,6 +21,7 @@ + #include "stat-util.h" + #include "string-table.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" + #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6d6bb1cf63..6666349a35 100644 +index 95b6bfee172a..e0bcfb9d4233 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -70,6 +70,7 @@ +@@ -68,6 +68,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index eb029e4453..f31fe9d5a8 100644 +index eb029e445326..8da2c5d51a75 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ #include "strv.h" #include "time-util.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index ae643cacc7..1b752271a5 100644 +index ae643cacc740..f766e235206d 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ #include "set.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int node_vtable_get_userdata( sd_bus *bus, +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 18d30d010a20..be2ab703f8ed 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -28,6 +28,7 @@ + #include "string-util.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + +diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c +index 058492a83eec..54c896f572b9 100644 +--- a/src/libsystemd/sd-bus/sd-bus.c ++++ b/src/libsystemd/sd-bus/sd-bus.c +@@ -41,6 +41,7 @@ + #include "process-util.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define log_debug_bus_message(m) \ + do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..4fd0a2e692 100644 +index 8de0a859ee94..58044b6ba908 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ #include "missing_resource.h" #include "time-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index f8c36c94f5..41f5606aea 100644 +index 519dd0d188cf..a8f536915bb2 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 3f762cbbc3..005cfea658 100644 +index aa6e5ea7aca8..c439c21b2872 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -28,6 +28,7 @@ #include "hostname-util.h" #include "login-util.h" #include "macro.h" -+#include "missing.h" ++#include "missing_stdlib.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 0b5af33566..9c808cd014 100644 +index 81afa9530762..2c5328f97c63 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ #include "string-table.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 3a99736813..279fea4d88 100644 +index 5fb5b49bbcc3..785ccc2da307 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ #include "strv.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" Settings *settings_new(void) { Settings *s; +diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c +index 364356da5622..47d4ea44e40f 100644 +--- a/src/nss-mymachines/nss-mymachines.c ++++ b/src/nss-mymachines/nss-mymachines.c +@@ -19,6 +19,7 @@ + #include "signal-util.h" + #include "string-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); + NSS_GETPW_PROTOTYPES(mymachines); +diff --git a/src/portable/portable.c b/src/portable/portable.c +index 34b123e84692..5a48504d00ac 100644 +--- a/src/portable/portable.c ++++ b/src/portable/portable.c +@@ -29,6 +29,7 @@ + #include "strv.h" + #include "tmpfile-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); + +diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c +index 0a96a18b3836..432d6ebc3730 100644 +--- a/src/resolve/resolvectl.c ++++ b/src/resolve/resolvectl.c +@@ -31,6 +31,7 @@ + #include "strv.h" + #include "terminal-util.h" + #include "verbs.h" ++#include "missing_stdlib.h" + + static int arg_family = AF_UNSPEC; + static int arg_ifindex = 0; +diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c +index b21fe393265f..af2640005c1d 100644 +--- a/src/shared/bus-unit-procs.c ++++ b/src/shared/bus-unit-procs.c +@@ -10,6 +10,7 @@ + #include "sort-util.h" + #include "string-util.h" + #include "terminal-util.h" ++#include "missing_stdlib.h" + + struct CGroupInfo { + char *cgroup_path; +diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c +index 22a15493d7f3..3f4c51975675 100644 +--- a/src/shared/bus-unit-util.c ++++ b/src/shared/bus-unit-util.c +@@ -34,6 +34,7 @@ + #include "unit-def.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { + assert(message); +diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c +index aea46d311996..223426298144 100644 +--- a/src/shared/bus-util.c ++++ b/src/shared/bus-util.c +@@ -34,6 +34,7 @@ + #include "stdio-util.h" + #include "strv.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + sd_event *e = userdata; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index f62ad0a0f5..f1a27e158d 100644 +index b812665315f6..8e68f7f8fc6c 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -24,6 +24,7 @@ +@@ -23,6 +23,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..a6ff2214df 100644 +index 7c4fc7021dec..3fbaf5a63969 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ #include "parse-util.h" #include "string-util.h" #include "unaligned.h" -+#include "missing.h" ++#include "missing_stdlib.h" enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index b615c70dff..75b26e9c21 100644 +index 95b2e3376e9a..facc23aaecd5 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c -@@ -39,6 +39,7 @@ +@@ -37,6 +37,7 @@ #include "time-util.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/pager.c b/src/shared/pager.c -index 7c20b100b4..e4209d3a95 100644 +index 1fe9db179176..67954b5cab93 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -25,6 +25,7 @@ +@@ -23,6 +23,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static pid_t pager_pid = 0; diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..f6c8009cd2 100644 +index 5b1620974536..0e7cd1c2af12 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c -@@ -20,6 +20,7 @@ +@@ -19,6 +19,7 @@ #include "tmpfile-util.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8b12b91084 100644 +index 7cb7d8a477e9..8e7d7f9e7ca6 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ #include "sort-util.h" #include "uid-range.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index abbbc9f2d6..6179b5851e 100644 +index 2fb9c854fa50..58cef31458f7 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "socket-util.h" #include "string-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..a05e7782f6 100644 +index 52217429b154..70708dedf318 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ #include "hexdecoct.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index e8f1ce1354..8693cb02a4 100644 +index ca38f5608791..9d8cf4d2807b 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include "strv.h" #include "sysexits.h" #include "udev-builtin.h" -+#include "missing.h" ++#include "missing_stdlib.h" _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 8cfa2cdf23..b0670c77ec 100644 +index 58d484280aa5..90eab6806b55 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -35,6 +35,7 @@ +@@ -34,6 +34,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 1642f10535..fe2aa75478 100644 +index 6168b332d3b2..245fe0a64d22 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -28,6 +28,7 @@ - #include "udev-event.h" +@@ -30,6 +30,7 @@ #include "udev-rules.h" #include "user-util.h" -+#include "missing.h" + #include "virt.h" ++#include "missing_stdlib.h" #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index 6d73d71..ea003fd 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,4 +1,7 @@ -Include netinet/if_ether.h +From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Oct 2017 22:10:42 -0700 +Subject: [PATCH] Include netinet/if_ether.h Fixes /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' @@ -26,11 +29,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-netlink/netlink-types.c | 1 + src/machine/machine-dbus.c | 1 + + src/network/netdev/bond.c | 1 + + src/network/netdev/bridge.c | 1 + src/network/netdev/macsec.c | 1 + + src/network/netdev/netdev-gperf.gperf | 1 + src/network/netdev/netdev.c | 1 + src/network/networkd-brvlan.c | 1 + src/network/networkd-dhcp-common.c | 1 + @@ -38,26 +45,27 @@ Signed-off-by: Scott Murray src/network/networkd-dhcp6.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-network.c | 1 + + src/network/test-network-tables.c | 1 + src/shared/ethtool-util.c | 1 + src/shared/ethtool-util.h | 1 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-net_setup_link.c | 1 + - 15 files changed, 14 insertions(+), 4 deletions(-) + 19 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index d7a5349c70..68b41dfb6c 100644 +index 5417ba8c5feb..d3aba928dd96 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c -@@ -6,7 +6,6 @@ +@@ -5,7 +5,6 @@ + #include - #include #include -#include #include #include "sd-dhcp6-client.h" diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c -index de9b8b21ab..f64f6500f7 100644 +index a55460f03407..6f9cd527c800 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ @@ -69,19 +77,41 @@ index de9b8b21ab..f64f6500f7 100644 #include #include diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 0d58b5eb8b..01093c1f62 100644 +index 3b2ac3829859..760ccb445cd0 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -4,6 +4,7 @@ - #include +@@ -3,6 +3,7 @@ + #include #include #include +#include /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX +diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c +index 185b155440e7..dc1cd236c814 100644 +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include "alloc-util.h" + #include "bond.h" + #include "conf-parser.h" +diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c +index 59a40faef8fa..8e821a3216b3 100644 +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include + + #include "bridge.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c -index cf281e75a6..269dc618ff 100644 +index 25dc23ff0338..f20d11fbcf53 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ @@ -91,8 +121,20 @@ index cf281e75a6..269dc618ff 100644 #include #include #include +diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf +index 09a5f4822e03..873299b1f98a 100644 +--- a/src/network/netdev/netdev-gperf.gperf ++++ b/src/network/netdev/netdev-gperf.gperf +@@ -2,6 +2,7 @@ + #if __GNUC__ >= 7 + _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") + #endif ++#include + #include + #include "bond.h" + #include "bridge.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index 7735b455b7..ed4eda4a44 100644 +index 6908c4e811b0..e0d8c459ab63 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ @@ -103,7 +145,7 @@ index 7735b455b7..ed4eda4a44 100644 #include diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index c3c5d535ac..ebea408c89 100644 +index c3c5d535ac66..ebea408c89a8 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ @@ -115,19 +157,19 @@ index c3c5d535ac..ebea408c89 100644 #include diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 626b975839..42fe92f320 100644 +index 6465a8cfe9c7..bd4b2cdfac15 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - +@@ -4,6 +4,7 @@ + #include "escape.h" + #include "in-addr-util.h" #include "networkd-dhcp-common.h" +#include #include "networkd-network.h" #include "parse-util.h" #include "string-table.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 662770b50e..c6ab62a94d 100644 +index 8ca87d99d4db..a66284896cf3 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,8 +1,8 @@ @@ -139,9 +181,9 @@ index 662770b50e..c6ab62a94d 100644 -#include #include "alloc-util.h" - #include "hostname-util.h" + #include "dhcp-client-internal.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index 8ad736a82b..f41b4d834e 100644 +index 647623ac3778..325c641c6231 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ @@ -156,7 +198,7 @@ index 8ad736a82b..f41b4d834e 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index f5bb78890a..f13a36b791 100644 +index 2e60adbf7818..05aa8672d585 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ @@ -170,7 +212,7 @@ index f5bb78890a..f13a36b791 100644 #include "alloc-util.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c -index 2b8d0eb2fb..2f79ef25cd 100644 +index 6e443975f171..d1aab0ca5ba2 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ @@ -180,8 +222,17 @@ index 2b8d0eb2fb..2f79ef25cd 100644 #include #include #include +diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c +index 25b939639775..530e4928835c 100644 +--- a/src/network/test-network-tables.c ++++ b/src/network/test-network-tables.c +@@ -1,3 +1,4 @@ ++#include + #include "bond.h" + #include "dhcp6-internal.h" + #include "dhcp6-protocol.h" diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c -index b0961df72e..53fcbbd84b 100644 +index 3119b2b92e3b..927ddd067eef 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ @@ -192,7 +243,7 @@ index b0961df72e..53fcbbd84b 100644 #include #include diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h -index 8b32b243f3..262b819976 100644 +index d408bcd90a0b..7a1e399af023 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -2,6 +2,7 @@ @@ -204,7 +255,7 @@ index 8b32b243f3..262b819976 100644 #include "conf-parser.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index d44af64d5e..fd052f1591 100644 +index 7b07e2f38fa8..18680a8e5484 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ @@ -215,7 +266,7 @@ index d44af64d5e..fd052f1591 100644 #include diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index ee3ca9fa38..9aa4e82874 100644 +index ee3ca9fa3846..9aa4e828741f 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch index 34f7f5f..580c49f 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch @@ -1,8 +1,7 @@ -From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 +From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined If the standard library doesn't provide brace expansion users just won't get it. @@ -17,6 +16,7 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/glob-util.c | 12 ++++++++++++ src/test/test-glob-util.c | 16 ++++++++++++++++ @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray 3 files changed, 38 insertions(+) diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index b335af8d97..2cdfc11f16 100644 +index e3aa6c2e152b..38070b79c83a 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c -@@ -14,6 +14,12 @@ +@@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" @@ -40,7 +40,7 @@ index b335af8d97..2cdfc11f16 100644 static void closedir_wrapper(void* v) { (void) closedir(v); } -@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { +@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { int safe_glob(const char *path, int flags, glob_t *pglob) { int k; @@ -48,7 +48,7 @@ index b335af8d97..2cdfc11f16 100644 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); -@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { +@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; @@ -64,10 +64,10 @@ index b335af8d97..2cdfc11f16 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index b4f41445fe..f0d474ed14 100644 +index 667d15335fbf..76a84443aacf 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c -@@ -13,6 +13,12 @@ +@@ -12,6 +12,12 @@ #include "rm-rf.h" #include "tmpfile-util.h" @@ -80,7 +80,7 @@ index b4f41445fe..f0d474ed14 100644 static void test_glob_exists(void) { char name[] = "/tmp/test-glob_exists.XXXXXX"; int fd = -1; -@@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { +@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { const char *fn; _cleanup_globfree_ glob_t g = { @@ -94,7 +94,7 @@ index b4f41445fe..f0d474ed14 100644 }; int r; -@@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { +@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); @@ -115,10 +115,10 @@ index b4f41445fe..f0d474ed14 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 3c30612af1..14bc428085 100644 +index 193ed0bc781b..2f94fd2efd8f 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c -@@ -63,6 +63,12 @@ +@@ -58,6 +58,12 @@ #include "umask-util.h" #include "user-util.h" @@ -131,7 +131,7 @@ index 3c30612af1..14bc428085 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1853,7 +1859,9 @@ finish: +@@ -1850,7 +1856,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +141,7 @@ index 3c30612af1..14bc428085 100644 }; int r = 0, k; char **fn; -@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { +@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index d5f2349..1f61893 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001 +From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 08/24] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,12 +10,13 @@ This is to avoid build failures like below for musl. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index c487e65..23602eb 100644 +index c487e65e7bde..23602ebbd533 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); @@ -42,6 +43,3 @@ index c487e65..23602eb 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 8bacd02..0de1121 100644 --- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,20 +1,21 @@ -From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 +From 5166a6657570d4072cdce118621791e4a8186e07 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:03:47 +0800 -Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds +Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/process-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 78ce43b..aec2daf 100644 +index 9b6c4c31f713..24fec5ecb53a 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -22,6 +22,9 @@ +@@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include #endif @@ -24,7 +25,7 @@ index 78ce43b..aec2daf 100644 #include "alloc-util.h" #include "architecture.h" -@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { +@@ -1114,11 +1117,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -40,6 +41,3 @@ index 78ce43b..aec2daf 100644 pid_t getpid_cached(void) { static bool installed = false; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch index d6eda9c..e00600a 100644 --- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From e3f847bd0338d27aff3335b42661d8a4b66b965e Mon Sep 17 00:00:00 2001 +From f6df7f25a6bb00d5540915216adfff8afefec2b0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 11/24] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -20,6 +20,7 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/basic/format-util.h | 8 +------- src/basic/rlimit-util.c | 10 +++++----- @@ -27,10 +28,10 @@ Signed-off-by: Chen Qi 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index dece5d3..dbb87bc 100644 +index 59622508a333..779b6826d50e 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -42,13 +42,7 @@ +@@ -44,13 +44,7 @@ # define PRI_TIMEX "li" #endif @@ -46,10 +47,10 @@ index dece5d3..dbb87bc 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 74b3a02..b02c03c 100644 +index 2dc13eabc30d..0633cc67f417 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) s = strdup("infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) @@ -67,7 +68,7 @@ index 74b3a02..b02c03c 100644 if (!s) return -ENOMEM; -@@ -404,7 +404,7 @@ int rlimit_nofile_safe(void) { +@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { rl.rlim_cur = FD_SETSIZE; if (setrlimit(RLIMIT_NOFILE, &rl) < 0) @@ -77,10 +78,10 @@ index 74b3a02..b02c03c 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index a708231..e2b8748 100644 +index f04b8ba05002..084cf1420078 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -4220,9 +4220,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -4455,9 +4455,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", @@ -92,6 +93,3 @@ index a708231..e2b8748 100644 } if (c->ioprio_set) { --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 914589d..aa23c7a 100644 --- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,22 +1,22 @@ -From d3d65d4036670cbd5129fe55c09ca391286ef4b3 Mon Sep 17 00:00:00 2001 +From 7874912817b5ac7ed7f8557359a12d9d4b2f53eb Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 28 Feb 2018 21:25:22 -0800 -Subject: [PATCH 14/24] test-sizeof.c: Disable tests for missing typedefs in - musl +Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj Signed-off-by: Chen Qi + --- src/test/test-sizeof.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 35b0876..e78e7ca 100644 +index 7fc16a62b656..a710db5370b8 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c -@@ -41,8 +41,10 @@ int main(void) { +@@ -42,8 +42,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); @@ -27,7 +27,7 @@ index 35b0876..e78e7ca 100644 info(float); info(double); -@@ -60,7 +62,9 @@ int main(void) { +@@ -61,7 +63,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); @@ -37,6 +37,3 @@ index 35b0876..e78e7ca 100644 info(pid_t); info(uid_t); info(gid_t); --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index fd407f6..efeef07 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 +From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -25,16 +25,17 @@ just historical and not actually necessary or desired behaviour? Upstream-Status: Inappropriate [musl specific] Signed-off-by: Andre McCurdy + --- src/basic/fs-util.h | 22 +++++++++++++++++++++- src/shared/base-filesystem.c | 6 +++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 7ad030b..d4cb1e9 100644 +index 78d68be9fd85..c5dc84d41868 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h -@@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); +@@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m); int fd_warn_permissions(const char *path, int fd); @@ -64,10 +65,10 @@ index 7ad030b..d4cb1e9 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 89d7a7d..34b4ad5 100644 +index 657407da2d37..fbd5782d84fc 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); for (i = 0; i < ELEMENTSOF(table); i ++) { @@ -76,7 +77,7 @@ index 89d7a7d..34b4ad5 100644 continue; if (table[i].target) { -@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -85,7 +86,7 @@ index 89d7a7d..34b4ad5 100644 continue; /* check if a specific file exists at the target path */ -@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); @@ -94,6 +95,3 @@ index 89d7a7d..34b4ad5 100644 continue; } --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch index d556569..19a3eef 100644 --- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,8 +1,7 @@ -From af76c973e41929360a6e021f2ff9a7fc1d7994e9 Mon Sep 17 00:00:00 2001 +From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 16/24] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -10,25 +9,24 @@ using non-posix basename implementation, we have a way out Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj + --- - src/machine/machine-dbus.c | 4 ++++ - 1 file changed, 4 insertions(+) + src/machine/machine-dbus.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 7a558df..eca7d4b 100644 +index 760ccb445cd0..0df20f3864b3 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -11,6 +11,10 @@ +@@ -11,6 +11,11 @@ #include #undef basename +#if !defined(__GLIBC__) ++#include +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 24e24e8..56f4538 100644 --- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 +From a6f3359042219abaa8ae06dfcce41a4721e8c21f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 17/24] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -19,15 +19,16 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/process-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index b1c08fcade..0a7a1f7d89 100644 +index 24fec5ecb53a..642b02443c85 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { +@@ -1492,7 +1492,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 5901772..84a492f 100644 --- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 +From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 18/24] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -18,16 +18,17 @@ assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/journal/journal-send.c | 5 +++++ src/libsystemd/sd-bus/bus-error.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 3fea912..4f1e592 100644 +index 43ed756bda53..227ea64dbb48 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c -@@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove +@@ -336,7 +336,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; @@ -41,7 +42,7 @@ index 3fea912..4f1e592 100644 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index dc95237..bdda30f 100644 +index f760f0fdd21c..28a5159c4480 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { @@ -57,6 +58,3 @@ index dc95237..bdda30f 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 35cc66f..3b80646 100644 --- a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,7 +1,7 @@ -From 969ab9e68249fd383f4b513b1c9306bdac4ae9b2 Mon Sep 17 00:00:00 2001 +From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH 19/24] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP +Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP for currently unknown reasons they get exported to the shared libries even without being listed in the sym file @@ -11,12 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/libsystemd/sd-bus/bus-error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index bdda30f..e21853c 100644 +index 28a5159c4480..962a4de10c56 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { @@ -30,6 +31,3 @@ index bdda30f..e21853c 100644 /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch index 753d511..db4041b 100644 --- a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,7 +1,7 @@ -From 75c06e3e2a4760b36fffd95cdf5535b8ad73c481 Mon Sep 17 00:00:00 2001 +From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH 20/24] missing_type.h: add __compar_d_fn_t definition +Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition Fix the following compile failure: src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? @@ -9,12 +9,13 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 7d7c1e4..85902ab 100644 +index 23602ebbd533..917d314a81bf 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -13,6 +13,7 @@ @@ -25,6 +26,3 @@ index 7d7c1e4..85902ab 100644 #endif #ifndef __COMPAR_FN_T --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch index cdddf83..7dacc36 100644 --- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 +From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -9,12 +9,13 @@ error: redefinition of 'struct prctl_mm_map' Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index f80cd17..47e4893 100644 +index f80cd17f346b..47e489354053 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ @@ -27,6 +28,3 @@ index f80cd17..47e4893 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch index e266b9b..33c5758 100644 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch @@ -1,4 +1,4 @@ -From 6bcf562bd1e541c7aa46923d9a14201c7f785261 Mon Sep 17 00:00:00 2001 +From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Dec 2019 12:49:07 -0800 Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout @@ -11,15 +11,16 @@ purposes Upstream-Status: Pending Signed-off-by: Khem Raj Upstream-Status: Pending + --- src/basic/time-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index bfe2c60da1..8cf682b36a 100644 +index d7ef30d2fe52..4d3219f114b5 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1486,7 +1486,7 @@ int time_change_fd(void) { +@@ -1487,7 +1487,7 @@ int time_change_fd(void) { /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ static const struct itimerspec its = { @@ -28,6 +29,3 @@ index bfe2c60da1..8cf682b36a 100644 }; _cleanup_close_ int fd; --- -2.24.1 - diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch index 0e5629d..80beada 100644 --- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch @@ -1,7 +1,7 @@ -From 902412c271e0c5d9cb93b10ec0fb5b119b393474 Mon Sep 17 00:00:00 2001 +From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 16:53:06 +0800 -Subject: [PATCH 24/24] test-json.c: define M_PIl +Subject: [PATCH] test-json.c: define M_PIl Fix the following compile failure: src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? @@ -9,15 +9,16 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/test/test-json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-json.c b/src/test/test-json.c -index 9b8a2a9..efc746c 100644 +index a6613043b924..ca823ea79f05 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c -@@ -11,6 +11,10 @@ +@@ -12,6 +12,10 @@ #include "tests.h" #include "util.h" @@ -28,6 +29,3 @@ index 9b8a2a9..efc746c 100644 static void test_tokenizer(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd_243.4.bb b/meta/recipes-core/systemd/systemd_244.1.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.4.bb rename to meta/recipes-core/systemd/systemd_244.1.bb index a0d10e0..b686519 100644 --- a/meta/recipes-core/systemd/systemd_243.4.bb +++ b/meta/recipes-core/systemd/systemd_244.1.bb @@ -18,7 +18,6 @@ SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://99-default.preset \ " @@ -591,6 +590,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/ata_id \ ${rootlibexecdir}/udev/cdrom_id \ ${rootlibexecdir}/udev/collect \ + ${rootlibexecdir}/udev/fido_id \ ${rootlibexecdir}/udev/findkeyboards \ ${rootlibexecdir}/udev/keyboard-force-release.sh \ ${rootlibexecdir}/udev/keymap \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:55 +0000 Subject: [oe-commits] [openembedded-core] 01/05: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158116811420.27395.9676545917330021879@git.openembedded.org> References: <158116811420.27395.9676545917330021879@git.openembedded.org> Message-ID: <20200208132154.5645D232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 809f6f5b51863ea30d9707f9577c4bb196e558a2 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:54 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ddc9bc0 -> 3df4164) Message-ID: <158116811420.27395.9676545917330021879@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard ddc9bc0 systemd: upgrade 243.4 -> 244.1 discard d433e9d dhcp: upgrade 4.4.1 -> 4.4.2 discard 87dce69 lighttpd: upgrade 1.4.54 -> 1.4.55 discard 4de9661 procps: upgrade 3.3.15 -> 3.3.16 discard 76181c6 python3: Do not hardcode "lib" for distutils discard 3fed1ef python3: fix the installation path of libpython3.7m.a for multilib discard 6d8fe44 sstate.bbclass: fix issue while handling long sstate filenames discard 92fb0b7 mesa: upgrade 19.3.1 -> 19.3.3 discard 75ff6a0 package.bbclass: Support stripping and debug copy of static libraries discard 98b2ca9 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs discard 4cc3cac package.bbclass: Fix debug source processing for static libraries discard 78a51b5 chkconfig: remove the recipe discard 47ca5df xserver-xorg: upgrade 1.20.6 -> 1.20.7 discard 5697c27 cryptodev: update to Jan.23, 2020 discard dbade8b ncurses: Fix reproducibility issue discard b8b49db kern-tools: fix merge_config when LD contains parameters discard 515bd7b perl: Fix various reproducibile build issues discard 91abfa2 libevdev: Fix determinism issue discard 829cff0 sysvinit: Fix Reproducibility issue discard 3491249 sudo: specify where target tools are discard 59953d4 qemurunner.py: add try/except for pid handling race discard 12aa0bc bison: Upgrade to 3.5.1 discard cfd11e8 oeqa: Use cpio 2.13 as testcase discard d8a159b Revert "HACK: Attempt to find perl contamination" discard c200949 HACK: Attempt to find perl contamination discard 930ab1e kernel-yocto: fix defconfig detection in find_sccs() discard c9dc482 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created discard 17df86d kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh discard 4eadd6b kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set discard b6f08b8 kernel-yocto: Drop setting of unused variables in do_kernel_metadata discard 407e9a7 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass discard b282407 kern-tools-native: use more common S value and oe_runmake discard f5439d0 kern-tools: integrate merge_config fix for gold linker discard 345f562 kern-tools: tweak symbol_why to be python safe discard 359032c libgcrypt: Fix determinism issue discard 36a814d libinput: Fix determinism issue discard 2ba34e3 iputils: Fix build determinism discard 64b7faa openssl: Fix reproducibility issue discard e290f6c perl: do not install files that contain build host specific data discard 4bba999 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 66bc948 Revert "HACK: Intercept broken permissions in build" discard 3994c36 HACK: Intercept broken permissions in build discard 1b568a5 HACK: signing: Add extra test debug discard 0f11c34 glew/curl: specify exclusive package configs discard f46a626 base.bbclass: extend PACKAGECONFIG for conflict package configs discard a2417e3 oescripts.py: use unittest.SkipUnless for class skip add 2e0f30c perl: do not install files that contain build host specific data add 482fd0d perl: Fix various reproducibile build issues add 37db519 openssl: Fix reproducibility issue add 8b00ec4 iputils: Fix build determinism add c3f6a61 libinput: Fix determinism issue add 506b36b libgcrypt: Fix determinism issue add 61650dd sudo: specify where target tools are add 0227e92 sysvinit: Fix Reproducibility issue add 75e4ced libevdev: Fix determinism issue add 09c8a28 ncurses: Fix reproducibility issue add eaa8345 kern-tools: tweak symbol_why to be python safe add fa96457 kern-tools: integrate merge_config fix for gold linker add 83a552d kern-tools-native: use more common S value and oe_runmake add 48d8f97 kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass add ee358e0 kernel-yocto: Drop setting of unused variables in do_kernel_metadata add 613c43f kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set add 36fe2ef kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh add ec281a9 kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created add 06577d4 kernel-yocto: fix defconfig detection in find_sccs() add a60c4c1 kern-tools: fix merge_config when LD contains parameters add 84eb1dc oeqa: Use cpio 2.13 as testcase add eadb899 qemurunner.py: add try/except for pid handling race add 61efc1e chkconfig: remove the recipe add fa356b2 package.bbclass: Fix debug source processing for static libraries add c50fcd5 package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs add 17fa66c package.bbclass: Support stripping and debug copy of static libraries add 2acfee6 sstate.bbclass: fix issue while handling long sstate filenames add 877d3ff cryptodev: update to Jan.23, 2020 add da9b363 bison: Upgrade to 3.5.1 add cad375e xserver-xorg: upgrade 1.20.6 -> 1.20.7 add a3f8270 mesa: upgrade 19.3.1 -> 19.3.3 add 3081d39 python3: fix the installation path of libpython3.7m.a for multilib add fb33127 python3: Do not hardcode "lib" for distutils add c3df7ee procps: upgrade 3.3.15 -> 3.3.16 add e669dd9 lighttpd: upgrade 1.4.54 -> 1.4.55 add d3c6f7e dhcp: upgrade 4.4.1 -> 4.4.2 add 44a4ac2 systemd: upgrade 243.4 -> 244.1 new 809f6f5 oescripts.py: use unittest.SkipUnless for class skip new 2648c7c base.bbclass: extend PACKAGECONFIG for conflict package configs new fcf3d67 glew/curl: specify exclusive package configs new 40189d4 HACK: signing: Add extra test debug new 3df4164 sstatesig: Log timestamps for hashequiv in reprodubile builds This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ddc9bc0) \ N -- N -- N refs/heads/master-next (3df4164) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:58 +0000 Subject: [oe-commits] [openembedded-core] 04/05: HACK: signing: Add extra test debug In-Reply-To: <158116811420.27395.9676545917330021879@git.openembedded.org> References: <158116811420.27395.9676545917330021879@git.openembedded.org> Message-ID: <20200208132154.6F459232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 40189d4652df9d78e092f886d96360345101de3e Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:56 +0000 Subject: [oe-commits] [openembedded-core] 02/05: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158116811420.27395.9676545917330021879@git.openembedded.org> References: <158116811420.27395.9676545917330021879@git.openembedded.org> Message-ID: <20200208132154.5E6AB232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2648c7ccf11fbe4158c8bcc9e0133bf4d2fc8318 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:57 +0000 Subject: [oe-commits] [openembedded-core] 03/05: glew/curl: specify exclusive package configs In-Reply-To: <158116811420.27395.9676545917330021879@git.openembedded.org> References: <158116811420.27395.9676545917330021879@git.openembedded.org> Message-ID: <20200208132154.665AB232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fcf3d6721588454e66b2c50c5593c4c6fd9c2b7f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:21:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:21:59 +0000 Subject: [oe-commits] [openembedded-core] 05/05: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158116811420.27395.9676545917330021879@git.openembedded.org> References: <158116811420.27395.9676545917330021879@git.openembedded.org> Message-ID: <20200208132154.77CB7232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3df416455a3228882fb0343c5319237b31d0fb09 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:53 +0000 Subject: [oe-commits] [openembedded-core] 01/07: pciutils: upgrade 3.6.2 -> 3.6.4 In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.9E4B2232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 32006748ea09dc0451ca3c73a04264da63afbcf9 Author: Wang Mingyu AuthorDate: Sat Feb 8 09:00:55 2020 -0800 pciutils: upgrade 3.6.2 -> 3.6.4 refresh the following patch: configure.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 4 ++-- meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index a7e4457..e444c13 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -24,7 +24,7 @@ Index: pciutils-3.5.6/Makefile - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ - %.8 %.7: %.man + %.8 %.7 %.5: %.man M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" Index: pciutils-3.5.6/lib/configure =================================================================== @@ -70,7 +70,7 @@ Index: pciutils-3.5.6/lib/configure fi [ -n "$RELEASE" ] && rel="${RELEASE}" # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. -@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ +@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo " $host $rel $cpu $sys" diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb similarity index 92% rename from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb rename to meta/recipes-bsp/pciutils/pciutils_3.6.4.bb index 413421c..034bb63 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82" -SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" +SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" +SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" inherit multilib_header pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:52 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (3df4164 -> b13ec0f) Message-ID: <158116841239.29052.15573459140334183836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 3df4164 sstatesig: Log timestamps for hashequiv in reprodubile builds new 3200674 pciutils: upgrade 3.6.2 -> 3.6.4 new 413ec61 testimage: Allow testing on QEMU machines with a single serial port new 4f9edbf testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested new e99310e xserver-nodm-init: Fix the start failure for non-root user new ea7836b kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE new 475dd5d rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new b13ec0f oeqa: Use --disable-maintainer-mode configure option The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel-fitimage.bbclass | 5 ++- meta/classes/rootfs-postcommands.bbclass | 8 ++--- meta/classes/testimage.bbclass | 40 ++++++++++++++++++++++ meta/lib/oeqa/core/target/qemu.py | 8 +++-- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- meta/lib/oeqa/utils/qemurunner.py | 31 ++++++++++++++--- meta/recipes-bsp/pciutils/pciutils/configure.patch | 4 +-- .../{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 +-- .../x11-common/xserver-nodm-init/capability.conf | 2 ++ .../x11-common/xserver-nodm-init/xserver-nodm | 8 +++++ .../x11-common/xserver-nodm-init_3.0.bb | 7 ++-- 13 files changed, 100 insertions(+), 23 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} (92%) create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:55 +0000 Subject: [oe-commits] [openembedded-core] 03/07: testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.AF788232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4f9edbf690f724b461f9e7cd1f5d84062ebf70cc Author: Alejandro Hernandez Samaniego AuthorDate: Sat Feb 8 02:32:02 2020 -0800 testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested The current runtime infrastructure contains hardcoded values which Ill refer to as patterns, these patterns are either searched through or sent via the serial terminal to communicate between HOST and TARGET. These patterns are required since they allow us to check when a device has finished booting, to log in, and to check whether a command sent from our tests has returned, this way we are able to check both the status of the commands that were sent along with its output. The testing process goes somewhat as follows: 1. Launch QEMU and start booting. 2. Check when the device has booted by looking for the pattern login:. 3. Log in as the root user (default for our images). 4. Check that we were able to log in succesfully. 5. Start running the runtime test cases defined by TEST_SUITES. 6. One of such test cases could send a command to the QEMU target. 7. Check whether that command returned. 8. Check its output and status, return whether the test case passed or failed. This patch allows this set of patterns to be defined instead of being hardcoded, but it also automatically sets the defaults that we have been using in the past if they have not been manually defined, for this reason, the patch is less invasive and should not affect in any way how tests are currently being run. Cases that can be enabled with this patch: - A customized image that does not use the root user (or maybe we want to check what happens if we dont use the root user). - An image where the PS1 env variable has been modified, and the prompt pattern wouldnt match the default. - Baremetal applications, which do not follow the conventional way of booting Linux and would probably not show a prompt for a user to log in, same applies for testing bootloaders. - poky-tiny: Using DISTRO=poky-tiny and an image such as the core-image-tiny from meta-intel, which boots directly to RAM, and does not show a log in prompt since it does not contain a conventional init process. The code itself contains comments that should be self explanatory but here is an example on how these patterns can be defined in a hypothetical case where we want to run test cases as the webserver user instead: TESTIMAGE_BOOT_PATTERNS = "send_login_user search_login_succeeded" TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" TESTIMAGE_BOOT_PATTERNS[search_login_succeeded] = "webserver@[a-zA-Z0-9\-]+:~#" The variable TESTIMAGE_BOOT_PATTERNS defines which patterns to override when used to communicate with the target when booting, anyone familiar with the PACKAGECONFIG syntax should have no trouble setting these. Other patterns would still be set up as default, e.g. search_reached_prompt would still be login: The accepted flags for TESTIMAGE_BOOT_PATTERNS are the following: search_reached_prompt, send_login_user, search_login_succeeded, search_cmd_finished. They are prefixed with either search/send, to differentiate if the pattern is meant to be sent or searched to/from the target terminal. A working example of this code that falls under the baremetal case mentioned above along with a test case is present on the meta-freertos layer, which tests an RTOS image built with OpenEmbedded and automatically runs a test case on it after booting such image: As usual, INHERIT += "testimage" needs to be present on local.conf $ bitbake freertos-demo -c testimage RESULTS: RESULTS - freertos_echo.FreeRTOSTest.test_freertos_echo: PASSED (2.00s) SUMMARY: freertos-demo () - Ran 1 test in 2.006s freertos-demo - OK - All required tests passed (successes=1, skipped=0, failures=0, errors=0) Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 39 +++++++++++++++++++++++++++++++++++++++ meta/lib/oeqa/core/target/qemu.py | 7 +++++-- meta/lib/oeqa/utils/qemurunner.py | 31 ++++++++++++++++++++++++++----- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 0d55c32..75f0f2c 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -34,6 +34,17 @@ TESTIMAGE_AUTO ??= "0" # TEST_QEMUPARAMS can be used to pass extra parameters to qemu, e.g. "-m 1024" for setting the amount of ram to 1 GB. # TEST_RUNQEMUPARAMS can be used to pass extra parameters to runqemu, e.g. "gl" to enable OpenGL acceleration. +# TESTIMAGE_BOOT_PATTERNS can be used to override certain patterns used to communicate with the target when booting, +# if a pattern is not specifically present on this variable a default will be used when booting the target. +# TESTIMAGE_BOOT_PATTERNS[] overrides the pattern used for that specific flag, where flag comes from a list of accepted flags +# e.g. normally the system boots and waits for a login prompt (login:), after that it sends the command: "root\n" to log as the root user +# if we wanted to log in as the hypothetical "webserver" user for example we could set the following: +# TESTIMAGE_BOOT_PATTERNS = "send_login_user search_login_succeeded" +# TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" +# TESTIMAGE_BOOT_PATTERNS[search_login_succeeded] = "webserver@[a-zA-Z0-9\-]+:~#" +# The accepted flags are the following: search_reached_prompt, send_login_user, search_login_succeeded, search_cmd_finished. +# They are prefixed with either search/send, to differentiate if the pattern is meant to be sent or searched to/from the target terminal + TEST_LOG_DIR ?= "${WORKDIR}/testimage" TEST_EXPORT_DIR ?= "${TMPDIR}/testimage/${PN}" @@ -68,6 +79,8 @@ TEST_TARGET ?= "qemu" TEST_QEMUPARAMS ?= "" TEST_RUNQEMUPARAMS ?= "" +TESTIMAGE_BOOT_PATTERNS ?= "" + TESTIMAGEDEPENDS = "" TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}" @@ -150,6 +163,29 @@ def get_testimage_json_result_dir(d): def get_testimage_result_id(configuration): return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['MACHINE'], configuration['STARTTIME']) +def get_testimage_boot_patterns(d): + from collections import defaultdict + boot_patterns = defaultdict(str) + # Only accept certain values + accepted_patterns = ['search_reached_prompt', 'send_login_user', 'search_login_succeeded', 'search_cmd_finished'] + # Not all patterns need to be overriden, e.g. perhaps we only want to change the user + boot_patterns_flags = d.getVarFlags('TESTIMAGE_BOOT_PATTERNS') or {} + if boot_patterns_flags: + patterns_set = [p for p in boot_patterns_flags.items() if p[0] in d.getVar('TESTIMAGE_BOOT_PATTERNS').split()] + for flag, flagval in patterns_set: + if flag not in accepted_patterns: + bb.fatal('Testimage: The only accepted boot patterns are: search_reached_prompt,send_login_user, \ + search_login_succeeded,search_cmd_finished\n Make sure your TESTIMAGE_BOOT_PATTERNS=%s \ + contains an accepted flag.' % d.getVar('TESTIMAGE_BOOT_PATTERNS')) + return + # We know boot prompt is searched through in binary format, others might be expressions + if flag == 'search_reached_prompt': + boot_patterns[flag] = flagval.encode() + else: + boot_patterns[flag] = flagval.encode().decode('unicode-escape') + return boot_patterns + + def testimage_main(d): import os import json @@ -259,6 +295,9 @@ def testimage_main(d): 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), } + if d.getVar("TESTIMAGE_BOOT_PATTERNS"): + target_kwargs['boot_patterns'] = get_testimage_boot_patterns(d) + # TODO: Currently BBPATH is needed for custom loading of targets. # It would be better to find these modules using instrospection. target_kwargs['target_modules_path'] = d.getVar('BBPATH') diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 008a9f0..059106e 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -8,6 +8,7 @@ import os import sys import signal import time +from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner @@ -18,7 +19,8 @@ class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, dump_dir='', dump_host_cmds='', display='', bootlog='', - tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): + tmpdir='', dir_image='', boottime=60, serial_ports=2, + boot_patterns = defaultdict(str), **kwargs): super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) @@ -30,13 +32,14 @@ class OEQemuTarget(OESSHTarget): self.kernel = kernel self.kvm = kvm self.use_slirp = slirp + self.boot_patterns = boot_patterns self.runner = QemuRunner(machine=machine, rootfs=rootfs, tmpdir=tmpdir, deploy_dir_image=dir_image, display=display, logfile=bootlog, boottime=boottime, use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, dump_host_cmds=dump_host_cmds, logger=logger, - serial_ports=serial_ports) + serial_ports=serial_ports, boot_patterns = boot_patterns) def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 4704422..ed74ea8 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -21,6 +21,7 @@ import threading import codecs import logging from oeqa.utils.dump import HostDumper +from collections import defaultdict # Get Unicode non printable control chars control_range = list(range(0,32))+list(range(127,160)) @@ -31,7 +32,7 @@ re_control_char = re.compile('[%s]' % re.escape("".join(control_chars))) class QemuRunner: def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, - use_kvm, logger, use_slirp=False, serial_ports=2): + use_kvm, logger, use_slirp=False, serial_ports=2, boot_patterns = defaultdict(str)): # Popen object for runqemu self.runqemu = None @@ -57,6 +58,7 @@ class QemuRunner: self.use_slirp = use_slirp self.serial_ports = serial_ports self.msg = '' + self.boot_patterns = boot_patterns self.runqemutime = 120 self.qemu_pidfile = 'pidfile_'+str(os.getpid()) @@ -65,6 +67,25 @@ class QemuRunner: self.logger = logger + # Enable testing other OS's + # Set commands for target communication, and default to Linux ALWAYS + # Other OS's or baremetal applications need to provide their + # own implementation passing it through QemuRunner's constructor + # or by passing them through TESTIMAGE_BOOT_PATTERNS[flag] + # provided variables, where is one of the mentioned below. + accepted_patterns = ['search_reached_prompt', 'send_login_user', 'search_login_succeeded', 'search_cmd_finished'] + default_boot_patterns = defaultdict(str) + # Default to the usual paterns used to communicate with the target + default_boot_patterns['search_reached_prompt'] = b' login:' + default_boot_patterns['send_login_user'] = 'root\n' + default_boot_patterns['search_login_succeeded'] = r"root@[a-zA-Z0-9\-]+:~#" + default_boot_patterns['search_cmd_finished'] = r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#" + + # Only override patterns that were set e.g. login user TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" + for pattern in accepted_patterns: + if not self.boot_patterns[pattern]: + self.boot_patterns[pattern] = default_boot_patterns[pattern] + def create_socket(self): try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -321,7 +342,7 @@ class QemuRunner: self.log(data) data = b'' - if b' login:' in bootlog: + if self.boot_patterns['search_reached_prompt'] in bootlog: self.server_socket = qemusock stopread = True reachedlogin = True @@ -353,8 +374,8 @@ class QemuRunner: # If we are not able to login the tests can continue try: - (status, output) = self.run_serial("root\n", raw=True) - if re.search(r"root@[a-zA-Z0-9\-]+:~#", output): + (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True) + if re.search(self.boot_patterns['search_login_succeeded'], output): self.logged = True self.logger.debug("Logged as root in serial console") if netconf: @@ -478,7 +499,7 @@ class QemuRunner: if answer: data += answer.decode('utf-8') # Search the prompt to stop - if re.search(r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#", data): + if re.search(self.boot_patterns['search_cmd_finished'], data): break else: raise Exception("No data on serial console socket") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:54 +0000 Subject: [oe-commits] [openembedded-core] 02/07: testimage: Allow testing on QEMU machines with a single serial port In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.A6D49232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 413ec61e0d0f152615effa8e38b01e5c3af23556 Author: Alejandro Hernandez Samaniego AuthorDate: Sat Feb 8 02:30:04 2020 -0800 testimage: Allow testing on QEMU machines with a single serial port commmit 6cde67d0a84 enables the use of qemurunner on machines that only have a single serial port, but still sets the default value as serial_ports=2 if not provided. The testimage class does not call qemurunner with a serial_ports argument, hence always defaulting to two. Pass the serial_ports argument from the testimage class to allow tests to run on QEMU machines with a single serial port. Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 1 + meta/lib/oeqa/core/target/qemu.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 844ed87..0d55c32 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -256,6 +256,7 @@ def testimage_main(d): 'kvm' : kvm, 'slirp' : slirp, 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), + 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), } # TODO: Currently BBPATH is needed for custom loading of targets. diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 758703c..008a9f0 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -18,7 +18,7 @@ class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, dump_dir='', dump_host_cmds='', display='', bootlog='', - tmpdir='', dir_image='', boottime=60, **kwargs): + tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) @@ -35,7 +35,8 @@ class OEQemuTarget(OESSHTarget): deploy_dir_image=dir_image, display=display, logfile=bootlog, boottime=boottime, use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, - dump_host_cmds=dump_host_cmds, logger=logger) + dump_host_cmds=dump_host_cmds, logger=logger, + serial_ports=serial_ports) def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:56 +0000 Subject: [oe-commits] [openembedded-core] 04/07: xserver-nodm-init: Fix the start failure for non-root user In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.BA329232A39@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e99310e6ef86c88c3bd3f282dd43d252b5d19693 Author: Kevin Hao AuthorDate: Sat Feb 8 20:36:42 2020 +0800 xserver-nodm-init: Fix the start failure for non-root user In order to start the xserver, a non-root user should have the cap_sys_admin capability to set the drm master. We try to get the cap_sys_admin capability by setting it in both the thread and file inheritable set. The side effect of this is that we would have to add the "pam" to the distro features if we want use the xserver-nodm-init for a non-root user. [Yocto #11526] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- .../recipes-graphics/x11-common/xserver-nodm-init/capability.conf | 2 ++ meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 8 ++++++++ meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf new file mode 100644 index 0000000..7ab7460 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf @@ -0,0 +1,2 @@ +cap_sys_admin @USER@ +none * diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index 6c54855..116bb27 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -38,6 +38,14 @@ case "$1" in if [ -e /dev/hidraw0 ]; then chmod o+rw /dev/hidraw* fi + # Make sure that the Xorg has the cap_sys_admin capability which is + # needed for setting the drm master + if ! grep -q "^auth.*pam_cap\.so" /etc/pam.d/su; then + echo "auth optional pam_cap.so" >>/etc/pam.d/su + fi + if ! /usr/sbin/getcap $XSERVER | grep -q cap_sys_admin; then + /usr/sbin/setcap cap_sys_admin+eip $XSERVER + fi fi # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 385fea5..c2995f9 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -10,6 +10,7 @@ SRC_URI = "file://xserver-nodm \ file://gplv2-license.patch \ file://xserver-nodm.service.in \ file://xserver-nodm.conf.in \ + file://capability.conf \ " S = "${WORKDIR}" @@ -19,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d systemd features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}" PACKAGECONFIG ??= "blank" # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG @@ -40,6 +41,8 @@ do_install() { if [ "${ROOTLESS_X}" = "1" ] ; then XUSER_HOME="/home/xuser" XUSER="xuser" + install -D capability.conf ${D}${sysconfdir}/security/capability.conf + sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/security/capability.conf else XUSER_HOME=${ROOT_HOME} XUSER="root" @@ -60,7 +63,7 @@ do_install() { fi } -RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:57 +0000 Subject: [oe-commits] [openembedded-core] 05/07: kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.C4179232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ea7836b3054f2ba6b9ff23c1ac62b17676fc2b9e Author: Alex Kiernan AuthorDate: Fri Jan 31 16:24:42 2020 +0000 kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE When using EXTERNAL_KERNEL_DEVICETREE, collect DTB overlays too (*.dtbo) as well as iterating down into sub-directories so using the behaviour for naming which matches KERNEL_DEVICETREE. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index ec18a3d..d1b8cdc 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,11 +391,10 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do - DTB=`basename ${DTBFILE}` + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" - fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE} + fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" done fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:58 +0000 Subject: [oe-commits] [openembedded-core] 06/07: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.CD8EA232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 475dd5d9201108e821f38323dd83d3805ac3fab3 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 13:26:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 13:26:59 +0000 Subject: [oe-commits] [openembedded-core] 07/07: oeqa: Use --disable-maintainer-mode configure option In-Reply-To: <158116841239.29052.15573459140334183836@git.openembedded.org> References: <158116841239.29052.15573459140334183836@git.openembedded.org> Message-ID: <20200208132652.D7709232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b13ec0fa5589c86b4b4fb9a8dbb912a29b6ceb7a Author: Khem Raj AuthorDate: Fri Feb 7 18:12:36 2020 -0800 oeqa: Use --disable-maintainer-mode configure option since the versions of autotools might differ, and difference in timestamps for configure and system can result in reconfigure lets avoid that by telling configure to ignore such differences. Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd..d0f9166 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb..902e93f 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 8091425..87cc284 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('--disable-maintainer-mode',''), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:02:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:02:16 +0000 Subject: [oe-commits] [bitbake] branch master updated (a194f27 -> 27ad9c1) Message-ID: <158117773673.11598.11020515135557870575@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository bitbake. from a194f27 cooker/toaster: replaced deprecated method warn() with warning() new ed764e7 siggen: Optimise get_unihash disk based cache handling new 5c9cc45 siggen: Cache unihash values to avoid cache lookup new 27ad9c1 siggen: Avoid cache mismatch issues with locked sigs The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lib/bb/siggen.py | 68 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:02:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:02:19 +0000 Subject: [oe-commits] [bitbake] 03/03: siggen: Avoid cache mismatch issues with locked sigs In-Reply-To: <158117773673.11598.11020515135557870575@git.openembedded.org> References: <158117773673.11598.11020515135557870575@git.openembedded.org> Message-ID: <20200208160217.0E2AF232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 27ad9c1d468fba858a4adeb56b605227b415ae0f Author: Richard Purdie AuthorDate: Sun Jan 5 14:04:59 2020 +0000 siggen: Avoid cache mismatch issues with locked sigs If locked sigs are in use this function makes little sense, need to avoid generating mismatch warnings. Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 96807c4..ffd8fca 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -515,6 +515,10 @@ class SignatureGeneratorUniHashMixIn(object): if self.setscenetasks and tid not in self.setscenetasks: return + # This can happen if locked sigs are in action. Detect and just abort + if taskhash != self.taskhash[tid]: + return + # Sanity checks cache_unihash = self._get_unihash(tid, checkkey=taskhash) if cache_unihash is None: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:02:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:02:17 +0000 Subject: [oe-commits] [bitbake] 01/03: siggen: Optimise get_unihash disk based cache handling In-Reply-To: <158117773673.11598.11020515135557870575@git.openembedded.org> References: <158117773673.11598.11020515135557870575@git.openembedded.org> Message-ID: <20200208160216.DBC6A232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit ed764e7fcf04b6d0ba6b4cac7415b1ee8f492865 Author: Richard Purdie AuthorDate: Thu Dec 12 18:07:14 2019 +0000 siggen: Optimise get_unihash disk based cache handling Currently the cache can grow huge since any previously used hash is retained in the cache. This change moves to use one hash per task which improves the speed of the functions considerably. Currently performance is an issue, as are very large cache files and cache load time. By moving to a single hash per task, the shorted filename as a key is no longer usable as the same recipe has multiple variants for the same filename so this has to change. Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ded1da0..209a342 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -44,6 +44,7 @@ class SignatureGenerator(object): self.file_checksum_values = {} self.taints = {} self.unitaskhashes = {} + self.tidtopn = {} self.setscenetasks = set() def finalise(self, fn, d, varient): @@ -79,19 +80,19 @@ class SignatureGenerator(object): return def get_taskdata(self): - return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.setscenetasks) + return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) def set_taskdata(self, data): - self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.setscenetasks = data + self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data def reset(self, data): self.__init__(data) def get_taskhashes(self): - return self.taskhash, self.unitaskhashes + return self.taskhash, self.unitaskhashes, self.tidtopn def set_taskhashes(self, hashes): - self.taskhash, self.unitaskhashes = hashes + self.taskhash, self.unitaskhashes, self.tidtopn = hashes def save_unitaskhashes(self): return @@ -124,9 +125,10 @@ class SignatureGeneratorBasic(SignatureGenerator): else: self.checksum_cache = None - self.unihash_cache = bb.cache.SimpleCache("1") + self.unihash_cache = bb.cache.SimpleCache("3") self.unitaskhashes = self.unihash_cache.init_cache(data, "bb_unihashes.dat", {}) self.localdirsexclude = (data.getVar("BB_SIGNATURE_LOCAL_DIRS_EXCLUDE") or "CVS .bzr .git .hg .osc .p4 .repo .svn").split() + self.tidtopn = {} def init_rundepcheck(self, data): self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None @@ -210,6 +212,9 @@ class SignatureGeneratorBasic(SignatureGenerator): self.runtaskdeps[tid] = [] self.file_checksum_values[tid] = [] recipename = dataCache.pkg_fn[fn] + + self.tidtopn[tid] = recipename + for dep in sorted(deps, key=clean_basepath): (depmc, _, deptaskname, depfn) = bb.runqueue.split_tid_mcfn(dep) if mc != depmc: @@ -407,24 +412,35 @@ class SignatureGeneratorUniHashMixIn(object): self._client = hashserv.create_client(self.server) return self._client - def __get_task_unihash_key(self, tid): - # TODO: The key only *needs* to be the taskhash, the tid is just - # convenient - return '%s:%s' % (tid.rsplit("/", 1)[1], self.taskhash[tid]) - def get_stampfile_hash(self, tid): if tid in self.taskhash: # If a unique hash is reported, use it as the stampfile hash. This # ensures that if a task won't be re-run if the taskhash changes, # but it would result in the same output hash - unihash = self.unitaskhashes.get(self.__get_task_unihash_key(tid), None) + unihash = self._get_unihash(tid) if unihash is not None: return unihash return super().get_stampfile_hash(tid) def set_unihash(self, tid, unihash): - self.unitaskhashes[self.__get_task_unihash_key(tid)] = unihash + (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) + key = mc + ":" + self.tidtopn[tid] + ":" + taskname + self.unitaskhashes[key] = (self.taskhash[tid], unihash) + + def _get_unihash(self, tid, checkkey=None): + if tid not in self.tidtopn: + return None + (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) + key = mc + ":" + self.tidtopn[tid] + ":" + taskname + if key not in self.unitaskhashes: + return None + if not checkkey: + checkkey = self.taskhash[tid] + (key, unihash) = self.unitaskhashes[key] + if key != checkkey: + return None + return unihash def get_unihash(self, tid): taskhash = self.taskhash[tid] @@ -433,11 +449,9 @@ class SignatureGeneratorUniHashMixIn(object): if self.setscenetasks and tid not in self.setscenetasks: return taskhash - key = self.__get_task_unihash_key(tid) - # TODO: This cache can grow unbounded. It probably only needs to keep # for each task - unihash = self.unitaskhashes.get(key, None) + unihash = self._get_unihash(tid) if unihash is not None: return unihash @@ -472,7 +486,7 @@ class SignatureGeneratorUniHashMixIn(object): except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) - self.unitaskhashes[key] = unihash + self.set_unihash(tid, unihash) return unihash def report_unihash(self, path, task, d): @@ -484,13 +498,13 @@ class SignatureGeneratorUniHashMixIn(object): tempdir = d.getVar('T') fn = d.getVar('BB_FILENAME') tid = fn + ':do_' + task - key = tid.rsplit("/", 1)[1] + ':' + taskhash + key = tid + ':' + taskhash if self.setscenetasks and tid not in self.setscenetasks: return # Sanity checks - cache_unihash = self.unitaskhashes.get(key, None) + cache_unihash = self._get_unihash(tid, checkkey=taskhash) if cache_unihash is None: bb.fatal('%s not in unihash cache. Please report this error' % key) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:02:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:02:18 +0000 Subject: [oe-commits] [bitbake] 02/03: siggen: Cache unihash values to avoid cache lookup In-Reply-To: <158117773673.11598.11020515135557870575@git.openembedded.org> References: <158117773673.11598.11020515135557870575@git.openembedded.org> Message-ID: <20200208160216.F1463232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 5c9cc45b60904a1c355db9bf9c4495f1b25aca37 Author: Richard Purdie AuthorDate: Sat Dec 14 18:17:01 2019 +0000 siggen: Cache unihash values to avoid cache lookup Add unihash cache of values to speed up cache lookup. This avoids the overhead of the disk based check functions. Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 209a342..96807c4 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -40,6 +40,7 @@ class SignatureGenerator(object): def __init__(self, data): self.basehash = {} self.taskhash = {} + self.unihash = {} self.runtaskdeps = {} self.file_checksum_values = {} self.taints = {} @@ -80,19 +81,19 @@ class SignatureGenerator(object): return def get_taskdata(self): - return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) + return (self.runtaskdeps, self.taskhash, self.unihash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) def set_taskdata(self, data): - self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data + self.runtaskdeps, self.taskhash, self.unihash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data def reset(self, data): self.__init__(data) def get_taskhashes(self): - return self.taskhash, self.unitaskhashes, self.tidtopn + return self.taskhash, self.unihash, self.unitaskhashes, self.tidtopn def set_taskhashes(self, hashes): - self.taskhash, self.unitaskhashes, self.tidtopn = hashes + self.taskhash, self.unihash, self.unitaskhashes, self.tidtopn = hashes def save_unitaskhashes(self): return @@ -108,6 +109,7 @@ class SignatureGeneratorBasic(SignatureGenerator): def __init__(self, data): self.basehash = {} self.taskhash = {} + self.unihash = {} self.taskdeps = {} self.runtaskdeps = {} self.file_checksum_values = {} @@ -256,7 +258,13 @@ class SignatureGeneratorBasic(SignatureGenerator): data = self.basehash[tid] for dep in self.runtaskdeps[tid]: - data = data + self.get_unihash(dep) + if dep in self.unihash: + if self.unihash[dep] is None: + data = data + self.taskhash[dep] + else: + data = data + self.unihash[dep] + else: + data = data + self.get_unihash(dep) for (f, cs) in self.file_checksum_values[tid]: if cs: @@ -427,6 +435,7 @@ class SignatureGeneratorUniHashMixIn(object): (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) key = mc + ":" + self.tidtopn[tid] + ":" + taskname self.unitaskhashes[key] = (self.taskhash[tid], unihash) + self.unihash[tid] = unihash def _get_unihash(self, tid, checkkey=None): if tid not in self.tidtopn: @@ -447,12 +456,14 @@ class SignatureGeneratorUniHashMixIn(object): # If its not a setscene task we can return if self.setscenetasks and tid not in self.setscenetasks: + self.unihash[tid] = None return taskhash # TODO: This cache can grow unbounded. It probably only needs to keep # for each task unihash = self._get_unihash(tid) if unihash is not None: + self.unihash[tid] = unihash return unihash # In the absence of being able to discover a unique hash from the @@ -487,6 +498,7 @@ class SignatureGeneratorUniHashMixIn(object): bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) self.set_unihash(tid, unihash) + self.unihash[tid] = unihash return unihash def report_unihash(self, path, task, d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:02:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:02:25 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (11cf412 -> 68fffdc) Message-ID: <158117774544.12022.16377266127770866277@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard 11cf412 fixup discard 52faf3e fix2 discard 367d417 bitbake: siggen: Cache unihash values to avoid cache lookup discard 145f4f5 bitbake: siggen: Optimise get_unihash handling [fixme commit msg] discard f3ddb5b runqueue: Possible tid handling optimisation add ed764e7 siggen: Optimise get_unihash disk based cache handling add 5c9cc45 siggen: Cache unihash values to avoid cache lookup add 27ad9c1 siggen: Avoid cache mismatch issues with locked sigs new 68fffdc runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (11cf412) \ N -- N -- N refs/heads/master-next (68fffdc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:02:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:02:26 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158117774544.12022.16377266127770866277@git.openembedded.org> References: <158117774544.12022.16377266127770866277@git.openembedded.org> Message-ID: <20200208160225.98574232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 68fffdc0731f06ffe6451dca0b87a17517a250a9 Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch zeus-next in repository openembedded-core. at 3d114c0 ncurses: Fix reproducibility issue This branch includes the following new commits: new 1b71c28 opkg-utils: upgrade to version 0.4.2 new b577a6d opkg-utils: Fix reproducibility issues in opkg-build new 4d470f4 oeqa/reproducible: Improve test output and ensure deb+ipk compared new 10515e5 classes/reproducible_build: Read SDE file later new 51274c9 sudo: Set vardir deterministically new 10357b0 libxshmfence: Set shm directory deterministically new 164d72b mc: Fix build reproducibility new 8f77075 mc: Set zipinfo presence determinstically new 3653fd4 mc: Fix manpage date indeterminism new 6bdc5f7 tar: Fix build determinism, disable rsh new fd3bd61 patch: Extend to native/nativesdk and depend upon new ca213de libidn2: Fix reproducibility issue new a2a6d9f gtk+3: sort resources for reproducible binaries new 208efc8 perl: do not install files that contain build host specific data new def3a9d perl: Fix various reproducibile build issues new c31c676 openssl: Fix reproducibility issue new 3997c47 iputils: Fix build determinism new 22dc9a3 libinput: Fix determinism issue new 2b68ffc libgcrypt: Fix determinism issue new 6e80947 sudo: specify where target tools are new cbcba43 sysvinit: Fix Reproducibility issue new fc6e8e5 libevdev: Fix determinism issue new 3d114c0 ncurses: Fix reproducibility issue The 23 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:29 +0000 Subject: [oe-commits] [openembedded-core] 03/23: oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.72A68232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 4d470f48f7fb5e05fba1ca3a59fb4f85d910026e Author: Richard Purdie AuthorDate: Mon Feb 3 23:39:29 2020 +0000 oeqa/reproducible: Improve test output and ensure deb+ipk compared Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. (From OE-Core rev: 6e2e0480852177db75a6108d77c99c92c4e9950f) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index a911056..1b0b5ba 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -174,6 +174,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -197,6 +199,9 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:27 +0000 Subject: [oe-commits] [openembedded-core] 01/23: opkg-utils: upgrade to version 0.4.2 In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.639FD232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 1b71c28e1ca4fddc0f3c340ea4bcd76854ef620c Author: Alejandro del Castillo AuthorDate: Tue Dec 17 18:16:08 2019 -0600 opkg-utils: upgrade to version 0.4.2 - Drop 00001-Switch-all-scripts-to-use-Python-3.x.patch - Drop 00001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch - Drop pipefail.patch (From OE-Core rev: bf51a4a1312562cc9b5944b7dfccba0b3d11dc3c) Signed-off-by: Alejandro del Castillo Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...0001-Switch-all-scripts-to-use-Python-3.x.patch | 113 --------------------- ...g-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 -------- .../opkg-utils/opkg-utils/pipefail.patch | 31 ------ .../{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 12 +-- 4 files changed, 4 insertions(+), 196 deletions(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch deleted file mode 100644 index 691ed50..0000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch +++ /dev/null @@ -1,113 +0,0 @@ -From d42b23f4fb5d6bd58e92e995fe5befc76efbae0c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 27 Apr 2017 15:47:58 +0300 -Subject: [PATCH] Switch all scripts to use Python 3.x - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - makePackage | 2 +- - opkg-compare-indexes | 2 +- - opkg-graph-deps | 2 +- - opkg-list-fields | 2 +- - opkg-make-index | 2 +- - opkg-show-deps | 2 +- - opkg-unbuild | 2 +- - opkg-update-index | 2 +- - opkg.py | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/makePackage b/makePackage -index 4bdfc56..02124dd 100755 ---- a/makePackage -+++ b/makePackage -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - - # The general algorithm this program follows goes like this: - # Run tar to extract control from control.tar.gz from the package. -diff --git a/opkg-compare-indexes b/opkg-compare-indexes -index b60d20a..80c1263 100755 ---- a/opkg-compare-indexes -+++ b/opkg-compare-indexes -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-graph-deps b/opkg-graph-deps -index 6653fd5..f1e376a 100755 ---- a/opkg-graph-deps -+++ b/opkg-graph-deps -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-list-fields b/opkg-list-fields -index c14a90f..24f7955 100755 ---- a/opkg-list-fields -+++ b/opkg-list-fields -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-make-index b/opkg-make-index -index 3f757f6..2988f9f 100755 ---- a/opkg-make-index -+++ b/opkg-make-index -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Utility to create opkg compatible indexes - """ - -diff --git a/opkg-show-deps b/opkg-show-deps -index 153f21e..4e18b4f 100755 ---- a/opkg-show-deps -+++ b/opkg-show-deps -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-unbuild b/opkg-unbuild -index 4f36bec..57642c9 100755 ---- a/opkg-unbuild -+++ b/opkg-unbuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-update-index b/opkg-update-index -index 341c1c2..7bff8a1 100755 ---- a/opkg-update-index -+++ b/opkg-update-index -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - - import sys, os -diff --git a/opkg.py b/opkg.py -index 2ecac8a..7e64de4 100644 ---- a/opkg.py -+++ b/opkg.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Copyright (C) 2001 Alexander S. Guy - # Andern Research Labs - # --- -2.11.0 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index a181169..0000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 59da5577bf8df441c6ca958e50fcb83228702764 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo -Date: Thu, 12 Sep 2019 10:24:58 -0500 -Subject: [PATCH] opkg-build: clamp mtimes to SOURCE_DATE_EPOCH - -For reproducible builds, clamp mtimes bigger than SOURCE_DATE_EPOCH to -SOURCE_DATE_EPOCH (build generated files, usually). - -Fixes bugzilla 13450 - -Signed-off-by: Alejandro del Castillo -Signed-off-by: Ross Burton ---- - opkg-build | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/opkg-build b/opkg-build -index dcd2d68..2517a2b 100755 ---- a/opkg-build -+++ b/opkg-build -@@ -297,9 +297,16 @@ mkdir $tmp_dir - - build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" - -+mtime_args="" -+# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. -+# this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. -+if [ ! -z "$SOURCE_DATE_EPOCH" ]; then -+ mtime_args="--mtime=@$build_date --clamp-mtime" -+fi -+ - ( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) - ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -print > $tmp_dir/file_list ) --( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) - rm $tmp_dir/file_list - rm $tmp_dir/control_list --- -2.20.1 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch deleted file mode 100644 index 55ddcc1..0000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch +++ /dev/null @@ -1,31 +0,0 @@ -We need opkg-build to fail if for example the tar command is passed invalid -options. Without this, we see silently created empty packaged where data.tar -is zero bytes in size. This creates hard to debug problems. - -An example is when reproducible builds are enabled and run on old hosts like -centos7 which has tar < 1.28: - -Subprocess output:tar: unrecognized option '--clamp-mtime' -Try `tar --help' or `tar --usage' for more information. - -Upstream-Status: Pending -Signed-off-by: Richard Purdie - -Index: opkg-utils-0.4.1/opkg-build -=================================================================== ---- opkg-utils-0.4.1.orig/opkg-build -+++ opkg-utils-0.4.1/opkg-build -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - : <<=cut - =head1 NAME -@@ -12,6 +12,7 @@ opkg-build - construct an .opk from a di - # Updated to work on Familiar Pre0.7rc1, with busybox tar. - # Note it Requires: binutils-ar (since the busybox ar can't create) - set -e -+set -o pipefail - - version=1.0 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb similarity index 83% rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index eb6c7a3..6495726 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -4,19 +4,15 @@ SECTION = "base" HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://opkg.py;beginline=2;endline=18;md5=63ce9e6bcc445181cd9e4baf4b4ccc35" + file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" -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://0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch \ - file://pipefail.patch \ +SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" - -SRC_URI[md5sum] = "8c140f835b694a0c27cfb23d2426a02b" -SRC_URI[sha256sum] = "9ea9efdd9fe13661ad251e3a2860c1c93045adcfaa6659c3e86d9748ecda3b6e" +SRC_URI[md5sum] = "cc210650644fcb9bba06ad5ec95a63ec" +SRC_URI[sha256sum] = "5929ad87d541789e0b82d626db01a1201ac48df6f49f2262fcfb86cf815e5d6c" TARGET_CC_ARCH += "${LDFLAGS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:30 +0000 Subject: [oe-commits] [openembedded-core] 04/23: classes/reproducible_build: Read SDE file later In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.7A4BD232A39@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 10515e5f7e38edbc4430e2599062a9ce6fdb42a8 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] (From OE-Core rev: b3313a10a3eb93f0a3710a35de0404fb49cd6202) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..750eb95 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:28 +0000 Subject: [oe-commits] [openembedded-core] 02/23: opkg-utils: Fix reproducibility issues in opkg-build In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.6B7C3232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit b577a6d923042cfc04e67d470e0987488ea61412 Author: Richard Purdie AuthorDate: Mon Feb 3 20:39:14 2020 +0000 opkg-utils: Fix reproducibility issues in opkg-build There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. (From OE-Core rev: a9b8287984c63420e10329a69f7ac5125f1687f8) Signed-off-by: Richard Purdie --- .../opkg-utils/fix-reproducibility.patch | 32 ++++++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000..945979b --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726..042eec7 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:31 +0000 Subject: [oe-commits] [openembedded-core] 05/23: sudo: Set vardir deterministically In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.81F02232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 51274c9b195ad00dd6362f352ad9bbf7e9a3e098 Author: Richard Purdie AuthorDate: Mon Feb 3 14:13:31 2020 +0000 sudo: Set vardir deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13775] (From OE-Core rev: 39fe849b56d70689846262c31ab7c182c8443923) Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo_1.8.27.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb index 0a11a1b..ee3be95 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.27.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb @@ -19,6 +19,7 @@ EXTRA_OECONF += " \ ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-vardir=/var/lib/sudo \ " do_install_append () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:32 +0000 Subject: [oe-commits] [openembedded-core] 06/23: libxshmfence: Set shm directory deterministically In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.88F57232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 10357b0bf3f6b34b54c0329e7e392ecf2c7043cd Author: Richard Purdie AuthorDate: Mon Feb 3 14:14:31 2020 +0000 libxshmfence: Set shm directory deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13778] (From OE-Core rev: 6217c3a7201b34888aa2fbae8b6e490bea545574) Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 85a48e4..cc45696 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:34 +0000 Subject: [oe-commits] [openembedded-core] 08/23: mc: Set zipinfo presence determinstically In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.983D8232A3D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 8f77075425e2ef9c3b5adbf8e5b29e7cfd7b9b7a Author: Richard Purdie AuthorDate: Tue Feb 4 13:59:26 2020 +0000 mc: Set zipinfo presence determinstically This value was floating causing differences in generated files. Set it determinstically. (From OE-Core rev: 11d7a9e37c1d3fc21396a98fefc9d34c0b9e784b) Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 71f61b4..5667038 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -27,6 +27,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:35 +0000 Subject: [oe-commits] [openembedded-core] 09/23: mc: Fix manpage date indeterminism In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.9F6E8232A3E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 3653fd41fbc28f70259a00bb0098ec8731526449 Author: Richard Purdie AuthorDate: Tue Feb 4 18:12:15 2020 +0000 mc: Fix manpage date indeterminism The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. (From OE-Core rev: 5553c20f9fa4f35bf711b6b9d5717dcf4bfefafa) Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 0000000..48bd73b --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 5667038..de76591 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -9,6 +9,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:36 +0000 Subject: [oe-commits] [openembedded-core] 10/23: tar: Fix build determinism, disable rsh In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.A71F8232A3F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 6bdc5f787af46e9c849947cad06ad40aa401b767 Author: Richard Purdie AuthorDate: Wed Feb 5 15:37:19 2020 +0000 tar: Fix build determinism, disable rsh rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. (From OE-Core rev: d14a4b0db92a9a7d1ff72a2e0faca7f1a23a0b68) Signed-off-by: Richard Purdie --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5..ebe6cb0 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:33 +0000 Subject: [oe-commits] [openembedded-core] 07/23: mc: Fix build reproducibility In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.90CF2232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 164d72b7a6ab20940f9a124beaf485be9ddc07ba Author: Joshua Watt AuthorDate: Tue Nov 12 22:10:31 2019 -0600 mc: Fix build reproducibility Fixes some issues with reproducible builds. Adds a patch to allow the configure arguments to be omitted from the build and also explicitly setting some autoconf paths that were picking up hosttools. (From OE-Core rev: f54d60ee8f15229aa515e168b9c7d248663b48fe) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- ...0001-Add-option-to-control-configure-args.patch | 99 ++++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 5 +- 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch new file mode 100644 index 0000000..e76aac8 --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch @@ -0,0 +1,99 @@ +From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Sat, 9 Nov 2019 20:01:48 -0600 +Subject: [PATCH] Add option to control configure args + +Embedding the configure time options into the executable can lead to +non-reproducible builds, since configure options often have embedded +paths. Add a configure time option to control if the configure args are +embedded so this can be disabled. + +Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] +Signed-off-by: Joshua Watt +--- + configure.ac | 6 ++++++ + src/args.c | 6 ++++++ + src/textconf.c | 2 ++ + 3 files changed, 14 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 19d1a76be..a1948f6b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule + AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ + test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) + ++AC_ARG_ENABLE([configure-args], ++ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) ++if test "x$enable_configure_args" != xno; then ++ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) ++fi ++ + AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) + + AC_CONFIG_FILES( +diff --git a/src/args.c b/src/args.c +index baef1a1c8..f8dc24020 100644 +--- a/src/args.c ++++ b/src/args.c +@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; + #endif /* ENABLE_SUBSHELL */ + static gboolean mc_args__show_datadirs = FALSE; + static gboolean mc_args__show_datadirs_extended = FALSE; ++#ifdef ENABLE_CONFIGURE_ARGS + static gboolean mc_args__show_configure_opts = FALSE; ++#endif + + static GOptionGroup *main_group; + +@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { + NULL + }, + ++#ifdef ENABLE_CONFIGURE_ARGS + /* show configure options */ + { + "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, +@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { + N_("Print configure options"), + NULL + }, ++#endif + + { + "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, +@@ -758,11 +762,13 @@ mc_args_show_info (void) + return FALSE; + } + ++#ifdef ENABLE_CONFIGURE_ARGS + if (mc_args__show_configure_opts) + { + show_configure_options (); + return FALSE; + } ++#endif + + return TRUE; + } +diff --git a/src/textconf.c b/src/textconf.c +index 1e0613e58..f39b9e028 100644 +--- a/src/textconf.c ++++ b/src/textconf.c +@@ -232,10 +232,12 @@ show_datadirs_extended (void) + + /* --------------------------------------------------------------------------------------------- */ + ++#ifdef ENABLE_CONFIGURE_ARGS + void + show_configure_options (void) + { + (void) printf ("%s\n", MC_CONFIGURE_ARGS); + } ++#endif + + /* --------------------------------------------------------------------------------------------- */ +-- +2.23.0 + diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 83de8db..71f61b4 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -8,6 +8,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ + file://0001-Add-option-to-control-configure-args.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" @@ -21,9 +22,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," -EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" +CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:38 +0000 Subject: [oe-commits] [openembedded-core] 12/23: libidn2: Fix reproducibility issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.B8307232A41@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit ca213de432d8d9d715ef09e17cea2aa1e6666e91 Author: Richard Purdie AuthorDate: Wed Feb 5 15:55:16 2020 +0000 libidn2: Fix reproducibility issue The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] (From OE-Core rev: 0392fcbdc85180581ce7392212808ebb822cc2e8) Signed-off-by: Richard Purdie --- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.2.0.bb b/meta/recipes-extended/libidn/libidn2_2.2.0.bb index bcbfdd8..7131414 100644 --- a/meta/recipes-extended/libidn/libidn2_2.2.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.2.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:39 +0000 Subject: [oe-commits] [openembedded-core] 13/23: gtk+3: sort resources for reproducible binaries In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.BFD44232A42@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit a2a6d9fa4df66a1f52c1c1fec45eedb4199e8162 Author: Ross Burton AuthorDate: Wed Feb 5 17:32:01 2020 +0000 gtk+3: sort resources for reproducible binaries The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. (From OE-Core rev: f3675be6be29426688187a135221431a0941d007) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + 2 files changed, 20 insertions(+) diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 0000000..7f87372 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb index d79b18b..596dee6 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5" SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:40 +0000 Subject: [oe-commits] [openembedded-core] 14/23: perl: do not install files that contain build host specific data In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.C7967232A43@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 208efc88fa3c57244b272bf7e7f7f8163f14630c Author: Alexander Kanavin AuthorDate: Thu Feb 6 23:14:38 2020 +0100 perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] (From OE-Core rev: 2e0f30c4680221c693495e3a0327378d502a518b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.0.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057..98e3361 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index ba2a843..c567d4e 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -135,6 +135,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:42 +0000 Subject: [oe-commits] [openembedded-core] 16/23: openssl: Fix reproducibility issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.D71A2232A45@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit c31c676319812e6fc036741db2ab8e16eccff723 Author: Richard Purdie AuthorDate: Thu Feb 6 22:47:07 2020 +0000 openssl: Fix reproducibility issue There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] (From OE-Core rev: 37db519eedb7eb5cd4f14d05f30f5d580aa7458d) Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000..a24260c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 458ae7d..169824a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:37 +0000 Subject: [oe-commits] [openembedded-core] 11/23: patch: Extend to native/nativesdk and depend upon In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.B0084232A40@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit fd3bd61a6fe5190c575dc968f3a0be9c1cbf21ed Author: Richard Purdie AuthorDate: Tue Feb 4 22:20:35 2020 +0000 patch: Extend to native/nativesdk and depend upon There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] (From OE-Core rev: 5ed0840c93804488cd1c1aba6cb382b2434714a5) Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1..25ec089 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 91df6f1..6620151 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f..b5897b3 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:43 +0000 Subject: [oe-commits] [openembedded-core] 17/23: iputils: Fix build determinism In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.E08F3232A46@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 3997c47dea49d583fd48cb03f83c007f61d2cb35 Author: Richard Purdie AuthorDate: Thu Feb 6 23:34:46 2020 +0000 iputils: Fix build determinism The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. (From OE-Core rev: 8b00ec484fb851c301f13145e17707c0167feab1) Signed-off-by: Richard Purdie --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index 3f9e991..42260f5 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -32,7 +32,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:47 +0000 Subject: [oe-commits] [openembedded-core] 21/23: sysvinit: Fix Reproducibility issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163728.10BCB232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit cbcba43c18d67aea0ba41f019b357fbec6570ee1 Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] (From OE-Core rev: 0227e929021263c51d2e7db36224000fecb01f1c) Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index bfc1283..39f612b 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -31,6 +31,7 @@ B = "${S}/src" inherit update-alternatives distro_features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:41 +0000 Subject: [oe-commits] [openembedded-core] 15/23: perl: Fix various reproducibile build issues In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.CEE95232A44@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit def3a9d748564883d71c506726554df622701b00 Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 (From OE-Core rev: 482fd0d99f989b5a72a25bdf402fb2f219420b5d) Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.0.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index c567d4e..838e52c 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://fix-setgroup.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:49 +0000 Subject: [oe-commits] [openembedded-core] 23/23: ncurses: Fix reproducibility issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163728.230C8232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 3d114c08c32578426646f5d97769d2c66fea06cb Author: Richard Purdie AuthorDate: Fri Feb 7 15:09:48 2020 +0000 ncurses: Fix reproducibility issue The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] (From OE-Core rev: 09c8a28893e7ca94a44232d802e1cb02a8f34b87) Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35..b7bf4c0 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:44 +0000 Subject: [oe-commits] [openembedded-core] 18/23: libinput: Fix determinism issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.E92B6232A47@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 22dc9a3314eef5925241a9a961bd79815d3172b6 Author: Richard Purdie AuthorDate: Thu Feb 6 23:57:28 2020 +0000 libinput: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: c3f6a6113f562ecdb13386c3ff52adb7973980a4) Signed-off-by: Richard Purdie --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.1.bb | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.1.bb b/meta/recipes-graphics/wayland/libinput_1.14.1.bb index 38bc8d2..2c5733f 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.1.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.1.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" DEPENDS = "libevdev udev mtdev" -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://determinism.patch \ +" SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340" SRC_URI[sha256sum] = "e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:48 +0000 Subject: [oe-commits] [openembedded-core] 22/23: libevdev: Fix determinism issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163728.1A86C232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit fc6e8e527698a82bf8047d02e0e792c4a1a64449 Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. (From OE-Core rev: 75e4cedb986379db2e8a897df52ee1363f9a9a80) Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:46 +0000 Subject: [oe-commits] [openembedded-core] 20/23: sudo: specify where target tools are In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163728.087AF232A35@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 6e809474ab686fba6924d8b46fd0b9eab5c66c06 Author: Ross Burton AuthorDate: Fri Feb 7 14:29:28 2020 +0000 sudo: specify where target tools are sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. (From OE-Core rev: 61650dd8498a093f3bfa93202c9cd2e9a7fb7834) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.27.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 15075bc..4edfabe 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb index ee3be95..6d470d0 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.27.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb @@ -15,8 +15,15 @@ SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd3 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 16:37:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 16:37:45 +0000 Subject: [oe-commits] [openembedded-core] 19/23: libgcrypt: Fix determinism issue In-Reply-To: <158117984675.17168.16417306654377916811@git.openembedded.org> References: <158117984675.17168.16417306654377916811@git.openembedded.org> Message-ID: <20200208163727.F17A1232A48@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus-next in repository openembedded-core. commit 2b68ffc6d7c45541958f1b0c0b9ca9e39064e096 Author: Richard Purdie AuthorDate: Thu Feb 6 23:58:46 2020 +0000 libgcrypt: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: 506b36b6d86b3454fcc3cb85f6229cbe8d14f5b5) Signed-off-by: Richard Purdie --- .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000..ad0b8c7 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb index 1bd3551..92eb2d2 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb @@ -26,6 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ file://0001-ecc-Add-mitigation-against-timing-attack.patch \ file://0001-dsa-ecdsa-Fix-use-of-nonce-use-larger-one.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 17:50:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 17:50:13 +0000 Subject: [oe-commits] [bitbake] 02/02: doc: minor tweaks to ch 1 of BB user manual In-Reply-To: <158118421134.14682.8970953713945935569@git.openembedded.org> References: <158118421134.14682.8970953713945935569@git.openembedded.org> Message-ID: <20200208175011.8D271232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit bc84ce7e6542dac1a150b9733411190cff591948 Author: Robert P. J. Day AuthorDate: Fri Feb 7 05:51:11 2020 -0500 doc: minor tweaks to ch 1 of BB user manual Tweaks include: - hyphenation - rewording for brevity or clarification - adding markup where appropriate Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-intro.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/doc/bitbake-user-manual/bitbake-user-manual-intro.xml index c87eac5..f5526c0 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-intro.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-intro.xml @@ -127,7 +127,7 @@ (e.g. Cygwin, the BSDs, and so forth). - Be self contained, rather than tightly + Be self-contained, rather than tightly integrated into the build machine's root filesystem. @@ -221,6 +221,8 @@ them How to configure and compile the source code + How to assemble the generated artifacts into + one or more installable packages Where on the target machine to install the package or packages created @@ -229,7 +231,7 @@ Within the context of BitBake, or any project utilizing BitBake as its build system, files with the .bb - extension are referred to as recipes. + extension are referred to as recipes. The term "package" is also commonly used to describe recipes. However, since the same word is used to describe packaged @@ -252,9 +254,9 @@ various configuration variables that govern the project's build process. These files fall into several areas that define - machine configuration options, distribution configuration - options, compiler tuning options, general common - configuration options, and user configuration options. + machine configuration, distribution configuration, + possible compiler tuning, general common + configuration, and user configuration. The main configuration file is the sample bitbake.conf file, which is located within the BitBake source tree @@ -292,7 +294,7 @@ Layers allow you to isolate different types of customizations from each other. While you might find it tempting to keep everything in one layer - when working on a single project, the more modular you organize + when working on a single project, the more modular your metadata, the easier it is to cope with future changes. @@ -300,8 +302,8 @@ To illustrate how you can use layers to keep things modular, consider customizations you might make to support a specific target machine. These types of customizations typically reside in a special layer, - rather than a general layer, called a Board Support Package (BSP) - Layer. + rather than a general layer, called a Board Support Package (BSP) + layer. Furthermore, the machine customizations should be isolated from recipes and metadata that support a new GUI environment, for example. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 17:50:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 17:50:11 +0000 Subject: [oe-commits] [bitbake] branch master updated (27ad9c1 -> bc84ce7) Message-ID: <158118421134.14682.8970953713945935569@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository bitbake. from 27ad9c1 siggen: Avoid cache mismatch issues with locked sigs new 79ada80 doc: Standardize spelling on 'BitBake' throughout docs new bc84ce7 doc: minor tweaks to ch 1 of BB user manual The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../bitbake-user-manual-execution.xml | 8 ++++---- .../bitbake-user-manual-fetching.xml | 2 +- .../bitbake-user-manual-hello.xml | 14 +++++++------- .../bitbake-user-manual-intro.xml | 20 +++++++++++--------- .../bitbake-user-manual-metadata.xml | 8 ++++---- .../bitbake-user-manual-ref-variables.xml | 2 +- 6 files changed, 28 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 17:50:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 17:50:12 +0000 Subject: [oe-commits] [bitbake] 01/02: doc: Standardize spelling on 'BitBake' throughout docs In-Reply-To: <158118421134.14682.8970953713945935569@git.openembedded.org> References: <158118421134.14682.8970953713945935569@git.openembedded.org> Message-ID: <20200208175011.83B53232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 79ada807de0b202c3d568fc4365a1d3f17ba1bce Author: Robert P. J. Day AuthorDate: Fri Feb 7 04:37:59 2020 -0500 doc: Standardize spelling on 'BitBake' throughout docs Since the proper spelling is, in fact, 'BitBake', might as well make it consistent throughout the user manual. Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-execution.xml | 8 ++++---- doc/bitbake-user-manual/bitbake-user-manual-fetching.xml | 2 +- doc/bitbake-user-manual/bitbake-user-manual-hello.xml | 14 +++++++------- doc/bitbake-user-manual/bitbake-user-manual-intro.xml | 2 +- doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 8 ++++---- .../bitbake-user-manual-ref-variables.xml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index 46dafee..8f60667 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -113,7 +113,7 @@ - Prior to parsing configuration files, Bitbake looks + Prior to parsing configuration files, BitBake looks at certain variables, including: @@ -339,7 +339,7 @@ BB_HASHCONFIG_WHITELIST) and then checking if the checksum matches. If that checksum matches what is in the cache and the recipe - and class files have not changed, Bitbake is able to use + and class files have not changed, BitBake is able to use the cache. BitBake then reloads the cached information about the recipe instead of reparsing it from scratch. @@ -429,7 +429,7 @@ The default PREFERRED_PROVIDER is the provider with the same name as the target. - Bitbake iterates through each target it needs to build and + BitBake iterates through each target it needs to build and resolves them and their dependencies using this process. @@ -821,7 +821,7 @@ It is worth noting that BitBake's "-S" option lets you - debug Bitbake's processing of signatures. + debug BitBake's processing of signatures. The options passed to -S allow different debugging modes to be used, either using BitBake's own debug functions or possibly those defined in the metadata/signature handler diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml index 6840408..d1bfc23 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml @@ -139,7 +139,7 @@ - Since network accesses are slow, Bitbake maintains a + Since network accesses are slow, BitBake maintains a cache of files downloaded from the network. Any source files that are not local (i.e. downloaded from the Internet) are placed into the download diff --git a/doc/bitbake-user-manual/bitbake-user-manual-hello.xml b/doc/bitbake-user-manual/bitbake-user-manual-hello.xml index 39066e4..11eb36a 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-hello.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-hello.xml @@ -166,7 +166,7 @@ Having a project directory is a good way to isolate your project. - Run Bitbake: + Run BitBake: At this point, you have nothing but a project directory. Run the bitbake command and see what it does: @@ -197,7 +197,7 @@ BBPATH variable is what tells BitBake where to look for those files. BBPATH is not set and you need to set it. - Without BBPATH, Bitbake cannot + Without BBPATH, BitBake cannot find any configuration files (.conf) or recipe files (.bb) at all. BitBake also cannot find the bitbake.conf @@ -225,7 +225,7 @@ as the shell would. - Run Bitbake: + Run BitBake: Now that you have BBPATH defined, run the bitbake command again: @@ -313,7 +313,7 @@ example, click on the links to take you to the definitions in the glossary. - Run Bitbake: + Run BitBake: After making sure that the conf/bitbake.conf file exists, you can run the bitbake command again: @@ -364,7 +364,7 @@ more depending on which build environments BitBake is supporting. - Run Bitbake: + Run BitBake: After making sure that the classes/base.bbclass file exists, you can run the bitbake command again: @@ -434,7 +434,7 @@ For more information on these variables, follow the links to the glossary. - Run Bitbake With a Target: + Run BitBake With a Target: Now that a BitBake target exists, run the command and provide that target: @@ -468,7 +468,7 @@ You need to provide your own information for you in the file. - Run Bitbake With a Target: + Run BitBake With a Target: Now that you have supplied the bblayers.conf file, run the bitbake command and provide the target: diff --git a/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/doc/bitbake-user-manual/bitbake-user-manual-intro.xml index 8f2a960..c87eac5 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-intro.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-intro.xml @@ -448,7 +448,7 @@ Using the BitBake that Comes With Your Build Checkout: A final possibility for getting a copy of BitBake is that it - already comes with your checkout of a larger Bitbake-based build + already comes with your checkout of a larger BitBake-based build system, such as Poky. Rather than manually checking out individual layers and gluing them together yourself, you can check diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml index 421364c..383f94b 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml @@ -5,7 +5,7 @@ Syntax and Operators - Bitbake files have their own syntax. + BitBake files have their own syntax. The syntax has similarities to several other languages but also has some unique features. This section describes the available syntax and operators @@ -1414,7 +1414,7 @@
- Bitbake-Style Python Functions Versus Python Functions + BitBake-Style Python Functions Versus Python Functions Following are some important differences between @@ -1895,7 +1895,7 @@ Sometimes, it is useful to be able to obtain information from the original execution environment. - Bitbake saves a copy of the original environment into + BitBake saves a copy of the original environment into a special variable named BB_ORIGENV. @@ -2616,7 +2616,7 @@ It is often necessary to access variables in the BitBake datastore using Python functions. - The Bitbake datastore has an API that allows you this + The BitBake datastore has an API that allows you this access. Here is a list of available operations: diff --git a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml index aca6741..bae01d9 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml @@ -1780,7 +1780,7 @@ - Bitbake normally issues a warning when building two + BitBake normally issues a warning when building two different recipes where each provides the same output. This scenario is usually something the user does not want. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 17:50:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 17:50:17 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (68fffdc -> 341708c) Message-ID: <158118421771.14922.12777137744252061114@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard 68fffdc runqueue: Possible tid handling optimisation add 79ada80 doc: Standardize spelling on 'BitBake' throughout docs add bc84ce7 doc: minor tweaks to ch 1 of BB user manual new 341708c runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (68fffdc) \ N -- N -- N refs/heads/master-next (341708c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../bitbake-user-manual-execution.xml | 8 ++++---- .../bitbake-user-manual-fetching.xml | 2 +- .../bitbake-user-manual-hello.xml | 14 +++++++------- .../bitbake-user-manual-intro.xml | 20 +++++++++++--------- .../bitbake-user-manual-metadata.xml | 8 ++++---- .../bitbake-user-manual-ref-variables.xml | 2 +- 6 files changed, 28 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 17:50:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 17:50:18 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158118421771.14922.12777137744252061114@git.openembedded.org> References: <158118421771.14922.12777137744252061114@git.openembedded.org> Message-ID: <20200208175017.DA9FD232A36@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 341708c70153ed68025a3daf764ce5ebe840b04c Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? References: <158119941178.3083.2535850180216389088@git.openembedded.org> Message-ID: <20200208220332.1CE4B232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 093c7f6ca5a7f5623199bf6e23f9db1edd1cf468 Author: An?bal Lim?n AuthorDate: Tue Jan 14 10:20:23 2020 -0600 meta/recipes-graphics/waffle: Add python3 dependency The python3native.bbclass set PYTHON_{LIBRARY, INCLUDE_DIR} pointing to python target build, a patch was add to use target _sysconfigdata too [1] but is not available without python3 dependency. Fixes waffle build when trying to find _sysconfigdata module, ... | Program python3 found: YES (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) | | meson.build:36:0: ERROR: ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools | | A full log can be found at /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt | WARNING: exit code 1 from a shell command. ... [1] http://git.openembedded.org/openembedded-core/commit/?id=02714c105426b0d687620913c1a7401b386428b6 Signed-off-by: An?bal Lim?n Signed-off-by: Richard Purdie --- meta/recipes-graphics/waffle/waffle_1.6.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/waffle/waffle_1.6.0.bb b/meta/recipes-graphics/waffle/waffle_1.6.0.bb index 52cb1df..a620295 100644 --- a/meta/recipes-graphics/waffle/waffle_1.6.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.6.0.bb @@ -11,6 +11,8 @@ UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" inherit meson features_check lib_package bash-completion +DEPENDS_append = " python3" + # This should be overridden per-machine to reflect the capabilities of the GL # stack. PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 22:03:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 22:03:32 +0000 Subject: [oe-commits] [openembedded-core] 01/05: populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK In-Reply-To: <158119941178.3083.2535850180216389088@git.openembedded.org> References: <158119941178.3083.2535850180216389088@git.openembedded.org> Message-ID: <20200208220332.0905F232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 94b7424b176f07b914afe9adf1c1e70cba822008 Author: Mark Hatle AuthorDate: Fri Feb 7 11:43:37 2020 -0600 populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK Since the features are processed by a python fragment, we need to explicitly list the variables that should affect the resulting hash, and thus sstate re-use. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index d03465b..3248bb0 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -21,6 +21,7 @@ def complementary_globs(featurevar, d): SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' +SDKIMAGE_INSTALL_COMPLEMENTARY[vardeps] += "SDKIMAGE_FEATURES" PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target" SDK_PACKAGE_ARCHS += "sdk-provides-dummy-${SDKPKGSUFFIX}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 22:03:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 22:03:33 +0000 Subject: [oe-commits] [openembedded-core] 02/05: libubootenv: Split binaries to a libubootenv-bin package In-Reply-To: <158119941178.3083.2535850180216389088@git.openembedded.org> References: <158119941178.3083.2535850180216389088@git.openembedded.org> Message-ID: <20200208220332.12A98232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0e670a1529556aa0f7a6a9ee5b09d1e6f6ad178e Author: Otavio Salvador AuthorDate: Fri Jan 31 10:33:23 2020 -0300 libubootenv: Split binaries to a libubootenv-bin package The fw_setenv and fw_printenv binaries should be on a specific package as some systems may require just the library. The upgrade path was kept using the RPROVIDES for the -bin package. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index 1020258..f5b6059 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -16,11 +16,11 @@ SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" S = "${WORKDIR}/git" -inherit cmake +inherit cmake lib_package EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" PROVIDES += "u-boot-fw-utils" -RPROVIDES_${PN} += "u-boot-fw-utils" +RPROVIDES_${PN}-bin += "u-boot-fw-utils" BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 22:03:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 22:03:31 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b13ec0f -> 2233652) Message-ID: <158119941178.3083.2535850180216389088@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard b13ec0f oeqa: Use --disable-maintainer-mode configure option new 94b7424 populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK new 0e670a1 libubootenv: Split binaries to a libubootenv-bin package new 093c7f6 meta/recipes-graphics/waffle: Add python3 dependency new 651595a scripts/lib/resulttool/report: Enable report selected test case result new 2233652 glibc: Make it possible to use PTHREAD_MUTEX_INITIALIZER with -std=c11 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b13ec0f) \ N -- N -- N refs/heads/master-next (2233652) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/populate_sdk_base.bbclass | 1 + meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 4 +- ...using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch | 48 ++++++++++++++++++++++ meta/recipes-core/glibc/glibc_2.31.bb | 1 + meta/recipes-graphics/waffle/waffle_1.6.0.bb | 2 + scripts/lib/resulttool/report.py | 33 ++++++++++++--- 9 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-core/glibc/glibc/0030-nptl-Avoid-using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 22:03:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 22:03:35 +0000 Subject: [oe-commits] [openembedded-core] 04/05: scripts/lib/resulttool/report: Enable report selected test case result In-Reply-To: <158119941178.3083.2535850180216389088@git.openembedded.org> References: <158119941178.3083.2535850180216389088@git.openembedded.org> Message-ID: <20200208220332.2685B232A3D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 651595a47718d19453b28d55a15f493682108772 Author: Yeoh Ee Peng AuthorDate: Fri Jan 31 13:47:42 2020 +0800 scripts/lib/resulttool/report: Enable report selected test case result Enable reporting selected test case result given the user provided the selected test case id. If both test result id and test case id were provided, report the selected test case result from the selected test result id. Signed-off-by: Yeoh Ee Peng Signed-off-by: Richard Purdie --- scripts/lib/resulttool/report.py | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/scripts/lib/resulttool/report.py b/scripts/lib/resulttool/report.py index 692dd7a..7ceceac 100644 --- a/scripts/lib/resulttool/report.py +++ b/scripts/lib/resulttool/report.py @@ -212,7 +212,21 @@ class ResultsTextReport(object): maxlen=maxlen) print(output) - def view_test_report(self, logger, source_dir, branch, commit, tag, use_regression_map, raw_test): + def view_test_report(self, logger, source_dir, branch, commit, tag, use_regression_map, raw_test, selected_test_case_only): + def print_selected_testcase_result(testresults, selected_test_case_only): + for testsuite in testresults: + for resultid in testresults[testsuite]: + result = testresults[testsuite][resultid]['result'] + test_case_result = result.get(selected_test_case_only, {}) + if test_case_result.get('status'): + print('Found selected test case result for %s from %s' % (selected_test_case_only, + resultid)) + print(test_case_result['status']) + else: + print('Could not find selected test case result for %s from %s' % (selected_test_case_only, + resultid)) + if test_case_result.get('log'): + print(test_case_result['log']) test_count_reports = [] configmap = resultutils.store_map if use_regression_map: @@ -235,12 +249,18 @@ class ResultsTextReport(object): for testsuite in testresults: result = testresults[testsuite].get(raw_test, {}) if result: - raw_results[testsuite] = result + raw_results[testsuite] = {raw_test: result} if raw_results: - print(json.dumps(raw_results, sort_keys=True, indent=4)) + if selected_test_case_only: + print_selected_testcase_result(raw_results, selected_test_case_only) + else: + print(json.dumps(raw_results, sort_keys=True, indent=4)) else: print('Could not find raw test result for %s' % raw_test) return 0 + if selected_test_case_only: + print_selected_testcase_result(testresults, selected_test_case_only) + return 0 for testsuite in testresults: for resultid in testresults[testsuite]: skip = False @@ -268,7 +288,7 @@ class ResultsTextReport(object): def report(args, logger): report = ResultsTextReport() report.view_test_report(logger, args.source_dir, args.branch, args.commit, args.tag, args.use_regression_map, - args.raw_test_only) + args.raw_test_only, args.selected_test_case_only) return 0 def register_commands(subparsers): @@ -287,4 +307,7 @@ def register_commands(subparsers): help='instead of the default "store_map", use the "regression_map" for report') parser_build.add_argument('-r', '--raw_test_only', default='', help='output raw test result only for the user provided test result id') - + parser_build.add_argument('-s', '--selected_test_case_only', default='', + help='output selected test case result for the user provided test case id, if both test ' + 'result id and test case id are provided then output the selected test case result ' + 'from the provided test result id') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 22:03:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 22:03:36 +0000 Subject: [oe-commits] [openembedded-core] 05/05: glibc: Make it possible to use PTHREAD_MUTEX_INITIALIZER with -std=c11 In-Reply-To: <158119941178.3083.2535850180216389088@git.openembedded.org> References: <158119941178.3083.2535850180216389088@git.openembedded.org> Message-ID: <20200208220332.33C54232A3E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2233652273463151cc9d1c60dfc9668095afe87b Author: Peter Kjellerstedt AuthorDate: Wed Jan 29 09:32:12 2020 +0100 glibc: Make it possible to use PTHREAD_MUTEX_INITIALIZER with -std=c11 This avoids the following error when building with -std=c11: In file included from /usr/include/bits/thread-shared-types.h:74, from /usr/include/bits/pthreadtypes.h:23, from /usr/include/pthread.h:26, from bug25271.c:1: bug25271.c:3:21: error: ?PTHREAD_MUTEX_DEFAULT? undeclared here (not in a function) 3 | pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; | ^~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- ...using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch | 48 ++++++++++++++++++++++ meta/recipes-core/glibc/glibc_2.31.bb | 1 + 2 files changed, 49 insertions(+) diff --git a/meta/recipes-core/glibc/glibc/0030-nptl-Avoid-using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch b/meta/recipes-core/glibc/glibc/0030-nptl-Avoid-using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch new file mode 100644 index 0000000..215c717 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0030-nptl-Avoid-using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch @@ -0,0 +1,48 @@ +From 1ad498474920d9cb879f934dd5781b872bb65fec Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 27 Jan 2020 14:53:00 +0100 +Subject: [PATCH] nptl: Avoid using PTHREAD_MUTEX_DEFAULT in macro definition + [BZ #25271] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 1c3f9acf1f1f75faa7a28bf39af64afd ("nptl: Add struct_mutex.h") +replaced a zero constant with the identifier PTHREAD_MUTEX_DEFAULT +in the macro PTHREAD_MUTEX_INITIALIZER. However, that constant +is not available in ISO C11 mode: + +In file included from /usr/include/bits/thread-shared-types.h:74, + from /usr/include/bits/pthreadtypes.h:23, + from /usr/include/pthread.h:26, + from bug25271.c:1: +bug25271.c:3:21: error: ?PTHREAD_MUTEX_DEFAULT? undeclared here (not in a function) + 3 | pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; + | ^~~~~~~~~~~~~~~~~~~~~~~~~ + +This commit change the constant to the equivalent +PTHREAD_MUTEX_TIMED_NP, which is in the POSIX extension namespace +and thus always available. + +Tested on x86_64-linux-gnu and i686-linux-gnu. Verified that a +minimal example now builds in -std=c11 mode. + +Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1229855] +Signed-off-by: Peter Kjellerstedt +--- + sysdeps/nptl/pthread.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index 7825737840..44dd707896 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -84,7 +84,7 @@ enum + + + #define PTHREAD_MUTEX_INITIALIZER \ +- { { __PTHREAD_MUTEX_INITIALIZER (PTHREAD_MUTEX_DEFAULT) } } ++ { { __PTHREAD_MUTEX_INITIALIZER (PTHREAD_MUTEX_TIMED_NP) } } + #ifdef __USE_GNU + # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ + { { __PTHREAD_MUTEX_INITIALIZER (PTHREAD_MUTEX_RECURSIVE_NP) } } diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb index 2032311..b03d9c9 100644 --- a/meta/recipes-core/glibc/glibc_2.31.bb +++ b/meta/recipes-core/glibc/glibc_2.31.bb @@ -40,6 +40,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0027-intl-Emit-no-lines-in-bison-generated-files.patch \ file://0028-inject-file-assembly-directives.patch \ file://0029-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ + file://0030-nptl-Avoid-using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 8 22:16:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Feb 2020 22:16:10 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2233652 -> 651595a) Message-ID: <158120017002.5635.17663853528337310316@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 2233652 glibc: Make it possible to use PTHREAD_MUTEX_INITIALIZER with -std=c11 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master-next (651595a) \ O -- O -- O (2233652) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ...using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch | 48 ---------------------- meta/recipes-core/glibc/glibc_2.31.bb | 1 - 2 files changed, 49 deletions(-) delete mode 100644 meta/recipes-core/glibc/glibc/0030-nptl-Avoid-using-PTHREAD_MUTEX_DEFAULT-in-macro-defi.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:36 +0000 Subject: [oe-commits] [meta-openembedded] 02/14: tigervnc: Do not depend on chkconfig In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.ADFC1232A3B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 208b2feab63ba01d5c8c1fbf3b3b892f244bcd00 Author: Khem Raj AuthorDate: Sat Feb 8 11:03:08 2020 -0800 tigervnc: Do not depend on chkconfig This recipe is gone from core Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb index 1693779..f97c2b2 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tigervnc.com/" LICENSE = "GPLv2+" SECTION = "x11/utils" DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk" -RDEPENDS_${PN} = "chkconfig coreutils hicolor-icon-theme perl" +RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:35 +0000 Subject: [oe-commits] [meta-openembedded] 01/14: libchamplain: Add support for building libchamplain In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.A3C73232A3A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 74acdba5a01c73f13ed47217e259e992d9bbef1c Author: Alistair Francis AuthorDate: Fri Feb 7 20:55:14 2020 -0800 libchamplain: Add support for building libchamplain libchamplain is a Gtk widget displaying zoomable and pannable maps that can be loaded from various network sources. Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- .../recipes-gnome/libchamplain/libchamplain_0.12.20.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb new file mode 100644 index 0000000..90e5533 --- /dev/null +++ b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -0,0 +1,12 @@ +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" + +inherit meson gobject-introspection + +SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" +SRC_URI = "git://github.com/gnome/libchamplain.git" + +S = "${WORKDIR}/git" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:34 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (a30ceda -> c2a4f4e) Message-ID: <158127417410.24167.18132087415313936547@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from a30ceda modemmanager: Add a PACKAGECONFIG for the new --with-at-command-via-dbus option new 74acdba libchamplain: Add support for building libchamplain new 208b2fe tigervnc: Do not depend on chkconfig new 835358a mpv: 0.26.0 -> 0.32.0 new 8d57a43 drone: Add CI support new 2cac4cd sysdig: Upgrade to 0.26.4 new 91814d6 babl: upgrade 0.1.62 -> 0.1.74 new fc8d099 gegl: upgrade 0.3.18 -> 0.4.20 new 8f52e70 libmypaint: initial add 1.4.0 new d3f9381 mypaint-brushes: initial add 1.3.0 new 91a9a5f gimp: upgrade 2.8.22 -> 2.10.14 new 2e4d8c3 packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome new 990b59b nginx: update to the latest stable version (1.16.1) new 2427dc0 nginx: update to the latest development version (1.17.8) new c2a4f4e python3-aiohttp: update to version 3.6.2 The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .drone.yml | 75 ++++++++++++++ README | 2 + meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 17 +++ ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 ++++++ meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb | 61 +++++++++++ meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 60 +++++++++++ meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb | 24 +++++ .../mypaint/mypaint-brushes-1.0_git.bb | 12 +++ .../libchamplain/libchamplain_0.12.20.bb | 12 +++ .../packagegroups/packagegroup-meta-oe.bb | 6 +- ...ith-musl-backtrace-APIs-are-glibc-specifi.patch | 37 ++++--- .../0001-libsinsp-Port-to-build-with-lua-5.2.patch | 25 ++--- meta-oe/recipes-extended/sysdig/sysdig_git.bb | 40 ++++--- meta-oe/recipes-graphics/babl/babl_0.1.62.bb | 13 --- meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 ---- meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 ------ ...igure-ac-do-not-check-for-freetype-config.patch | 38 ------- .../gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 ------ .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 ---------- meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 52 ---------- .../recipes-graphics/tigervnc/tigervnc_1.10.1.bb | 2 +- .../mplayer/mpv}/python3.patch | 0 meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 85 --------------- meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 115 +++++++++++++++++++++ .../python/python3-aiohttp_3.5.4.bb | 2 - ...python-aiohttp.inc => python3-aiohttp_3.6.2.bb} | 6 +- meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb | 6 ++ meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb | 6 -- .../nginx/{nginx_1.16.0.bb => nginx_1.17.8.bb} | 4 +- 29 files changed, 478 insertions(+), 396 deletions(-) create mode 100644 .drone.yml create mode 100644 meta-gnome/recipes-gimp/babl/babl_0.1.74.bb create mode 100644 meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch create mode 100644 meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb create mode 100644 meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb create mode 100644 meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb create mode 100644 meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb create mode 100644 meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb delete mode 100644 meta-oe/recipes-graphics/babl/babl_0.1.62.bb delete mode 100644 meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch delete mode 100644 meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb copy meta-oe/{recipes-benchmark/glmark2/glmark2 => recipes-multimedia/mplayer/mpv}/python3.patch (100%) delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb delete mode 100644 meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb rename meta-python/recipes-devtools/python/{python-aiohttp.inc => python3-aiohttp_3.6.2.bb} (76%) create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb rename meta-webserver/recipes-httpd/nginx/{nginx_1.16.0.bb => nginx_1.17.8.bb} (64%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:37 +0000 Subject: [oe-commits] [meta-openembedded] 03/14: mpv: 0.26.0 -> 0.32.0 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.B95E6232A3C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 835358a130e4c67929dc3f1f82b5ce0867d0ad4f Author: Trevor Woerner AuthorDate: Sat Feb 8 14:24:33 2020 -0500 mpv: 0.26.0 -> 0.32.0 Remove mpv from the PNBLACKLIST by updating to the latest release and using a newer, python3-aware waf for building (copied from glmark2). The name of the license file changed, but the licence of the software itself did not. Added mime-xdg to inherit to handle mime artifacts. Added to the FILES command to scoop up additional files being generated by the build. Re-added 'mpv' back to LICENSE_FLAGS_WHITELIST search list in packagegroup-meta-oe. Extensively fixed and cleaned up the PACKAGECONFIG options to reflect the current options available when configuring mpv. Also cleaned up any configure options which are no longer available. Added the correct dependencies so mpv builds under wayland. Tested with core-image-x11 on a rock-pi-4 with PACKAGECONFIG = "libass x11 opengl egl drm gbm vaapi vdpau" # mpv --vo=help Available video outputs: libmpv render API for libmpv gpu Shader-based GPU Renderer vdpau VDPAU with X11 vaapi VA API with X11 x11 X11 (slow, old crap) null Null video output image Write video frames to image files tct true-color terminals drm Direct Rendering Manager Tested with core-image-weston on a rock-pi-4 with: PACKAGECONFIG = "libass wayland x11 opengl" # mpv -vo=help Available video outputs: libmpv render API for libmpv gpu Shader-based GPU Renderer wlshm Wayland SHM video output x11 X11 (slow, old crap) null Null video output image Write video frames to image files tct true-color terminals Signed-off-by: Trevor Woerner Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-oe.bb | 2 +- .../recipes-multimedia/mplayer/mpv/python3.patch | 12 +++ meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 85 --------------- meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 115 +++++++++++++++++++++ 4 files changed, 128 insertions(+), 86 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d5789a7..865cbb0 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -207,7 +207,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \ libmikmod \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \ " RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch new file mode 100644 index 0000000..df208cf --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch @@ -0,0 +1,12 @@ +Use Python 3 instead of Python 2. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/waf b/waf +index 6ce2a24..de3c898 100755 +--- a/waf ++++ b/waf +@@ -1 +1 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb deleted file mode 100644 index c98aa7a..0000000 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "Open Source multimedia player" -DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more." -SECTION = "multimedia" -HOMEPAGE = "http://www.mpv.io/" -DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ - libxscrnsaver libv4l libxinerama \ -" - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" - -# While this item does not require it, it depends on ffmpeg which does -LICENSE_FLAGS = "commercial" - -SRCREV_mpv = "4db82f04502cbcd20d9a975df9dfde91d8c389e3" -SRC_URI = " \ - git://github.com/mpv-player/mpv;name=mpv \ - http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=git \ -" -SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" -SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" - -S = "${WORKDIR}/git" - -inherit waf pkgconfig python3native features_check - -LUA ?= "lua" -LUA_mips64 = "" -LUA_aarch64 = "" -LUA_powerpc64 = "" -LUA_powerpc64le = "" -LUA_powerpc = "" - -# Note: both lua and libass are required to get on-screen-display (controls) -PACKAGECONFIG ??= " \ - ${LUA} \ - libass \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ -" - -PACKAGECONFIG_remove_aarch64 = "lua" -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/mesa" -PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" -PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" -PACKAGECONFIG[vaapi] = "--enable-vaapi, --disable-vaapi,libva" -PACKAGECONFIG[vdpau] = "--enable-vdpau, --disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland,wayland libxkbcommon" - -SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" - -EXTRA_OECONF = " \ - --prefix=${prefix} \ - --target=${SIMPLE_TARGET_SYS} \ - --confdir=${sysconfdir} \ - --datadir=${datadir} \ - --disable-manpage-build \ - --disable-gl \ - --disable-libsmbclient \ - --disable-encoding \ - --disable-libbluray \ - --disable-dvdread \ - --disable-dvdnav \ - --disable-cdda \ - --disable-uchardet \ - --disable-rubberband \ - --disable-lcms2 \ - --disable-vapoursynth \ - --disable-vapoursynth-lazy \ - ${PACKAGECONFIG_CONFARGS} \ -" - -adjust_waf_perms() { - chmod +x ${S}/waf -} - -do_patch[postfuncs] += "adjust_waf_perms" - -FILES_${PN} += "${datadir}/icons" - -PNBLACKLIST[mpv] = "Needs forward porting to use python3" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb new file mode 100644 index 0000000..bd2e389 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -0,0 +1,115 @@ +SUMMARY = "Open Source multimedia player" +DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more." +SECTION = "multimedia" +HOMEPAGE = "http://www.mpv.io/" +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ + libxscrnsaver libv4l libxinerama \ +" + +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" + +# While this item does not require it, it depends on ffmpeg which does +LICENSE_FLAGS = "commercial" + +SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" +SRC_URI = " \ + git://github.com/mpv-player/mpv;name=mpv \ + https://www.freehackers.org/~tnagy/release/waf-2.0.19;name=waf;downloadfilename=waf;subdir=git \ + file://python3.patch \ +" +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" + +S = "${WORKDIR}/git" + +inherit waf pkgconfig features_check mime-xdg + +LUA ?= "lua" +LUA_mips64 = "" +LUA_aarch64 = "" +LUA_powerpc64 = "" +LUA_powerpc64le = "" +LUA_powerpc = "" + +# Note: both lua and libass are required to get on-screen-display (controls) +PACKAGECONFIG ??= " \ + ${LUA} \ + libass \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +" + +PACKAGECONFIG_remove_aarch64 = "lua" +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" +PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" +PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl," +PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" +PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm" +PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" +PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" +PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" +PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon" + +python __anonymous() { + packageconfig = (d.getVar("PACKAGECONFIG") or "").split() + extras = [] + if "x11" in packageconfig and "opengl" in packageconfig: + extras.append(" --enable-gl-x11") + if "x11" in packageconfig and "egl" in packageconfig: + extras.append(" --enable-egl-x11") + if "egl" in packageconfig and "drm" in packageconfig: + extras.append(" --enable-egl-drm") + if "vaapi" in packageconfig and "x11" in packageconfig: + extras.append(" --enable-vaapi-x11") + if "vaapi" in packageconfig and "drm" in packageconfig: + extras.append(" --enable-vaapi-drm") + if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig: + extras.append(" --enable-vaapi-x-egl") + if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig: + extras.append(" --enable-vdpau-gl-x11") + if "wayland" in packageconfig and "opengl" in packageconfig: + extras.append(" --enable-gl-wayland") + if "wayland" in packageconfig and "vaapi" in packageconfig: + extras.append(" --enable-vaapi-wayland") + if extras: + d.appendVar("EXTRA_OECONF", "".join(extras)) +} + +SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" + +EXTRA_OECONF = " \ + --prefix=${prefix} \ + --target=${SIMPLE_TARGET_SYS} \ + --confdir=${sysconfdir} \ + --datadir=${datadir} \ + --disable-manpage-build \ + --disable-libsmbclient \ + --disable-libbluray \ + --disable-dvdnav \ + --disable-cdda \ + --disable-uchardet \ + --disable-rubberband \ + --disable-lcms2 \ + --disable-vapoursynth \ + ${PACKAGECONFIG_CONFARGS} \ +" + +adjust_waf_perms() { + chmod +x ${S}/waf +} + +do_patch[postfuncs] += "adjust_waf_perms" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/zsh \ + ${datadir}/bash-completion \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:38 +0000 Subject: [oe-commits] [meta-openembedded] 04/14: drone: Add CI support In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.C2B36232A3D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8d57a434ae82df0adbaf6fc86fb8615190e95363 Author: Khem Raj AuthorDate: Thu Nov 28 06:46:41 2019 -0800 drone: Add CI support Add drone build Badge Add .drone.yml for drone CI support Signed-off-by: Khem Raj --- .drone.yml | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README | 2 ++ 2 files changed, 77 insertions(+) diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..34ec4e5 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,75 @@ +kind: pipeline +type: exec +name: arm64 + +platform: + os: linux + arch: arm64 + +clone: + disable: false + +trigger: + branch: + - yoe/mut + event: + - push + - pull_request + +steps: + - name: build + commands: + - git clone --recurse-submodules -j8 -b master git://github.com/YoeDistro/yoe-distro.git yoe + - cd yoe + - git checkout master + - git pull + - git submodule update --recursive --init + - rm -rf sources/meta-openembedded + - ln -sf `pwd`/../ sources/meta-openembedded + - export DOCKER_REPO=none + - export LANG=en_US.UTF-8 + - export SSTATE_CACHE_DIR=/scratch/sstate-cache + - echo "Started build# $DRONE_BUILD_NUMBER" + - echo "sstate cache dir = $SSTATE_CACHE_DIR" + - echo "building $DRONE_GIT_HTTP_URL, branch $DRONE_SOURCE_BRANCH" + - echo export DOCKER_REPO=none > local.sh + - echo export LANG=en_US.UTF-8 >> local.sh + - echo export SSTATE_CACHE_DIR=/scratch/sstate-cache >> local.sh + - cp conf/local.conf.sample conf/local.conf + - echo SSTATE_DIR = \"$SSTATE_CACHE_DIR\" >> conf/local.conf + - echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf + - echo INHERIT += \"report-error rm_work\" >> conf/local.conf + - echo TOOLCHAIN = \"clang\" >> conf/local.conf + #- echo TESTIMAGE_AUTO_qemuall = \"1\" >> conf/local.conf + - /bin/bash -c ". ./qemux86-64-envsetup.sh && bitbake -k core-image-sato-sdk-ptest yoe-qt5-wayland-image" + - /bin/bash -c ". ./qemux86-64-envsetup.sh && ./sources/openembedded-core/scripts/sstate-cache-management.sh -d -y" +--- +kind: pipeline +type: exec +name: cleanup + +platform: + os: linux + arch: arm64 + +clone: + disable: true + +trigger: + branch: + - master + event: + - push + - pull_request + status: + - success + - failure + +steps: +- name: clean + commands: + - echo "Deleting tmpdir for build# $DRONE_BUILD_NUMBER" + - rm -rf /scratch/tmp-clang-$DRONE_BUILD_NUMBER + +depends_on: +- arm64 diff --git a/README b/README index 7318f09..d1297b0 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +[![Build Status](https://drone.yoedistro.org/api/badges/YoeDistro/meta-openembedded/status.svg)](https://drone.yoedistro.org/YoeDistro/meta-openembedded) + Collection of layers for the OE-core universe Main layer maintainer: Khem Raj -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:40 +0000 Subject: [oe-commits] [meta-openembedded] 06/14: babl: upgrade 0.1.62 -> 0.1.74 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.D8393232A3F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 91814d651e531434b9bea62505ddea5f8569a160 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:48 2020 +0100 babl: upgrade 0.1.62 -> 0.1.74 * babl moved to meson build * move to meta-gnome: latest gimp requires gexiv2 and nothing but gimp depends on babl * extend to native build for native gegl (next patch) * get sources from location gimp's homepage suggests Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 17 +++++++++++++++++ meta-oe/recipes-graphics/babl/babl_0.1.62.bb | 13 ------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb new file mode 100644 index 0000000..59921d3 --- /dev/null +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb @@ -0,0 +1,17 @@ +SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" + +GNOMEBASEBUILDCLASS = "meson" + +GIR_MESON_OPTION = "enable-gir" + +inherit setuptools3 gnomebase gobject-introspection + +DEPENDS += "lcms" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" +SRC_URI[md5sum] = "d032853f2678bc95054c39d4f02045c1" +SRC_URI[sha256sum] = "9a710b6950da37ada94cd9e2046cbce26de12473da32a7b79b7d1432fc66ce0e" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/babl/babl_0.1.62.bb b/meta-oe/recipes-graphics/babl/babl_0.1.62.bb deleted file mode 100644 index 4a7dbca..0000000 --- a/meta-oe/recipes-graphics/babl/babl_0.1.62.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" - -inherit gnomebase - -SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.1/${BP}.tar.bz2" -SRC_URI[md5sum] = "28fa9d43549378ceebe2871d7721dd46" -SRC_URI[sha256sum] = "dc279f174edbcb08821cf37e4ab0bc02e6949369b00b150c759a6c24bfd3f510" - -FILES_${PN} += "${libdir}/babl-*/*.so" -FILES_${PN}-dev += "${libdir}/babl-*/*.la" -FILES_${PN}-dbg += "${libdir}/babl-*/.debug/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:42 +0000 Subject: [oe-commits] [meta-openembedded] 08/14: libmypaint: initial add 1.4.0 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.EB8BA232A41@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8f52e7005eb359ca0272b5a4ce4cf03bbb63a59d Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:50 2020 +0100 libmypaint: initial add 1.4.0 It is a dependency for upcoming gimp 2.10.14 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb new file mode 100644 index 0000000..2ca80f3 --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "libmypaint is a library for making brushstrokes" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=9d13203ab4013e5a14dd62105f75d58b" + +DEPENDS = " \ + glib-2.0-native \ + intltool-native \ + glib-2.0 \ + babl \ + json-c \ +" + +inherit autotools gobject-introspection gettext python3native + +SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" +SRCREV = "477cb94b596035b54a255faaf95d13f6a8ee3619" +PV = "1.4.0" +S = "${WORKDIR}/git" + +do_configure_append() { + # autogen uses python2 so generate headers ourselves + cd ${S} + python3 generate.py mypaint-brush-settings-gen.h brushsettings-gen.h +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:43 +0000 Subject: [oe-commits] [meta-openembedded] 09/14: mypaint-brushes: initial add 1.3.0 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184935.003A4232A42@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d3f9381ecb6d8ef55097dbfecef415b0cfd218c1 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:51 2020 +0100 mypaint-brushes: initial add 1.3.0 * it is a (r)dependency for upcoming gimp 2.10.14 * there are 2.x versions available but these are not what gimp requires Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb new file mode 100644 index 0000000..d4d08fe --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "MyPaint brushes" +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032" + +inherit autotools allarch + +SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x" +SRCREV = "be9fdf9ef6c54e29c7499992f04e29114857b3fc" +PV = "1.3.0+git${SRCPV}" +S = "${WORKDIR}/git" + +FILES_${PN} += "${datadir}/mypaint-data" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:39 +0000 Subject: [oe-commits] [meta-openembedded] 05/14: sysdig: Upgrade to 0.26.4 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.CEECE232A3E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2cac4cde7a60ec76630bdf138e93fcfc2eb406f3 Author: Khem Raj AuthorDate: Wed Jan 2 17:59:20 2019 -0800 sysdig: Upgrade to 0.26.4 * License changed to Apache-2.0 upstream as well [1] * Forward port patches to apply on 0.26 * Just build libb64 from internal modules everything else should be provided by OE recipes * Disable luajit on aarch64 and mips64 since luajit on these arches is not available, fall back to liblua * Blacklist is for now Signed-off-by: Khem Raj --- ...ith-musl-backtrace-APIs-are-glibc-specifi.patch | 37 ++++++++++---------- .../0001-libsinsp-Port-to-build-with-lua-5.2.patch | 25 ++++++-------- meta-oe/recipes-extended/sysdig/sysdig_git.bb | 40 ++++++++++++++-------- 3 files changed, 53 insertions(+), 49 deletions(-) diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch index 7d3f8a1..6ba4369 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch @@ -9,42 +9,41 @@ Signed-off-by: Khem Raj userspace/libsinsp/utils.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/userspace/libsinsp/utils.cpp b/userspace/libsinsp/utils.cpp -index 8f23f9c..c496a57 100644 --- a/userspace/libsinsp/utils.cpp +++ b/userspace/libsinsp/utils.cpp -@@ -21,7 +21,9 @@ along with sysdig. If not, see . +@@ -22,7 +22,7 @@ limitations under the License. #include #include #include -+#ifdef __GLIBC__ +-#ifndef CYGWING_AGENT ++#if !defined(CYGWING_AGENT) || defined(__GLIBC__) #include -+#endif + #endif #include - #include - #include -@@ -741,7 +743,7 @@ uint64_t sinsp_utils::get_current_time_ns() - return tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000; - } +@@ -772,6 +772,7 @@ bool sinsp_utils::glob_match(const char --#ifndef _WIN32 -+#if defined(_WIN32) && defined(__GLIBC__) + #ifndef CYGWING_AGENT + #ifndef _WIN32 ++#ifdef __GLIBC__ void sinsp_utils::bt(void) { static const char start[] = "BACKTRACE ------------"; -diff --git a/userspace/libsinsp/utils.h b/userspace/libsinsp/utils.h -index 600d00b..4ab4650 100644 +@@ -793,6 +794,7 @@ void sinsp_utils::bt(void) + + free(bt_syms); + } ++#endif // Glibc + #endif // _WIN32 + #endif // CYGWING_AGENT + --- a/userspace/libsinsp/utils.h +++ b/userspace/libsinsp/utils.h -@@ -79,7 +79,7 @@ public: +@@ -104,7 +104,7 @@ public: - static uint64_t get_current_time_ns(); + static bool glob_match(const char *pattern, const char *string); -#ifndef _WIN32 +#if not defined(_WIN32) && defined(__GLIBC__) // // Print the call stack // --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch index 8fec0ca..1c71b91 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch @@ -8,38 +8,36 @@ Signed-off-by: Khem Raj userspace/libsinsp/chisel.cpp | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) -diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp -index 3cfbd8d..2db9348 100644 --- a/userspace/libsinsp/chisel.cpp +++ b/userspace/libsinsp/chisel.cpp -@@ -94,7 +94,7 @@ void lua_stackdump(lua_State *L) +@@ -97,7 +97,7 @@ void lua_stackdump(lua_State *L) // Lua callbacks /////////////////////////////////////////////////////////////////////////////// #ifdef HAS_LUA_CHISELS --const static struct luaL_reg ll_sysdig [] = +-const static struct luaL_reg ll_sysdig [] = +const static struct luaL_Reg ll_sysdig [] = { {"set_filter", &lua_cbacks::set_global_filter}, {"set_snaplen", &lua_cbacks::set_snaplen}, -@@ -120,7 +120,7 @@ const static struct luaL_reg ll_sysdig [] = +@@ -133,7 +133,7 @@ const static struct luaL_reg ll_sysdig [ {NULL,NULL} }; --const static struct luaL_reg ll_chisel [] = +-const static struct luaL_reg ll_chisel [] = +const static struct luaL_Reg ll_chisel [] = { {"request_field", &lua_cbacks::request_field}, {"set_filter", &lua_cbacks::set_filter}, -@@ -131,7 +131,7 @@ const static struct luaL_reg ll_chisel [] = +@@ -145,7 +145,7 @@ const static struct luaL_reg ll_chisel [ {NULL,NULL} }; --const static struct luaL_reg ll_evt [] = +-const static struct luaL_reg ll_evt [] = +const static struct luaL_Reg ll_evt [] = { {"field", &lua_cbacks::field}, {"get_num", &lua_cbacks::get_num}, -@@ -853,10 +853,28 @@ bool sinsp_chisel::parse_view_info(lua_State *ls, OUT chisel_desc* cd) +@@ -959,10 +959,28 @@ bool sinsp_chisel::parse_view_info(lua_S #ifdef HAS_LUA_CHISELS @@ -69,7 +67,7 @@ index 3cfbd8d..2db9348 100644 if(ls == NULL) { return false; -@@ -867,9 +885,9 @@ bool sinsp_chisel::init_lua_chisel(chisel_desc &cd, string const &fpath) +@@ -973,9 +991,9 @@ bool sinsp_chisel::init_lua_chisel(chise // // Load our own lua libs // @@ -82,13 +80,13 @@ index 3cfbd8d..2db9348 100644 // // Add our chisel paths to package.path -@@ -1111,16 +1129,16 @@ void sinsp_chisel::load(string cmdstr) +@@ -1203,16 +1221,16 @@ void sinsp_chisel::load(string cmdstr) // // Open the script // - m_ls = lua_open(); + m_ls = luaL_newstate(); - + luaL_openlibs(m_ls); // @@ -103,6 +101,3 @@ index 3cfbd8d..2db9348 100644 // // Add our chisel paths to package.path --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index 4f58281..7b9222d 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -3,32 +3,41 @@ DESCRIPTION = "Sysdig is open source, system-level exploration: capture \ system state and activity from a running Linux instance, then save, \ filter and analyze." HOMEPAGE = "http://www.sysdig.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44" inherit cmake pkgconfig OECMAKE_GENERATOR = "Unix Makefiles" +JIT ?= "jit" +JIT_mipsarchn32 = "" +JIT_mipsarchn64 = "" +JIT_aarch64 = "" -DEPENDS = "luajit zlib ncurses" +DEPENDS = "lua${JIT} zlib ncurses jsoncpp tbb jq openssl elfutils protobuf" RDEPENDS_${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=master \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ file://0001-libsinsp-Port-to-build-with-lua-5.2.patch \ file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \ " -SRCREV = "85d16f33a82a17f87ccdbc088749271c71d87013" -PV = "0.1.102+git${SRCPV}" +# v0.26.4 +SRCREV = "5e3b3c287c0661d27400617f329bd13b3759eb17" +PV = "0.26.4" S = "${WORKDIR}/git" -DIR_ETC="/etc" -EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \ - -DUSE_BUNDLED_ZLIB="OFF" \ - -DBUILD_DRIVER="OFF" \ - -DUSE_BUNDLED_NCURSES="OFF" \ - -DDIR_ETC="${DIR_ETC}" \ - ' +EXTRA_OECMAKE = "\ + -DBUILD_DRIVER=OFF \ + -DUSE_BUNDLED_DEPS=ON \ + -DUSE_BUNDLED_LUAJIT=OFF \ + -DUSE_BUNDLED_B64=ON \ + -DUSE_BUNDLED_CARES=ON \ + -DUSE_BUNDLED_PROTOBUF=ON \ + -DUSE_BUNDLED_ZLIB=ON \ + -DUSE_BUNDLED_GRPC=ON \ + -DDIR_ETC=${sysconfdir} \ +" FILES_${PN} += " \ ${DIR_ETC}/* \ @@ -36,6 +45,7 @@ FILES_${PN} += " \ ${prefix}/src/* \ " -# luajit not supported on Aarch64 -COMPATIBLE_HOST = "^(?!aarch64).*" +SECURITY_CFLAGS = "" +SECURITY_LDFLAGS = "" +PNBLACKLIST[sysdig] = "configure: error: in 'TOPDIR/build/tmpfs/work/core2-64-yoe-linux/sysdig/0.26.4-r0/build/c-ares-prefix/src/c-ares'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:41 +0000 Subject: [oe-commits] [meta-openembedded] 07/14: gegl: upgrade 0.3.18 -> 0.4.20 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184934.E2850232A40@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fc8d0998826e0ba74996f656d3347994effc0076 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:49 2020 +0100 gegl: upgrade 0.3.18 -> 0.4.20 * gegl is GPLv3 now * gegl moved to meson build * move to meta-gnome: latest gimp requires gexiv2 and nothing but gimp depends on gegl * add more PACKAGECONFIGs and change defaults slightly: sdl->sdl2 / add gexiv2 by default because gimp requires it anyway * extend to native: latest gimp requires gegl for manipulation of pngs during build * get sources from location gimp's homepage suggests Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 ++++++++++++ meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb | 61 ++++++++++++++++++++++ meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 -------- meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 ------------ 4 files changed, 93 insertions(+), 55 deletions(-) diff --git a/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch new file mode 100644 index 0000000..6a49f1d --- /dev/null +++ b/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch @@ -0,0 +1,32 @@ +From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 8 Feb 2020 14:29:52 +0100 +Subject: [PATCH] meson.build: Give note if sdl2 was found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Configure output confused me a bit + +Upstream-Status: Pending + +Signed-off-by: Andreas M?ller +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 9d5b484..296b5f3 100644 +--- a/meson.build ++++ b/meson.build +@@ -374,6 +374,7 @@ message('\n'.join(['', + ' OpenEXR: @0@'.format(openexr.found()), + ' rsvg: @0@'.format(librsvg.found()), + ' SDL: @0@'.format(sdl1.found()), ++' SDL2: @0@'.format(sdl2.found()), + ' libraw: @0@'.format(libraw.found()), + ' Jasper: @0@'.format(jasper.found()), + ' av libs: @0@'.format(avlibs_found), +-- +2.21.0 + diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb new file mode 100644 index 0000000..5e7a1bb --- /dev/null +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb @@ -0,0 +1,61 @@ +SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" + +DEPENDS = " \ + intltool-native \ + babl \ + glib-2.0 \ + pango \ + cairo \ + expat \ + zlib \ + \ + json-glib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit features_check gnomebase vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +SRC_URI = " \ + https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ + file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ +" +SRC_URI[md5sum] = "37433eb00f8a4b0d1ae9e975aaedfa26" +SRC_URI[sha256sum] = "23bd8bb42b20de7c2a8c314eeb5301dc20141feda20a4b1ed455020b69b73dff" + +PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" +PACKAGECONFIG_class-native = "libpng librsvg" + +PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" +PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2" +PACKAGECONFIG[graphviz] = "-Dgraphviz=enabled,-Dgraphviz=disabled,graphviz" +PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" +PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" +PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" +PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" + +# There are a couple of non-symlink .so files installed into libdir, which need to go into main package +FILES_${PN} += " \ + ${libdir}/*.so \ + ${libdir}/gegl-${SHPV}/*.json \ + ${libdir}/gegl-${SHPV}/*.so \ +" +FILES_SOLIBSDEV = "${libdir}/libgegl-${SHPV}${SOLIBSDEV}" + +# Fails to build with thumb-1 (qemuarm) +# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': +# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 +ARM_INSTRUCTION_SET = "arm" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch deleted file mode 100644 index d145b62..0000000 --- a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: gegl-0.2.0/configure.ac -=================================================================== ---- gegl-0.2.0.orig/configure.ac 2012-04-02 21:56:49.000000000 +0000 -+++ gegl-0.2.0/configure.ac 2014-07-17 21:34:15.312546602 +0000 -@@ -765,15 +765,7 @@ - - have_sdl="no" - if test "x$with_sdl" != "xno"; then -- AC_PATH_PROG(SDL_CONFIG, sdl-config, no) -- if test "$SDL_CONFIG" = "no"; then -- have_sdl="no (SDL library not found)" -- AC_MSG_RESULT([*** Check for SDL library failed.]) -- else -- have_sdl="yes" -- SDL_CFLAGS=`$SDL_CONFIG --cflags` -- SDL_LIBS=`$SDL_CONFIG --libs` -- fi -+ PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no (SDL library not found)"]) - fi - - AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes") diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb deleted file mode 100644 index 0db0f79..0000000 --- a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl json-glib intltool-native" - -EXTRA_OECONF = "--disable-docs" - -inherit features_check gnomebase vala gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" -PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav" -PACKAGECONFIG[lcms] = "--with-lcms,--without-lcms,lcms" -PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" -PACKAGECONFIG[webp] = "--with-webp,--without-webp,webp" - -SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.3/${BP}.tar.bz2 \ - file://pkgconfig.patch " -SRC_URI[md5sum] = "6e5c6f229261478dc436a38c84405b2a" -SRC_URI[sha256sum] = "d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb" - -LDFLAGS += "-lm" - -# There are a couple of non-symlink .so files installed into libdir, which need to go into main package -FILES_${PN}_append = " ${libdir}/gegl-0.3/*.so ${libdir}/gegl-0.3/*.json ${libdir}/libgegl-npd-0.3.so ${libdir}/libgegl-sc-0.3.so" -FILES_${PN}-dev_append = " ${libdir}/gegl-0.3/*.la ${libdir}/libgegl-0.3.so" -FILES_${PN}-dev_remove = "${libdir}/lib*.so" - -# Fails to build with thumb-1 (qemuarm) -# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': -# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 -ARM_INSTRUCTION_SET = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:45 +0000 Subject: [oe-commits] [meta-openembedded] 11/14: packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184935.13F7C232A44@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2e4d8c3ef1a7e17e1e22bfddfe12d556cdbd48fb Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:53 2020 +0100 packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 865cbb0..929e7d5 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -172,8 +172,8 @@ RDEPENDS_packagegroup-meta-oe-gnome ="\ " RDEPENDS_packagegroup-meta-oe-graphics ="\ - babl cairomm dietsplash directfb directfb-examples dnfdragora \ - fbgrab fbida fontforge fvwm gegl gimp glm gphoto2 libgphoto2 \ + cairomm dietsplash directfb directfb-examples dnfdragora \ + fbgrab fbida fontforge fvwm glm gphoto2 libgphoto2 \ gtkperf jasper leptonica libmng libsdl2-image libsdl2-mixer libsdl2-net \ libsdl-gfx libsdl-image libsdl-mixer libsdl-net libsdl-ttf \ libvncserver libyui libyui-ncurses lxdm numlockx openbox openjpeg \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:46 +0000 Subject: [oe-commits] [meta-openembedded] 12/14: nginx: update to the latest stable version (1.16.1) In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184935.1D29F232A45@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 990b59b25451bdcac2072475ff3a674f937c0648 Author: Derek Straka AuthorDate: Sun Feb 9 11:00:35 2020 -0500 nginx: update to the latest stable version (1.16.1) See changlog here: https://nginx.org/en/CHANGES-1.16 * Fixes CVE-2019-9511, CVE-2019-9513, CVE-2019-9516 Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb | 10 ---------- meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb deleted file mode 100644 index cad0db6..0000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.16.x branch is the current stable branch, the recommended default -# 1.17.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "97207283f30cd90cdba638c3ea30323a" -SRC_URI[sha256sum] = "4fd376bad78797e7f18094a00f0f1088259326436b537eb5af69b01be2ca1345" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb new file mode 100644 index 0000000..2076425 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" + +SRC_URI[md5sum] = "45a80f75336c980d240987badc3dcf60" +SRC_URI[sha256sum] = "f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:44 +0000 Subject: [oe-commits] [meta-openembedded] 10/14: gimp: upgrade 2.8.22 -> 2.10.14 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184935.0B3CB232A43@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 91a9a5fc26f4bfb1e132298c069fdf53534a0abf Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:52 2020 +0100 gimp: upgrade 2.8.22 -> 2.10.14 * patches don't apply any more * get sources from location gimp's homepage suggests * license checksum was changed by replacing http -> https [1] [1] https://gitlab.gnome.org/GNOME/gimp/commit/bab75b7365cc87639cd5aaa9840ebe1f6228d556 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 60 ++++++++++++++++++++++ ...igure-ac-do-not-check-for-freetype-config.patch | 38 -------------- .../gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 ------------ .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 ------------------- meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 52 ------------------- 5 files changed, 60 insertions(+), 177 deletions(-) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb new file mode 100644 index 0000000..045958d --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb @@ -0,0 +1,60 @@ +SUMMARY = "The GIMP is the GNU Image Manipulation Program" +HOMEPAGE = "http://www.gimp.org" +SECTION = "x11/graphics" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" + +DEPENDS = " \ + gdk-pixbuf-native \ + intltool-native \ + libxslt-native \ + gegl-native \ + dbus-glib \ + gtk+ \ + babl \ + gegl \ + libmypaint \ + mypaint-brushes-1.0 \ + gexiv2 \ + jpeg \ + libpng \ + libexif \ + tiff \ + lcms \ + poppler \ + poppler-data \ + jasper \ + bzip2 \ + libgudev \ + libmng \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \ +" + +inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI[md5sum] = "a64f2be299755a2da130306cad9b1d26" +SRC_URI[sha256sum] = "df9b0f11c2078eea1de3ebc66529a5d3854c5e28636cd25a8dd077bd9d6ddc54" + +EXTRA_OECONF = "--disable-python \ + --without-webkit \ + --without-wmf" + +do_configure_append() { + find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +do_compile_prepend() { + # Let native babl/gegl find their plugins + export BABL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'babl-*'` + export GEGL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'gegl-*'` +} + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "mypaint-brushes-1.0" diff --git a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch deleted file mode 100644 index fecd012..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 72ad76841d87e857428693d812a961935284ac62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 12 Feb 2015 15:57:47 +0100 -Subject: [PATCH] configure-ac: do not check for freetype-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -freetype-config is not allowed in our environment - see also binconfig-disabled - -Upstream-Status: inappropriate [OE specific] - -Signed-off-by: Andreas M?ller ---- - configure.ac | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 26812b6..abec714 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -647,13 +647,6 @@ if test "x$fontconfig_ok" = xno; then - fi - - --AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) --if test "x$FREETYPE_CONFIG" != "xno" ; then -- AC_MSG_CHECKING([for freetype libraries]) -- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` -- AC_MSG_RESULT($FREETYPE_LIBS) --fi --AC_SUBST(FREETYPE_LIBS) - - - ########################################## --- -1.9.3 - diff --git a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch deleted file mode 100644 index 7da78e2..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Jun 2017 10:32:14 -0700 -Subject: [PATCH 3/3] Fix use of gegl API - -newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE - -| core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate': -| /usr/src/debug/gimp/2.8.22-r0/gimp-2.8.22/app/core/../../../../../../../../../workspace/sources/gimp/app/core/gimpparamspecs-duplicate.c:70: undefined reference to `GEGL_IS_PARAM_SPEC_MULTILINE' -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - app/core/gimpparamspecs-duplicate.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c -index c0b7426..2efaf23 100644 ---- a/app/core/gimpparamspecs-duplicate.c -+++ b/app/core/gimpparamspecs-duplicate.c -@@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec) - spec->default_value, - pspec->flags); - -- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) -+ if (gegl_param_spec_get_property_key(pspec, "multiline")) - { - g_param_spec_set_qdata (new, multiline_quark, - GINT_TO_POINTER (TRUE)); --- -2.13.2 - diff --git a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch deleted file mode 100644 index b71bf32..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch +++ /dev/null @@ -1,53 +0,0 @@ -Bump acceptable versions of babl and gegl. - -Patch is taken from debian: -https://packages.debian.org/stretch/gimp - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Alexander Kanavin -diff --git a/app/sanity.c b/app/sanity.c -index febddfb..85fea55 100644 ---- a/app/sanity.c -+++ b/app/sanity.c -@@ -351,7 +351,7 @@ sanity_check_babl (void) - - #define BABL_REQUIRED_MAJOR 0 - #define BABL_REQUIRED_MINOR 1 --#define BABL_REQUIRED_MICRO 10 -+#define BABL_REQUIRED_MICRO 12 - - babl_get_version (&babl_major_version, - &babl_minor_version, -@@ -388,7 +388,7 @@ sanity_check_gegl (void) - gint gegl_micro_version; - - #define GEGL_REQUIRED_MAJOR 0 --#define GEGL_REQUIRED_MINOR 2 -+#define GEGL_REQUIRED_MINOR 3 - #define GEGL_REQUIRED_MICRO 0 - - gegl_get_version (&gegl_major_version, -diff --git a/configure.ac b/configure.ac -index 26812b6..4252fe9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,8 +40,8 @@ m4_define([gimp_stable], - m4_define([gimp_full_name], [GNU Image Manipulation Program]) - - # required versions of other packages --m4_define([babl_required_version], [0.1.10]) --m4_define([gegl_required_version], [0.2.0]) -+m4_define([babl_required_version], [0.1.12]) -+m4_define([gegl_required_version], [0.3.0]) - m4_define([glib_required_version], [2.30.2]) - m4_define([atk_required_version], [2.2.0]) - m4_define([gtk_required_version], [2.24.10]) -@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR) - ############################### - - PKG_CHECK_MODULES(BABL, babl >= babl_required_version) --PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version) -+PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) - PKG_CHECK_MODULES(ATK, atk >= atk_required_version) - - AM_PATH_GLIB_2_0(glib_required_version, :, diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb deleted file mode 100644 index 718f899..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "The GIMP is the GNU Image Manipulation Program" -HOMEPAGE = "http://www.gimp.org" -SECTION = "x11/graphics" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = " \ - gdk-pixbuf-native \ - intltool-native \ - libxslt-native \ - dbus-glib \ - gtk+ \ - babl \ - gegl \ - jpeg \ - libpng \ - libexif \ - tiff \ - lcms \ - poppler \ - jasper \ - bzip2 \ - libgudev \ - libmng \ -" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" - -inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ - file://0001-configure-ac-do-not-check-for-freetype-config.patch \ - file://bump_Babl-GEGL_versions.patch \ - file://0003-Fix-use-of-gegl-API.patch \ - " -SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d" -SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a" - -EXTRA_OECONF = "--disable-python \ - --without-webkit \ - --without-wmf" - -do_configure_append() { - find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g -} - -CFLAGS += "-fPIC" - -FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" -FILES_${PN} += "${datadir}/appdata" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:47 +0000 Subject: [oe-commits] [meta-openembedded] 13/14: nginx: update to the latest development version (1.17.8) In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184935.262BF232A46@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2427dc0404887df428a982503d30bd32bfb25b3e Author: Derek Straka AuthorDate: Sun Feb 9 11:05:36 2020 -0500 nginx: update to the latest development version (1.17.8) See Changelog: https://nginx.org/en/CHANGES Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb | 6 ------ meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb deleted file mode 100644 index 8774a87..0000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "56767fd62302508295b31adc48b99a59" -SRC_URI[sha256sum] = "e21b5d06cd53e86afb94f0b3678e0abb0c0f011433471fa3d895cefa65ae0fab" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb new file mode 100644 index 0000000..3d2a5ed --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.16.x branch is the current stable branch, the recommended default +# 1.17.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" + +SRC_URI[md5sum] = "29cd861a13aae69a058cbabaae86177b" +SRC_URI[sha256sum] = "97d23ecf6d5150b30e284b40e8a6f7e3bb5be6b601e373a4d013768d5a25965b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:49:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:49:48 +0000 Subject: [oe-commits] [meta-openembedded] 14/14: python3-aiohttp: update to version 3.6.2 In-Reply-To: <158127417410.24167.18132087415313936547@git.openembedded.org> References: <158127417410.24167.18132087415313936547@git.openembedded.org> Message-ID: <20200209184935.3004A232A47@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c2a4f4eeb7169537b53b325e8994e019e753a973 Author: Derek Straka AuthorDate: Sun Feb 9 11:32:59 2020 -0500 python3-aiohttp: update to version 3.6.2 Consolidate inc & bb file into a single python3 version Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb | 2 -- .../python/{python-aiohttp.inc => python3-aiohttp_3.6.2.bb} | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb deleted file mode 100644 index cd0303f..0000000 --- a/meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-aiohttp.inc diff --git a/meta-python/recipes-devtools/python/python-aiohttp.inc b/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb similarity index 76% rename from meta-python/recipes-devtools/python/python-aiohttp.inc rename to meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb index e711ad7..979acc9 100644 --- a/meta-python/recipes-devtools/python/python-aiohttp.inc +++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb @@ -4,11 +4,11 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cf056e8e7a0a5477451af18b7b5aa98c" -SRC_URI[md5sum] = "85fe5c9037256c58d4678148bd91b3f3" -SRC_URI[sha256sum] = "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf" +SRC_URI[md5sum] = "ca40144c199a09fc1a141960cf6295f0" +SRC_URI[sha256sum] = "259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326" PYPI_PACKAGE = "aiohttp" -inherit pypi +inherit setuptools3 pypi RDEPENDS_${PN} = "\ ${PYTHON_PN}-async-timeout \ ${PYTHON_PN}-chardet \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 9 18:54:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 09 Feb 2020 18:54:30 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c2a4f4e -> 835358a) Message-ID: <158127447096.26435.15962702737345967996@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard c2a4f4e python3-aiohttp: update to version 3.6.2 discard 2427dc0 nginx: update to the latest development version (1.17.8) discard 990b59b nginx: update to the latest stable version (1.16.1) discard 2e4d8c3 packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome discard 91a9a5f gimp: upgrade 2.8.22 -> 2.10.14 discard d3f9381 mypaint-brushes: initial add 1.3.0 discard 8f52e70 libmypaint: initial add 1.4.0 discard fc8d099 gegl: upgrade 0.3.18 -> 0.4.20 discard 91814d6 babl: upgrade 0.1.62 -> 0.1.74 discard 2cac4cd sysdig: Upgrade to 0.26.4 discard 8d57a43 drone: Add CI support This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master-next (835358a) \ O -- O -- O (c2a4f4e) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .drone.yml | 75 ---------------------- README | 2 - meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 17 ----- ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 --------- meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb | 61 ------------------ meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 60 ----------------- meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb | 24 ------- .../mypaint/mypaint-brushes-1.0_git.bb | 12 ---- .../packagegroups/packagegroup-meta-oe.bb | 4 +- ...ith-musl-backtrace-APIs-are-glibc-specifi.patch | 37 +++++------ .../0001-libsinsp-Port-to-build-with-lua-5.2.patch | 25 +++++--- meta-oe/recipes-extended/sysdig/sysdig_git.bb | 40 +++++------- meta-oe/recipes-graphics/babl/babl_0.1.62.bb | 13 ++++ meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 ++++++ meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 ++++++++++ ...igure-ac-do-not-check-for-freetype-config.patch | 38 +++++++++++ .../gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 ++++++++++ .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 +++++++++++++++ meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 52 +++++++++++++++ ...python3-aiohttp_3.6.2.bb => python-aiohttp.inc} | 6 +- .../python/python3-aiohttp_3.5.4.bb | 2 + .../nginx/{nginx_1.17.8.bb => nginx_1.16.0.bb} | 4 +- meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb | 6 -- meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb | 6 ++ 24 files changed, 309 insertions(+), 349 deletions(-) delete mode 100644 .drone.yml delete mode 100644 meta-gnome/recipes-gimp/babl/babl_0.1.74.bb delete mode 100644 meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch delete mode 100644 meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb delete mode 100644 meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb delete mode 100644 meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb delete mode 100644 meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb create mode 100644 meta-oe/recipes-graphics/babl/babl_0.1.62.bb create mode 100644 meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch create mode 100644 meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb create mode 100644 meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch create mode 100644 meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch create mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch create mode 100644 meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb rename meta-python/recipes-devtools/python/{python3-aiohttp_3.6.2.bb => python-aiohttp.inc} (76%) create mode 100644 meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb rename meta-webserver/recipes-httpd/nginx/{nginx_1.17.8.bb => nginx_1.16.0.bb} (64%) delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:42 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: babl: upgrade 0.1.62 -> 0.1.74 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063141.CEA52232A43@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c23165fe1704d2bee66f4503355fe56071eb7f88 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:48 2020 +0100 babl: upgrade 0.1.62 -> 0.1.74 * babl moved to meson build * move to meta-gnome: latest gimp requires gexiv2 and nothing but gimp depends on babl * extend to native build for native gegl (next patch) * get sources from location gimp's homepage suggests Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 17 +++++++++++++++++ meta-oe/recipes-graphics/babl/babl_0.1.62.bb | 13 ------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb new file mode 100644 index 0000000..59921d3 --- /dev/null +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb @@ -0,0 +1,17 @@ +SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" + +GNOMEBASEBUILDCLASS = "meson" + +GIR_MESON_OPTION = "enable-gir" + +inherit setuptools3 gnomebase gobject-introspection + +DEPENDS += "lcms" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" +SRC_URI[md5sum] = "d032853f2678bc95054c39d4f02045c1" +SRC_URI[sha256sum] = "9a710b6950da37ada94cd9e2046cbce26de12473da32a7b79b7d1432fc66ce0e" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/babl/babl_0.1.62.bb b/meta-oe/recipes-graphics/babl/babl_0.1.62.bb deleted file mode 100644 index 4a7dbca..0000000 --- a/meta-oe/recipes-graphics/babl/babl_0.1.62.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" - -inherit gnomebase - -SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.1/${BP}.tar.bz2" -SRC_URI[md5sum] = "28fa9d43549378ceebe2871d7721dd46" -SRC_URI[sha256sum] = "dc279f174edbcb08821cf37e4ab0bc02e6949369b00b150c759a6c24bfd3f510" - -FILES_${PN} += "${libdir}/babl-*/*.so" -FILES_${PN}-dev += "${libdir}/babl-*/*.la" -FILES_${PN}-dbg += "${libdir}/babl-*/.debug/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:44 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: libmypaint: initial add 1.4.0 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063141.E2E69232A45@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e4e8bb8b9e78c87612a84d96bd78b3a692c4b300 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:50 2020 +0100 libmypaint: initial add 1.4.0 It is a dependency for upcoming gimp 2.10.14 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb new file mode 100644 index 0000000..2ca80f3 --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "libmypaint is a library for making brushstrokes" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=9d13203ab4013e5a14dd62105f75d58b" + +DEPENDS = " \ + glib-2.0-native \ + intltool-native \ + glib-2.0 \ + babl \ + json-c \ +" + +inherit autotools gobject-introspection gettext python3native + +SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" +SRCREV = "477cb94b596035b54a255faaf95d13f6a8ee3619" +PV = "1.4.0" +S = "${WORKDIR}/git" + +do_configure_append() { + # autogen uses python2 so generate headers ourselves + cd ${S} + python3 generate.py mypaint-brush-settings-gen.h brushsettings-gen.h +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:45 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: mypaint-brushes: initial add 1.3.0 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063141.EBE95232A46@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c8734f7d5a6c552b9981513dfe08b8541650e24d Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:51 2020 +0100 mypaint-brushes: initial add 1.3.0 * it is a (r)dependency for upcoming gimp 2.10.14 * there are 2.x versions available but these are not what gimp requires Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb new file mode 100644 index 0000000..d4d08fe --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "MyPaint brushes" +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032" + +inherit autotools allarch + +SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x" +SRCREV = "be9fdf9ef6c54e29c7499992f04e29114857b3fc" +PV = "1.3.0+git${SRCPV}" +S = "${WORKDIR}/git" + +FILES_${PN} += "${datadir}/mypaint-data" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:43 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: gegl: upgrade 0.3.18 -> 0.4.20 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063141.DA22E232A44@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d55b2dca5f8116eb3e2e230994ba0a0abcf36b3a Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:49 2020 +0100 gegl: upgrade 0.3.18 -> 0.4.20 * gegl is GPLv3 now * gegl moved to meson build * move to meta-gnome: latest gimp requires gexiv2 and nothing but gimp depends on gegl * add more PACKAGECONFIGs and change defaults slightly: sdl->sdl2 / add gexiv2 by default because gimp requires it anyway * extend to native: latest gimp requires gegl for manipulation of pngs during build * get sources from location gimp's homepage suggests Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 ++++++++++++ meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb | 61 ++++++++++++++++++++++ meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 -------- meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 ------------ 4 files changed, 93 insertions(+), 55 deletions(-) diff --git a/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch new file mode 100644 index 0000000..6a49f1d --- /dev/null +++ b/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch @@ -0,0 +1,32 @@ +From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 8 Feb 2020 14:29:52 +0100 +Subject: [PATCH] meson.build: Give note if sdl2 was found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Configure output confused me a bit + +Upstream-Status: Pending + +Signed-off-by: Andreas M?ller +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 9d5b484..296b5f3 100644 +--- a/meson.build ++++ b/meson.build +@@ -374,6 +374,7 @@ message('\n'.join(['', + ' OpenEXR: @0@'.format(openexr.found()), + ' rsvg: @0@'.format(librsvg.found()), + ' SDL: @0@'.format(sdl1.found()), ++' SDL2: @0@'.format(sdl2.found()), + ' libraw: @0@'.format(libraw.found()), + ' Jasper: @0@'.format(jasper.found()), + ' av libs: @0@'.format(avlibs_found), +-- +2.21.0 + diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb new file mode 100644 index 0000000..5e7a1bb --- /dev/null +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb @@ -0,0 +1,61 @@ +SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" + +DEPENDS = " \ + intltool-native \ + babl \ + glib-2.0 \ + pango \ + cairo \ + expat \ + zlib \ + \ + json-glib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit features_check gnomebase vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +SRC_URI = " \ + https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ + file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ +" +SRC_URI[md5sum] = "37433eb00f8a4b0d1ae9e975aaedfa26" +SRC_URI[sha256sum] = "23bd8bb42b20de7c2a8c314eeb5301dc20141feda20a4b1ed455020b69b73dff" + +PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" +PACKAGECONFIG_class-native = "libpng librsvg" + +PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" +PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2" +PACKAGECONFIG[graphviz] = "-Dgraphviz=enabled,-Dgraphviz=disabled,graphviz" +PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" +PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" +PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" +PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" + +# There are a couple of non-symlink .so files installed into libdir, which need to go into main package +FILES_${PN} += " \ + ${libdir}/*.so \ + ${libdir}/gegl-${SHPV}/*.json \ + ${libdir}/gegl-${SHPV}/*.so \ +" +FILES_SOLIBSDEV = "${libdir}/libgegl-${SHPV}${SOLIBSDEV}" + +# Fails to build with thumb-1 (qemuarm) +# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': +# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 +ARM_INSTRUCTION_SET = "arm" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch deleted file mode 100644 index d145b62..0000000 --- a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: gegl-0.2.0/configure.ac -=================================================================== ---- gegl-0.2.0.orig/configure.ac 2012-04-02 21:56:49.000000000 +0000 -+++ gegl-0.2.0/configure.ac 2014-07-17 21:34:15.312546602 +0000 -@@ -765,15 +765,7 @@ - - have_sdl="no" - if test "x$with_sdl" != "xno"; then -- AC_PATH_PROG(SDL_CONFIG, sdl-config, no) -- if test "$SDL_CONFIG" = "no"; then -- have_sdl="no (SDL library not found)" -- AC_MSG_RESULT([*** Check for SDL library failed.]) -- else -- have_sdl="yes" -- SDL_CFLAGS=`$SDL_CONFIG --cflags` -- SDL_LIBS=`$SDL_CONFIG --libs` -- fi -+ PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no (SDL library not found)"]) - fi - - AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes") diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb deleted file mode 100644 index 0db0f79..0000000 --- a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl json-glib intltool-native" - -EXTRA_OECONF = "--disable-docs" - -inherit features_check gnomebase vala gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" -PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav" -PACKAGECONFIG[lcms] = "--with-lcms,--without-lcms,lcms" -PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" -PACKAGECONFIG[webp] = "--with-webp,--without-webp,webp" - -SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.3/${BP}.tar.bz2 \ - file://pkgconfig.patch " -SRC_URI[md5sum] = "6e5c6f229261478dc436a38c84405b2a" -SRC_URI[sha256sum] = "d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb" - -LDFLAGS += "-lm" - -# There are a couple of non-symlink .so files installed into libdir, which need to go into main package -FILES_${PN}_append = " ${libdir}/gegl-0.3/*.so ${libdir}/gegl-0.3/*.json ${libdir}/libgegl-npd-0.3.so ${libdir}/libgegl-sc-0.3.so" -FILES_${PN}-dev_append = " ${libdir}/gegl-0.3/*.la ${libdir}/libgegl-0.3.so" -FILES_${PN}-dev_remove = "${libdir}/lib*.so" - -# Fails to build with thumb-1 (qemuarm) -# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': -# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 -ARM_INSTRUCTION_SET = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:41 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (835358a -> 611b0c7) Message-ID: <158131630142.13993.8413098794402522669@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 835358a mpv: 0.26.0 -> 0.32.0 new c23165f babl: upgrade 0.1.62 -> 0.1.74 new d55b2dc gegl: upgrade 0.3.18 -> 0.4.20 new e4e8bb8 libmypaint: initial add 1.4.0 new c8734f7 mypaint-brushes: initial add 1.3.0 new 3b3f733 gimp: upgrade 2.8.22 -> 2.10.14 new 0b49236 packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome new 7e37a79 nginx: update to the latest stable version (1.16.1) new 4cc894a nginx: update to the latest development version (1.17.8) new efe0e21 python3-aiohttp: update to version 3.6.2 new 3650348 python3-aiohttp: alphabetize RDEPENDS for readability new 611b0c7 python3-alembic: update to version 1.4.0 The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 17 ++++++ ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 ++++++++++++ meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb | 61 ++++++++++++++++++++++ meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 60 +++++++++++++++++++++ meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb | 24 +++++++++ .../mypaint/mypaint-brushes-1.0_git.bb | 12 +++++ .../packagegroups/packagegroup-meta-oe.bb | 4 +- meta-oe/recipes-graphics/babl/babl_0.1.62.bb | 13 ----- meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 -------- meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 ------------ ...igure-ac-do-not-check-for-freetype-config.patch | 38 -------------- .../gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 ------------ .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 ------------------- meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 52 ------------------ .../recipes-devtools/python/python-alembic.inc | 15 ------ .../python/python3-aiohttp_3.5.4.bb | 2 - ...python-aiohttp.inc => python3-aiohttp_3.6.2.bb} | 12 ++--- .../python/python3-alembic_1.3.2.bb | 2 - .../python/python3-alembic_1.4.0.bb | 17 ++++++ meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb | 6 +++ meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb | 6 --- .../nginx/{nginx_1.16.0.bb => nginx_1.17.8.bb} | 4 +- 22 files changed, 239 insertions(+), 280 deletions(-) create mode 100644 meta-gnome/recipes-gimp/babl/babl_0.1.74.bb create mode 100644 meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch create mode 100644 meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb create mode 100644 meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb create mode 100644 meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb create mode 100644 meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb delete mode 100644 meta-oe/recipes-graphics/babl/babl_0.1.62.bb delete mode 100644 meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch delete mode 100644 meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb delete mode 100644 meta-python/recipes-devtools/python/python-alembic.inc delete mode 100644 meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb rename meta-python/recipes-devtools/python/{python-aiohttp.inc => python3-aiohttp_3.6.2.bb} (76%) delete mode 100644 meta-python/recipes-devtools/python/python3-alembic_1.3.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-alembic_1.4.0.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb rename meta-webserver/recipes-httpd/nginx/{nginx_1.16.0.bb => nginx_1.17.8.bb} (64%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:47 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.0C1FB232A48@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0b492366144bb8956389b222fb58269caefa0605 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:53 2020 +0100 packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 865cbb0..929e7d5 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -172,8 +172,8 @@ RDEPENDS_packagegroup-meta-oe-gnome ="\ " RDEPENDS_packagegroup-meta-oe-graphics ="\ - babl cairomm dietsplash directfb directfb-examples dnfdragora \ - fbgrab fbida fontforge fvwm gegl gimp glm gphoto2 libgphoto2 \ + cairomm dietsplash directfb directfb-examples dnfdragora \ + fbgrab fbida fontforge fvwm glm gphoto2 libgphoto2 \ gtkperf jasper leptonica libmng libsdl2-image libsdl2-mixer libsdl2-net \ libsdl-gfx libsdl-image libsdl-mixer libsdl-net libsdl-ttf \ libvncserver libyui libyui-ncurses lxdm numlockx openbox openjpeg \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:48 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: nginx: update to the latest stable version (1.16.1) In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.168F8232A49@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7e37a79e24cdb52a1ac57d89ee87ae56cef746bc Author: Derek Straka AuthorDate: Sun Feb 9 11:00:35 2020 -0500 nginx: update to the latest stable version (1.16.1) See changlog here: https://nginx.org/en/CHANGES-1.16 * Fixes CVE-2019-9511, CVE-2019-9513, CVE-2019-9516 Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb | 10 ---------- meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb deleted file mode 100644 index cad0db6..0000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.16.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.16.x branch is the current stable branch, the recommended default -# 1.17.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "97207283f30cd90cdba638c3ea30323a" -SRC_URI[sha256sum] = "4fd376bad78797e7f18094a00f0f1088259326436b537eb5af69b01be2ca1345" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb new file mode 100644 index 0000000..2076425 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" + +SRC_URI[md5sum] = "45a80f75336c980d240987badc3dcf60" +SRC_URI[sha256sum] = "f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:49 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: nginx: update to the latest development version (1.17.8) In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.203F6232A4A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4cc894ad99f750500f57925ffc3042fe83431443 Author: Derek Straka AuthorDate: Sun Feb 9 11:05:36 2020 -0500 nginx: update to the latest development version (1.17.8) See Changelog: https://nginx.org/en/CHANGES Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb | 6 ------ meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb deleted file mode 100644 index 8774a87..0000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "56767fd62302508295b31adc48b99a59" -SRC_URI[sha256sum] = "e21b5d06cd53e86afb94f0b3678e0abb0c0f011433471fa3d895cefa65ae0fab" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb new file mode 100644 index 0000000..3d2a5ed --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.16.x branch is the current stable branch, the recommended default +# 1.17.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" + +SRC_URI[md5sum] = "29cd861a13aae69a058cbabaae86177b" +SRC_URI[sha256sum] = "97d23ecf6d5150b30e284b40e8a6f7e3bb5be6b601e373a4d013768d5a25965b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:51 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: python3-aiohttp: alphabetize RDEPENDS for readability In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.3367F232A4C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 365034834a1193d36c730d9eebb9a4dd1b8399fc Author: Derek Straka AuthorDate: Sun Feb 9 11:33:00 2020 -0500 python3-aiohttp: alphabetize RDEPENDS for readability Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb index 979acc9..121447c 100644 --- a/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb +++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb @@ -11,11 +11,11 @@ PYPI_PACKAGE = "aiohttp" inherit setuptools3 pypi RDEPENDS_${PN} = "\ ${PYTHON_PN}-async-timeout \ + ${PYTHON_PN}-attrs \ ${PYTHON_PN}-chardet \ ${PYTHON_PN}-idna-ssl \ + ${PYTHON_PN}-misc \ ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-yarl \ ${PYTHON_PN}-typing \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-yarl \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:50 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: python3-aiohttp: update to version 3.6.2 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.2ABED232A4B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit efe0e21b40035936e7f36bf5ff4c7f9fced497b9 Author: Derek Straka AuthorDate: Sun Feb 9 11:32:59 2020 -0500 python3-aiohttp: update to version 3.6.2 Consolidate inc & bb file into a single python3 version Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb | 2 -- .../python/{python-aiohttp.inc => python3-aiohttp_3.6.2.bb} | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb deleted file mode 100644 index cd0303f..0000000 --- a/meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-aiohttp.inc diff --git a/meta-python/recipes-devtools/python/python-aiohttp.inc b/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb similarity index 76% rename from meta-python/recipes-devtools/python/python-aiohttp.inc rename to meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb index e711ad7..979acc9 100644 --- a/meta-python/recipes-devtools/python/python-aiohttp.inc +++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb @@ -4,11 +4,11 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cf056e8e7a0a5477451af18b7b5aa98c" -SRC_URI[md5sum] = "85fe5c9037256c58d4678148bd91b3f3" -SRC_URI[sha256sum] = "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf" +SRC_URI[md5sum] = "ca40144c199a09fc1a141960cf6295f0" +SRC_URI[sha256sum] = "259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326" PYPI_PACKAGE = "aiohttp" -inherit pypi +inherit setuptools3 pypi RDEPENDS_${PN} = "\ ${PYTHON_PN}-async-timeout \ ${PYTHON_PN}-chardet \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:46 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: gimp: upgrade 2.8.22 -> 2.10.14 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.01E76232A47@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3b3f73379864a3d49b81db068436800198ab26d9 Author: Andreas M?ller AuthorDate: Sun Feb 9 16:10:52 2020 +0100 gimp: upgrade 2.8.22 -> 2.10.14 * patches don't apply any more * get sources from location gimp's homepage suggests * license checksum was changed by replacing http -> https [1] [1] https://gitlab.gnome.org/GNOME/gimp/commit/bab75b7365cc87639cd5aaa9840ebe1f6228d556 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 60 ++++++++++++++++++++++ ...igure-ac-do-not-check-for-freetype-config.patch | 38 -------------- .../gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 ------------ .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 ------------------- meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 52 ------------------- 5 files changed, 60 insertions(+), 177 deletions(-) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb new file mode 100644 index 0000000..045958d --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb @@ -0,0 +1,60 @@ +SUMMARY = "The GIMP is the GNU Image Manipulation Program" +HOMEPAGE = "http://www.gimp.org" +SECTION = "x11/graphics" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" + +DEPENDS = " \ + gdk-pixbuf-native \ + intltool-native \ + libxslt-native \ + gegl-native \ + dbus-glib \ + gtk+ \ + babl \ + gegl \ + libmypaint \ + mypaint-brushes-1.0 \ + gexiv2 \ + jpeg \ + libpng \ + libexif \ + tiff \ + lcms \ + poppler \ + poppler-data \ + jasper \ + bzip2 \ + libgudev \ + libmng \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \ +" + +inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI[md5sum] = "a64f2be299755a2da130306cad9b1d26" +SRC_URI[sha256sum] = "df9b0f11c2078eea1de3ebc66529a5d3854c5e28636cd25a8dd077bd9d6ddc54" + +EXTRA_OECONF = "--disable-python \ + --without-webkit \ + --without-wmf" + +do_configure_append() { + find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +do_compile_prepend() { + # Let native babl/gegl find their plugins + export BABL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'babl-*'` + export GEGL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'gegl-*'` +} + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "mypaint-brushes-1.0" diff --git a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch deleted file mode 100644 index fecd012..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 72ad76841d87e857428693d812a961935284ac62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 12 Feb 2015 15:57:47 +0100 -Subject: [PATCH] configure-ac: do not check for freetype-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -freetype-config is not allowed in our environment - see also binconfig-disabled - -Upstream-Status: inappropriate [OE specific] - -Signed-off-by: Andreas M?ller ---- - configure.ac | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 26812b6..abec714 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -647,13 +647,6 @@ if test "x$fontconfig_ok" = xno; then - fi - - --AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) --if test "x$FREETYPE_CONFIG" != "xno" ; then -- AC_MSG_CHECKING([for freetype libraries]) -- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` -- AC_MSG_RESULT($FREETYPE_LIBS) --fi --AC_SUBST(FREETYPE_LIBS) - - - ########################################## --- -1.9.3 - diff --git a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch deleted file mode 100644 index 7da78e2..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Jun 2017 10:32:14 -0700 -Subject: [PATCH 3/3] Fix use of gegl API - -newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE - -| core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate': -| /usr/src/debug/gimp/2.8.22-r0/gimp-2.8.22/app/core/../../../../../../../../../workspace/sources/gimp/app/core/gimpparamspecs-duplicate.c:70: undefined reference to `GEGL_IS_PARAM_SPEC_MULTILINE' -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - app/core/gimpparamspecs-duplicate.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c -index c0b7426..2efaf23 100644 ---- a/app/core/gimpparamspecs-duplicate.c -+++ b/app/core/gimpparamspecs-duplicate.c -@@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec) - spec->default_value, - pspec->flags); - -- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) -+ if (gegl_param_spec_get_property_key(pspec, "multiline")) - { - g_param_spec_set_qdata (new, multiline_quark, - GINT_TO_POINTER (TRUE)); --- -2.13.2 - diff --git a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch deleted file mode 100644 index b71bf32..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch +++ /dev/null @@ -1,53 +0,0 @@ -Bump acceptable versions of babl and gegl. - -Patch is taken from debian: -https://packages.debian.org/stretch/gimp - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Alexander Kanavin -diff --git a/app/sanity.c b/app/sanity.c -index febddfb..85fea55 100644 ---- a/app/sanity.c -+++ b/app/sanity.c -@@ -351,7 +351,7 @@ sanity_check_babl (void) - - #define BABL_REQUIRED_MAJOR 0 - #define BABL_REQUIRED_MINOR 1 --#define BABL_REQUIRED_MICRO 10 -+#define BABL_REQUIRED_MICRO 12 - - babl_get_version (&babl_major_version, - &babl_minor_version, -@@ -388,7 +388,7 @@ sanity_check_gegl (void) - gint gegl_micro_version; - - #define GEGL_REQUIRED_MAJOR 0 --#define GEGL_REQUIRED_MINOR 2 -+#define GEGL_REQUIRED_MINOR 3 - #define GEGL_REQUIRED_MICRO 0 - - gegl_get_version (&gegl_major_version, -diff --git a/configure.ac b/configure.ac -index 26812b6..4252fe9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,8 +40,8 @@ m4_define([gimp_stable], - m4_define([gimp_full_name], [GNU Image Manipulation Program]) - - # required versions of other packages --m4_define([babl_required_version], [0.1.10]) --m4_define([gegl_required_version], [0.2.0]) -+m4_define([babl_required_version], [0.1.12]) -+m4_define([gegl_required_version], [0.3.0]) - m4_define([glib_required_version], [2.30.2]) - m4_define([atk_required_version], [2.2.0]) - m4_define([gtk_required_version], [2.24.10]) -@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR) - ############################### - - PKG_CHECK_MODULES(BABL, babl >= babl_required_version) --PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version) -+PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) - PKG_CHECK_MODULES(ATK, atk >= atk_required_version) - - AM_PATH_GLIB_2_0(glib_required_version, :, diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb deleted file mode 100644 index 718f899..0000000 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "The GIMP is the GNU Image Manipulation Program" -HOMEPAGE = "http://www.gimp.org" -SECTION = "x11/graphics" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = " \ - gdk-pixbuf-native \ - intltool-native \ - libxslt-native \ - dbus-glib \ - gtk+ \ - babl \ - gegl \ - jpeg \ - libpng \ - libexif \ - tiff \ - lcms \ - poppler \ - jasper \ - bzip2 \ - libgudev \ - libmng \ -" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" - -inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ - file://0001-configure-ac-do-not-check-for-freetype-config.patch \ - file://bump_Babl-GEGL_versions.patch \ - file://0003-Fix-use-of-gegl-API.patch \ - " -SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d" -SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a" - -EXTRA_OECONF = "--disable-python \ - --without-webkit \ - --without-wmf" - -do_configure_append() { - find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g -} - -CFLAGS += "-fPIC" - -FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" -FILES_${PN} += "${datadir}/appdata" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:31:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:31:52 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: python3-alembic: update to version 1.4.0 In-Reply-To: <158131630142.13993.8413098794402522669@git.openembedded.org> References: <158131630142.13993.8413098794402522669@git.openembedded.org> Message-ID: <20200210063142.3C29B232A4D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 611b0c707aa889b1b3880687334b6dd0fd69479b Author: Derek Straka AuthorDate: Sun Feb 9 11:38:59 2020 -0500 python3-alembic: update to version 1.4.0 Update license checksum for copyright change to 2020 Verified license remains MIT Consolidated inc & bb file for python3 only recipe Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-alembic.inc | 15 --------------- .../recipes-devtools/python/python3-alembic_1.3.2.bb | 2 -- .../recipes-devtools/python/python3-alembic_1.4.0.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-alembic.inc b/meta-python/recipes-devtools/python/python-alembic.inc deleted file mode 100644 index c94c142..0000000 --- a/meta-python/recipes-devtools/python/python-alembic.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "A database migration tool for SQLAlchemy" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=28aaf14a6592d14dbfb2f4abd597aa27" - -SRC_URI[md5sum] = "3d7584a8fb0203ec82b90baa726d2bd9" -SRC_URI[sha256sum] = "3b0cb1948833e062f4048992fbc97ecfaaaac24aaa0d83a1202a99fb58af8c6d" - -PYPI_PACKAGE = "alembic" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-editor \ - ${PYTHON_PN}-mako \ - ${PYTHON_PN}-sqlalchemy \ -" diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.3.2.bb b/meta-python/recipes-devtools/python/python3-alembic_1.3.2.bb deleted file mode 100644 index e248fe7..0000000 --- a/meta-python/recipes-devtools/python/python3-alembic_1.3.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-alembic.inc diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.4.0.bb b/meta-python/recipes-devtools/python/python3-alembic_1.4.0.bb new file mode 100644 index 0000000..8247166 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-alembic_1.4.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A database migration tool for SQLAlchemy" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bd64aba1b968c2bfbc2b525a181ce85c" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "758b28361557e45c79c454d662131a83" +SRC_URI[sha256sum] = "2df2519a5b002f881517693b95626905a39c5faf4b5a1f94de4f1441095d1d26" + +PYPI_PACKAGE = "alembic" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-editor \ + ${PYTHON_PN}-mako \ + ${PYTHON_PN}-sqlalchemy \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 06:32:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 06:32:54 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (fd2765b -> 611b0c7) Message-ID: <158131637432.14977.18111992877022500730@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from fd2765b smem: update to v1.5 (python3 compatibility) add a44430f mdns: improve numerous aspects of Posix backend add 502084c freeradius: upgrade 3.0.19 -> 3.0.20 add dda2962 dbus-broker: backport patches to fix policy with SELinux nodes add a30ceda modemmanager: Add a PACKAGECONFIG for the new --with-at-command-via-dbus option add 74acdba libchamplain: Add support for building libchamplain add 208b2fe tigervnc: Do not depend on chkconfig add 835358a mpv: 0.26.0 -> 0.32.0 add c23165f babl: upgrade 0.1.62 -> 0.1.74 add d55b2dc gegl: upgrade 0.3.18 -> 0.4.20 add e4e8bb8 libmypaint: initial add 1.4.0 add c8734f7 mypaint-brushes: initial add 1.3.0 add 3b3f733 gimp: upgrade 2.8.22 -> 2.10.14 add 0b49236 packagegroup-meta-oe: remove babl/gegl/gimp they moved to meta-gnome add 7e37a79 nginx: update to the latest stable version (1.16.1) add 4cc894a nginx: update to the latest development version (1.17.8) add efe0e21 python3-aiohttp: update to version 3.6.2 add 3650348 python3-aiohttp: alphabetize RDEPENDS for readability add 611b0c7 python3-alembic: update to version 1.4.0 No new revisions were added by this update. Summary of changes: meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 17 ++ ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 ++++ meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb | 61 ++++++ meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 60 ++++++ meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb | 24 +++ .../mypaint/mypaint-brushes-1.0_git.bb | 12 ++ .../libchamplain/libchamplain_0.12.20.bb | 12 ++ ...-rlm_python3-add-PY_INC_DIR-in-search-dir.patch | 58 ++++++ ...-to-radiusd-user-group-when-rotating-logs.patch | 104 ---------- .../{freeradius_3.0.19.bb => freeradius_3.0.20.bb} | 35 ++-- ...subroutine-for-cleaning-recent-interfaces.patch | 60 ++++++ ...-subroutine-for-tearing-down-an-interface.patch | 58 ++++++ .../files/0003-Track-interface-socket-family.patch | 50 +++++ .../0004-Use-list-for-changed-interfaces.patch | 177 +++++++++++++++++ .../files/0005-Handle-noisy-netlink-sockets.patch | 212 +++++++++++++++++++++ .../mdns/files/0006-Remove-unneeded-function.patch | 51 +++++ ...-Indicate-loopback-interface-to-mDNS-core.patch | 129 +++++++++++++ ...-Mark-deleted-interfaces-as-being-changed.patch | 39 ++++ .../files/0009-Fix-possible-NULL-dereference.patch | 45 +++++ .../0010-Handle-errors-from-socket-calls.patch | 62 ++++++ ...dynamic-allocation-to-file-scope-variable.patch | 51 +++++ .../recipes-protocols/mdns/mdns_878.260.1.bb | 11 ++ .../modemmanager/modemmanager_1.12.4.bb | 1 + ...h-policy-fix-crash-when-importing-selinux.patch | 50 +++++ ...h-policy-fix-crash-when-exporting-selinux.patch | 59 ++++++ meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 + .../packagegroups/packagegroup-meta-oe.bb | 6 +- meta-oe/recipes-graphics/babl/babl_0.1.62.bb | 13 -- meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 -- meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 ---- ...igure-ac-do-not-check-for-freetype-config.patch | 38 ---- .../gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 ---- .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 ------ meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 52 ----- .../recipes-graphics/tigervnc/tigervnc_1.10.1.bb | 2 +- .../mplayer/mpv}/python3.patch | 0 meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 85 --------- meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 115 +++++++++++ .../recipes-devtools/python/python-alembic.inc | 15 -- .../python/python3-aiohttp_3.5.4.bb | 2 - ...python-aiohttp.inc => python3-aiohttp_3.6.2.bb} | 12 +- .../python/python3-alembic_1.3.2.bb | 2 - .../python/python3-alembic_1.4.0.bb | 17 ++ meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb | 6 + meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb | 6 - .../nginx/{nginx_1.16.0.bb => nginx_1.17.8.bb} | 4 +- 46 files changed, 1502 insertions(+), 487 deletions(-) create mode 100644 meta-gnome/recipes-gimp/babl/babl_0.1.74.bb create mode 100644 meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch create mode 100644 meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb create mode 100644 meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb create mode 100644 meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb create mode 100644 meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb create mode 100644 meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb create mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch delete mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch rename meta-networking/recipes-connectivity/freeradius/{freeradius_3.0.19.bb => freeradius_3.0.20.bb} (88%) create mode 100644 meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0005-Handle-noisy-netlink-sockets.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0007-Indicate-loopback-interface-to-mDNS-core.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch create mode 100644 meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch create mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch create mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch delete mode 100644 meta-oe/recipes-graphics/babl/babl_0.1.62.bb delete mode 100644 meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch delete mode 100644 meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch delete mode 100644 meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb copy meta-oe/{recipes-benchmark/glmark2/glmark2 => recipes-multimedia/mplayer/mpv}/python3.patch (100%) delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb delete mode 100644 meta-python/recipes-devtools/python/python-alembic.inc delete mode 100644 meta-python/recipes-devtools/python/python3-aiohttp_3.5.4.bb rename meta-python/recipes-devtools/python/{python-aiohttp.inc => python3-aiohttp_3.6.2.bb} (76%) delete mode 100644 meta-python/recipes-devtools/python/python3-alembic_1.3.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-alembic_1.4.0.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.17.0.bb rename meta-webserver/recipes-httpd/nginx/{nginx_1.16.0.bb => nginx_1.17.8.bb} (64%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:51 +0000 Subject: [oe-commits] [meta-openembedded] 01/15: python3-aiofiles: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.79880232A44@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 036169ad7b9efa5995c3460b0c25ca306a888b41 Author: Derek Straka AuthorDate: Sun Feb 9 19:08:28 2020 -0500 python3-aiofiles: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-aiofiles.inc | 14 -------------- .../recipes-devtools/python/python3-aiofiles_0.4.0.bb | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-aiofiles.inc b/meta-python/recipes-devtools/python/python-aiofiles.inc deleted file mode 100644 index 3ecb21c..0000000 --- a/meta-python/recipes-devtools/python/python-aiofiles.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "File support for asyncio" -DESCRIPTION = "Asynchronous local file IO library for asyncio and Python" -HOMEPAGE = "https://github.com/aio-libs/aiohttp" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" - -SRC_URI[md5sum] = "cb33cf96c371fbd56fc27ab0bd81bd61" -SRC_URI[sha256sum] = "021ea0ba314a86027c166ecc4b4c07f2d40fc0f4b3a950d1868a0f2571c2bbee" - -PYPI_PACKAGE = "aiofiles" -inherit pypi -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-asyncio \ -" diff --git a/meta-python/recipes-devtools/python/python3-aiofiles_0.4.0.bb b/meta-python/recipes-devtools/python/python3-aiofiles_0.4.0.bb index b4d188b..b21cade 100644 --- a/meta-python/recipes-devtools/python/python3-aiofiles_0.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-aiofiles_0.4.0.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-aiofiles.inc +SUMMARY = "File support for asyncio" +DESCRIPTION = "Asynchronous local file IO library for asyncio and Python" +HOMEPAGE = "https://github.com/aio-libs/aiohttp" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +SRC_URI[md5sum] = "cb33cf96c371fbd56fc27ab0bd81bd61" +SRC_URI[sha256sum] = "021ea0ba314a86027c166ecc4b4c07f2d40fc0f4b3a950d1868a0f2571c2bbee" + +PYPI_PACKAGE = "aiofiles" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-asyncio \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:53 +0000 Subject: [oe-commits] [meta-openembedded] 03/15: python3-appdirs: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.8DB84232A46@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 299e3ac8859e8f0869c1f614a439aaead6167415 Author: Derek Straka AuthorDate: Sun Feb 9 19:17:29 2020 -0500 python3-appdirs: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-appdirs.inc | 8 -------- meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb | 10 ++++++++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-appdirs.inc b/meta-python/recipes-devtools/python/python-appdirs.inc deleted file mode 100644 index c482672..0000000 --- a/meta-python/recipes-devtools/python/python-appdirs.inc +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "A small Python module for determining appropriate + platform-specific dirs, e.g. a user data dir." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=31625363c45eb0c67c630a2f73e438e4" - -SRC_URI[md5sum] = "44c679904082a2133f5566c8a0d3ab42" -SRC_URI[sha256sum] = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92" - -inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb b/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb index d24e1d8..6c01580 100644 --- a/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb +++ b/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb @@ -1,2 +1,8 @@ -inherit setuptools3 -require python-appdirs.inc +SUMMARY = "A small Python module for determining appropriate + platform-specific dirs, e.g. a user data dir." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=31625363c45eb0c67c630a2f73e438e4" + +SRC_URI[md5sum] = "44c679904082a2133f5566c8a0d3ab42" +SRC_URI[sha256sum] = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92" + +inherit pypi setuptools3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:52 +0000 Subject: [oe-commits] [meta-openembedded] 02/15: python3-anyjson: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.839DE232A45@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 999b334c6c459f47f1e89abba6aac094b73755d8 Author: Derek Straka AuthorDate: Sun Feb 9 19:12:36 2020 -0500 python3-anyjson: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-anyjson.inc | 13 ------------- .../recipes-devtools/python/python3-anyjson_0.3.3.bb | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-anyjson.inc b/meta-python/recipes-devtools/python/python-anyjson.inc deleted file mode 100644 index a0d20ff..0000000 --- a/meta-python/recipes-devtools/python/python-anyjson.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Wraps the best available JSON implementation available in a common interface" -DESCRIPTION = "Anyjson loads whichever is the fastest JSON module installed and \ -provides a uniform API regardless of which JSON implementation is used." -HOMEPAGE = "https://bitbucket.org/runeh/anyjson" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=989aa97e73c912a83a3c873fa11deb08" - -inherit pypi - -SRC_URI[md5sum] = "2ea28d6ec311aeeebaf993cb3008b27c" -SRC_URI[sha256sum] = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba" - -RDEPENDS_${PN} += "${PYTHON_PN}-simplejson" diff --git a/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb b/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb index 199e225..91c6672 100644 --- a/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb @@ -1,2 +1,13 @@ -inherit setuptools3 -require python-anyjson.inc +SUMMARY = "Wraps the best available JSON implementation available in a common interface" +DESCRIPTION = "Anyjson loads whichever is the fastest JSON module installed and \ +provides a uniform API regardless of which JSON implementation is used." +HOMEPAGE = "https://bitbucket.org/runeh/anyjson" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=989aa97e73c912a83a3c873fa11deb08" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "2ea28d6ec311aeeebaf993cb3008b27c" +SRC_URI[sha256sum] = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba" + +RDEPENDS_${PN} += "${PYTHON_PN}-simplejson" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:50 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (611b0c7 -> df65d98) Message-ID: <158131817011.8965.13278168184957802207@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 611b0c7 python3-alembic: update to version 1.4.0 new 036169a python3-aiofiles: consolidate inc and bb files into a single bb file new 999b334 python3-anyjson: consolidate inc and bb files into a single bb file new 299e3ac python3-appdirs: consolidate inc and bb files into a single bb file new 0e902f8 python3-asn1crypto: consolidate inc and bb files into a single bb file new 6c2b3ae python3-astroid: consolidate inc and bb files into a single bb file new 190dc15 python3-async-timeout: consolidate inc and bb files into a single bb file new bd1d27c python3-atomicwrites: consolidate inc and bb files into a single bb file new b9db125 python3-attr: consolidate inc and bb files into a single bb file new 04cd18f python3-attrs: consolidate inc and bb files into a single bb file new 6b9db43 python3-automat: consolidate inc and bb files into a single bb file new d2cdaa9 python3-aws-iot-device-sdk-python: consolidate inc and bb files into a single bb file new 17bf230 python3-babel: consolidate inc and bb files into a single bb file new 4fc03d0 python3-babel: upgrade to version 2.8.0 new c6e9762 python3-backports-functools-lru-cache: consolidate inc and bb files into a single bb file new df65d98 python3-backports-functools-lru-cache: update to version 1.6.1 The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-devtools/python/python-aiofiles.inc | 14 ------- .../recipes-devtools/python/python-anyjson.inc | 13 ------- .../recipes-devtools/python/python-appdirs.inc | 8 ---- .../recipes-devtools/python/python-asn1crypto.inc | 23 ------------ .../recipes-devtools/python/python-astroid.inc | 33 ----------------- .../python/python-async-timeout.inc | 19 ---------- .../python/python-atomicwrites.inc | 7 ---- .../recipes-devtools/python/python-attr.inc | 9 ----- .../recipes-devtools/python/python-attrs.inc | 16 -------- .../recipes-devtools/python/python-automat.inc | 24 ------------ .../python/python-aws-iot-device-sdk-python.inc | 41 --------------------- .../python/python3-aiofiles_0.4.0.bb | 18 ++++++++- .../python/python3-anyjson_0.3.3.bb | 15 +++++++- .../python/python3-appdirs_1.4.3.bb | 10 ++++- .../python/python3-asn1crypto_1.3.0.bb | 22 ++++++++++- .../python/python3-astroid_2.3.3.bb | 35 +++++++++++++++++- .../python/python3-async-timeout_3.0.1.bb | 21 ++++++++++- .../python/python3-atomicwrites_1.3.0.bb | 9 ++++- .../recipes-devtools/python/python3-attr_0.3.1.bb | 11 +++++- .../python/python3-attrs_19.3.0.bb | 18 ++++++++- ...001-setup.py-remove-the-dependency-on-m2r.patch | 0 .../python/python3-automat_0.8.0.bb | 23 +++++++++++- .../python3-aws-iot-device-sdk-python_1.4.7.bb | 43 +++++++++++++++++++++- .../recipes-devtools/python/python3-babel_2.7.0.bb | 2 - .../{python-babel.inc => python3-babel_2.8.0.bb} | 6 +-- .../python3-backports-functools-lru-cache_1.5.bb | 2 - ...python3-backports-functools-lru-cache_1.6.1.bb} | 8 ++-- 27 files changed, 211 insertions(+), 239 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-aiofiles.inc delete mode 100644 meta-python/recipes-devtools/python/python-anyjson.inc delete mode 100644 meta-python/recipes-devtools/python/python-appdirs.inc delete mode 100644 meta-python/recipes-devtools/python/python-asn1crypto.inc delete mode 100644 meta-python/recipes-devtools/python/python-astroid.inc delete mode 100644 meta-python/recipes-devtools/python/python-async-timeout.inc delete mode 100644 meta-python/recipes-devtools/python/python-atomicwrites.inc delete mode 100644 meta-python/recipes-devtools/python/python-attr.inc delete mode 100644 meta-python/recipes-devtools/python/python-attrs.inc delete mode 100644 meta-python/recipes-devtools/python/python-automat.inc delete mode 100644 meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc rename meta-python/recipes-devtools/python/{python-automat => python3-automat}/0001-setup.py-remove-the-dependency-on-m2r.patch (100%) delete mode 100644 meta-python/recipes-devtools/python/python3-babel_2.7.0.bb rename meta-python/recipes-devtools/python/{python-babel.inc => python3-babel_2.8.0.bb} (77%) delete mode 100644 meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb rename meta-python/recipes-devtools/python/{python-backports-functools-lru-cache.inc => python3-backports-functools-lru-cache_1.6.1.bb} (58%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:54 +0000 Subject: [oe-commits] [meta-openembedded] 04/15: python3-asn1crypto: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.98E94232A47@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0e902f8eb1096daaa85b6d11872dbcd0a62e518a Author: Derek Straka AuthorDate: Sun Feb 9 19:21:54 2020 -0500 python3-asn1crypto: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-asn1crypto.inc | 23 ---------------------- .../python/python3-asn1crypto_1.3.0.bb | 22 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-asn1crypto.inc b/meta-python/recipes-devtools/python/python-asn1crypto.inc deleted file mode 100644 index de6e1a5..0000000 --- a/meta-python/recipes-devtools/python/python-asn1crypto.inc +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 structures" -HOMEPAGE = "https://github.com/wbond/asn1crypto" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" - -PYPI_PACKAGE = "asn1crypto" - -SRC_URI[md5sum] = "daad112940181917e3ff169b47b9bd9a" -SRC_URI[sha256sum] = "5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d" - -inherit pypi - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb b/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb index cfbe575..1b03c66 100644 --- a/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb @@ -1,6 +1,24 @@ -inherit setuptools3 -require python-asn1crypto.inc +DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 structures" +HOMEPAGE = "https://github.com/wbond/asn1crypto" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" + +PYPI_PACKAGE = "asn1crypto" + +SRC_URI[md5sum] = "daad112940181917e3ff169b47b9bd9a" +SRC_URI[sha256sum] = "5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d" + +inherit pypi setuptools3 RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netclient \ ${PYTHON_PN}-shell \ " + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:56 +0000 Subject: [oe-commits] [meta-openembedded] 06/15: python3-async-timeout: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.AE690232A49@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 190dc15e40a00f6e37e6d0ff3fc162f5d976e65e Author: Derek Straka AuthorDate: Sun Feb 9 19:31:01 2020 -0500 python3-async-timeout: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-async-timeout.inc | 19 ------------------- .../python/python3-async-timeout_3.0.1.bb | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-async-timeout.inc b/meta-python/recipes-devtools/python/python-async-timeout.inc deleted file mode 100644 index e71a002..0000000 --- a/meta-python/recipes-devtools/python/python-async-timeout.inc +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "asyncio-compatible timeout context manager" -DESCRIPTION = "\ -The context manager is useful in cases when you want to apply \ -timeout logic around block of code or in cases when asyncio.wait_for() \ -is not suitable. Also it's much faster than asyncio.wait_for() because \ -timeout doesn't create a new task." -HOMEPAGE = "https://github.com/aio-libs/async-timeout" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI[md5sum] = "305c4fa529f2485c403d0dbe14390175" -SRC_URI[sha256sum] = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f" - -PYPI_PACKAGE = "async-timeout" -inherit pypi - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-asyncio \ -" diff --git a/meta-python/recipes-devtools/python/python3-async-timeout_3.0.1.bb b/meta-python/recipes-devtools/python/python3-async-timeout_3.0.1.bb index 7e2ffdb..22dffe6 100644 --- a/meta-python/recipes-devtools/python/python3-async-timeout_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-async-timeout_3.0.1.bb @@ -1,2 +1,19 @@ -inherit setuptools3 -require python-async-timeout.inc +SUMMARY = "asyncio-compatible timeout context manager" +DESCRIPTION = "\ +The context manager is useful in cases when you want to apply \ +timeout logic around block of code or in cases when asyncio.wait_for() \ +is not suitable. Also it's much faster than asyncio.wait_for() because \ +timeout doesn't create a new task." +HOMEPAGE = "https://github.com/aio-libs/async-timeout" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +SRC_URI[md5sum] = "305c4fa529f2485c403d0dbe14390175" +SRC_URI[sha256sum] = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f" + +PYPI_PACKAGE = "async-timeout" +inherit pypi setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-asyncio \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:58 +0000 Subject: [oe-commits] [meta-openembedded] 08/15: python3-attr: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.C22DB232A4B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b9db12564a71599dda3ad3b3d5481f9883712238 Author: Derek Straka AuthorDate: Sun Feb 9 19:37:48 2020 -0500 python3-attr: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-attr.inc | 9 --------- meta-python/recipes-devtools/python/python3-attr_0.3.1.bb | 11 +++++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-attr.inc b/meta-python/recipes-devtools/python/python-attr.inc deleted file mode 100644 index 1d93dd7..0000000 --- a/meta-python/recipes-devtools/python/python-attr.inc +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Simple decorator to set attributes of target function or class in a DRY way" -HOMEPAGE = "https://github.com/denis-ryzhkov/attr" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=59805a0285f4d2b6abdedae73db4f5c1" - -SRC_URI[md5sum] = "68b9a503991241fb2df28488686b0e1e" -SRC_URI[sha256sum] = "9091548058d17f132596e61fa7518e504f76b9a4c61ca7d86e1f96dbf7d4775d" - -inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb b/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb index e80648c..22c5218 100644 --- a/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb @@ -1,2 +1,9 @@ -inherit setuptools3 -require python-attr.inc +DESCRIPTION = "Simple decorator to set attributes of target function or class in a DRY way" +HOMEPAGE = "https://github.com/denis-ryzhkov/attr" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=59805a0285f4d2b6abdedae73db4f5c1" + +SRC_URI[md5sum] = "68b9a503991241fb2df28488686b0e1e" +SRC_URI[sha256sum] = "9091548058d17f132596e61fa7518e504f76b9a4c61ca7d86e1f96dbf7d4775d" + +inherit pypi setuptools3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:57 +0000 Subject: [oe-commits] [meta-openembedded] 07/15: python3-atomicwrites: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.B8BD9232A4A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bd1d27c7253f96e5b979a67a37beab0b0a441939 Author: Derek Straka AuthorDate: Sun Feb 9 19:35:12 2020 -0500 python3-atomicwrites: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-atomicwrites.inc | 7 ------- .../recipes-devtools/python/python3-atomicwrites_1.3.0.bb | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-atomicwrites.inc b/meta-python/recipes-devtools/python/python-atomicwrites.inc deleted file mode 100644 index 773e9dd..0000000 --- a/meta-python/recipes-devtools/python/python-atomicwrites.inc +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Powerful Python library for atomic file writes" -HOMEPAGE = "https://github.com/untitaker/python-atomicwrites" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91cc36cfafeefb7863673bcfcb1d4da4" - -SRC_URI[md5sum] = "ce11f780a4ce0fce8a55d64494a88178" -SRC_URI[sha256sum] = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" diff --git a/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb b/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb index 9f306e6..04bbed7 100644 --- a/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb @@ -1,2 +1,9 @@ +DESCRIPTION = "Powerful Python library for atomic file writes" +HOMEPAGE = "https://github.com/untitaker/python-atomicwrites" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91cc36cfafeefb7863673bcfcb1d4da4" + +SRC_URI[md5sum] = "ce11f780a4ce0fce8a55d64494a88178" +SRC_URI[sha256sum] = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" + inherit pypi setuptools3 -require python-atomicwrites.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:59 +0000 Subject: [oe-commits] [meta-openembedded] 09/15: python3-attrs: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.CCB86232A4C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 04cd18f1d986daa3e7b9802e55d33d03429db4d6 Author: Derek Straka AuthorDate: Sun Feb 9 19:40:54 2020 -0500 python3-attrs: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-attrs.inc | 16 ---------------- .../recipes-devtools/python/python3-attrs_19.3.0.bb | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-attrs.inc b/meta-python/recipes-devtools/python/python-attrs.inc deleted file mode 100644 index 35d28a4..0000000 --- a/meta-python/recipes-devtools/python/python-attrs.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Classes Without Boilerplate" -HOMEPAGE = "http://www.attrs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff" - -SRC_URI[sha256sum] = "f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72" -SRC_URI[md5sum] = "5b2db50fcc31be34d32798183c9bd062" - -inherit pypi - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-ctypes \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb b/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb index c34693f..b3739fd 100644 --- a/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-attrs.inc +DESCRIPTION = "Classes Without Boilerplate" +HOMEPAGE = "http://www.attrs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff" + +SRC_URI[sha256sum] = "f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72" +SRC_URI[md5sum] = "5b2db50fcc31be34d32798183c9bd062" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-ctypes \ +" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:03:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:03:02 +0000 Subject: [oe-commits] [meta-openembedded] 12/15: python3-babel: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.E98F3232A4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 17bf23038500816440f9f1eb22207fdb7aea4279 Author: Derek Straka AuthorDate: Sun Feb 9 20:10:46 2020 -0500 python3-babel: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-babel.inc | 27 -------------------- .../recipes-devtools/python/python3-babel_2.7.0.bb | 29 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-babel.inc b/meta-python/recipes-devtools/python/python-babel.inc deleted file mode 100644 index c55b459..0000000 --- a/meta-python/recipes-devtools/python/python-babel.inc +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "A collection of tools for internationalizing Python applications" -HOMEPAGE = "http://babel.edgewall.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=942469df9305abb1c59e95f778310384" - -SRC_URI[md5sum] = "83c158b7dae9135750a7cf204e6e2eea" -SRC_URI[sha256sum] = "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28" - -PYPI_PACKAGE = "Babel" - -inherit pypi - -CLEANBROKEN = "1" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-babel_2.7.0.bb b/meta-python/recipes-devtools/python/python3-babel_2.7.0.bb index 0715d59..45ff948 100644 --- a/meta-python/recipes-devtools/python/python3-babel_2.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-babel_2.7.0.bb @@ -1,2 +1,27 @@ -inherit setuptools3 -require python-babel.inc +DESCRIPTION = "A collection of tools for internationalizing Python applications" +HOMEPAGE = "http://babel.edgewall.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=942469df9305abb1c59e95f778310384" + +SRC_URI[md5sum] = "83c158b7dae9135750a7cf204e6e2eea" +SRC_URI[sha256sum] = "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28" + +PYPI_PACKAGE = "Babel" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:02:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:02:55 +0000 Subject: [oe-commits] [meta-openembedded] 05/15: python3-astroid: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.A4666232A48@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6c2b3ae7432bddde04965b6eec10931e6e34981e Author: Derek Straka AuthorDate: Sun Feb 9 19:27:50 2020 -0500 python3-astroid: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-astroid.inc | 33 -------------------- .../python/python3-astroid_2.3.3.bb | 35 ++++++++++++++++++++-- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-astroid.inc b/meta-python/recipes-devtools/python/python-astroid.inc deleted file mode 100644 index e9a6878..0000000 --- a/meta-python/recipes-devtools/python/python-astroid.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "An abstract syntax tree for Python with inference support." -HOMEPAGE = "https://pypi.python.org/pypi/astroid" -SECTION = "devel/python" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI[md5sum] = "5f3d73d82d1753b59bb49a6bc6046dee" -SRC_URI[sha256sum] = "71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a" - -inherit pypi - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -PACKAGES =+ "${PN}-tests" - -FILES_${PN}-tests += " \ - ${PYTHON_SITEPACKAGES_DIR}/astroid/test* \ - ${PYTHON_SITEPACKAGES_DIR}/astroid/__pycache__/test* \ -" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-lazy-object-proxy \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-wrapt \ - ${PYTHON_PN}-setuptools \ -" - -RDEPENDS_${PN}-tests_class-target += "\ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-xml \ -" diff --git a/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb b/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb index 6e32c28..dc1ce0e 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb @@ -1,2 +1,33 @@ -inherit setuptools3 -require python-astroid.inc +SUMMARY = "An abstract syntax tree for Python with inference support." +HOMEPAGE = "https://pypi.python.org/pypi/astroid" +SECTION = "devel/python" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI[md5sum] = "5f3d73d82d1753b59bb49a6bc6046dee" +SRC_URI[sha256sum] = "71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/astroid/test* \ + ${PYTHON_SITEPACKAGES_DIR}/astroid/__pycache__/test* \ +" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-lazy-object-proxy \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-wrapt \ + ${PYTHON_PN}-setuptools \ +" + +RDEPENDS_${PN}-tests_class-target += "\ + ${PYTHON_PN}-unittest \ + ${PYTHON_PN}-xml \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:03:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:03:03 +0000 Subject: [oe-commits] [meta-openembedded] 13/15: python3-babel: upgrade to version 2.8.0 In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070251.003D8232A50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4fc03d0f333f9e90d88fb1ce6a3b2c44f66ad504 Author: Derek Straka AuthorDate: Sun Feb 9 20:10:47 2020 -0500 python3-babel: upgrade to version 2.8.0 Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/{python3-babel_2.7.0.bb => python3-babel_2.8.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-babel_2.7.0.bb b/meta-python/recipes-devtools/python/python3-babel_2.8.0.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-babel_2.7.0.bb rename to meta-python/recipes-devtools/python/python3-babel_2.8.0.bb index 45ff948..c69098b 100644 --- a/meta-python/recipes-devtools/python/python3-babel_2.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-babel_2.8.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://babel.edgewall.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=942469df9305abb1c59e95f778310384" -SRC_URI[md5sum] = "83c158b7dae9135750a7cf204e6e2eea" -SRC_URI[sha256sum] = "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28" +SRC_URI[md5sum] = "6fad9772e75421969ddb41975483abdf" +SRC_URI[sha256sum] = "1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38" PYPI_PACKAGE = "Babel" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:03:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:03:04 +0000 Subject: [oe-commits] [meta-openembedded] 14/15: python3-backports-functools-lru-cache: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070251.0D816232A44@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c6e9762ea1638fa51072d8672aca504831271464 Author: Derek Straka AuthorDate: Sun Feb 9 21:12:34 2020 -0500 python3-backports-functools-lru-cache: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-backports-functools-lru-cache.inc | 19 ------------------- .../python3-backports-functools-lru-cache_1.5.bb | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-backports-functools-lru-cache.inc b/meta-python/recipes-devtools/python/python-backports-functools-lru-cache.inc deleted file mode 100644 index bce44a2..0000000 --- a/meta-python/recipes-devtools/python/python-backports-functools-lru-cache.inc +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Backport of functools.lru_cache from Python 3.3" -HOMEPAGE = "https://github.com/jaraco/backports.functools_lru_cache" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;beginline=57;endline=57;md5=98fc3658e5970d26f6b2109808c766be" - -PYPI_PACKAGE = "backports.functools_lru_cache" - -SRC_URI[md5sum] = "20f53f54cd3f04b3346ce75a54959754" -SRC_URI[sha256sum] = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -inherit pypi - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-threading \ - " diff --git a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb index 91fcc41..9182792 100644 --- a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb +++ b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb @@ -1,2 +1,19 @@ -require python-backports-functools-lru-cache.inc -inherit setuptools3 +SUMMARY = "Backport of functools.lru_cache from Python 3.3" +HOMEPAGE = "https://github.com/jaraco/backports.functools_lru_cache" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://setup.py;beginline=57;endline=57;md5=98fc3658e5970d26f6b2109808c766be" + +PYPI_PACKAGE = "backports.functools_lru_cache" + +SRC_URI[md5sum] = "20f53f54cd3f04b3346ce75a54959754" +SRC_URI[sha256sum] = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-threading \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:03:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:03:01 +0000 Subject: [oe-commits] [meta-openembedded] 11/15: python3-aws-iot-device-sdk-python: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.DFE14232A4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d2cdaa95fae51d24c1e14f1e8b9be4161f497331 Author: Derek Straka AuthorDate: Sun Feb 9 19:59:42 2020 -0500 python3-aws-iot-device-sdk-python: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-aws-iot-device-sdk-python.inc | 41 --------------------- .../python3-aws-iot-device-sdk-python_1.4.7.bb | 43 +++++++++++++++++++++- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc deleted file mode 100644 index 60493e1..0000000 --- a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "SDK for connecting to AWS IoT using Python." -HOMEPAGE = "https://github.com/aws/aws-iot-device-sdk-python" -LICENSE = "Apache-2.0 & (EPL-1.0 | EDL-1.0)" -LICENSE_${PN}-examples = "Apache-2.0" -LIC_FILES_CHKSUM = "\ - file://LICENSE.txt;md5=9ac49901b833e769c7d6f21e8dbd7b30 \ - file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ -" - -SRC_URI[md5sum] = "2b3df629827d8bc18ca4d927b4885a17" -SRC_URI[sha256sum] = "7e67c8cfeee8a1c8fd251bcc418de9d4dca697753565c9a9e614525179d9555d" - -inherit pypi - -PYPI_PACKAGE = "AWSIoTPythonSDK" - -do_install_append() { - install -d -m0755 ${D}${datadir}/${BPN}/examples - cp --preserve=mode,timestamps -R ${S}/samples/* ${D}${datadir}/${BPN}/examples - # this requires the full blown AWS Python SDK - rm -r ${D}${datadir}/${BPN}/examples/basicPubSub -} - -PACKAGES =+ "${PN}-examples" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" -RDEPENDS_${PN}-examples += "${PN}" - -FILES_${PN}-examples = "${datadir}/${BPN}/examples" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb b/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb index c43649d..78e024b 100644 --- a/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb @@ -1,2 +1,41 @@ -inherit setuptools3 -require python-aws-iot-device-sdk-python.inc +DESCRIPTION = "SDK for connecting to AWS IoT using Python." +HOMEPAGE = "https://github.com/aws/aws-iot-device-sdk-python" +LICENSE = "Apache-2.0 & (EPL-1.0 | EDL-1.0)" +LICENSE_${PN}-examples = "Apache-2.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE.txt;md5=9ac49901b833e769c7d6f21e8dbd7b30 \ + file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ +" + +SRC_URI[md5sum] = "2b3df629827d8bc18ca4d927b4885a17" +SRC_URI[sha256sum] = "7e67c8cfeee8a1c8fd251bcc418de9d4dca697753565c9a9e614525179d9555d" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "AWSIoTPythonSDK" + +do_install_append() { + install -d -m0755 ${D}${datadir}/${BPN}/examples + cp --preserve=mode,timestamps -R ${S}/samples/* ${D}${datadir}/${BPN}/examples + # this requires the full blown AWS Python SDK + rm -r ${D}${datadir}/${BPN}/examples/basicPubSub +} + +PACKAGES =+ "${PN}-examples" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" +RDEPENDS_${PN}-examples += "${PN}" + +FILES_${PN}-examples = "${datadir}/${BPN}/examples" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:03:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:03:00 +0000 Subject: [oe-commits] [meta-openembedded] 10/15: python3-automat: consolidate inc and bb files into a single bb file In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070250.D6844232A4D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6b9db4343afbd611179ab2d10e19970d32fc8ed8 Author: Derek Straka AuthorDate: Sun Feb 9 19:55:10 2020 -0500 python3-automat: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-automat.inc | 24 ---------------------- ...001-setup.py-remove-the-dependency-on-m2r.patch | 0 .../python/python3-automat_0.8.0.bb | 23 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-automat.inc b/meta-python/recipes-devtools/python/python-automat.inc deleted file mode 100644 index ec39221..0000000 --- a/meta-python/recipes-devtools/python/python-automat.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Self-service finite-state machines for the programmer on the go" -HOMEPAGE = "https://github.com/glyph/Automat" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-automat:" - -SRC_URI[md5sum] = "47e980a48201a1dabe37fa11f0187013" -SRC_URI[sha256sum] = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484" - -PYPI_PACKAGE = "Automat" - -inherit pypi - -SRC_URI_append = " \ - file://0001-setup.py-remove-the-dependency-on-m2r.patch \ -" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-six \ -" diff --git a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-python/recipes-devtools/python/python3-automat/0001-setup.py-remove-the-dependency-on-m2r.patch similarity index 100% rename from meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch rename to meta-python/recipes-devtools/python/python3-automat/0001-setup.py-remove-the-dependency-on-m2r.patch diff --git a/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb b/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb index 2c74764..f8981bc 100644 --- a/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb @@ -1,2 +1,21 @@ -inherit setuptools3 -require python-automat.inc +DESCRIPTION = "Self-service finite-state machines for the programmer on the go" +HOMEPAGE = "https://github.com/glyph/Automat" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" + +SRC_URI[md5sum] = "47e980a48201a1dabe37fa11f0187013" +SRC_URI[sha256sum] = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI_append = " \ + file://0001-setup.py-remove-the-dependency-on-m2r.patch \ +" + +PYPI_PACKAGE = "Automat" +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-six \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 10 07:03:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Feb 2020 07:03:05 +0000 Subject: [oe-commits] [meta-openembedded] 15/15: python3-backports-functools-lru-cache: update to version 1.6.1 In-Reply-To: <158131817011.8965.13278168184957802207@git.openembedded.org> References: <158131817011.8965.13278168184957802207@git.openembedded.org> Message-ID: <20200210070251.1AB0C232A45@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit df65d98ec8b94cdb4023c308f7be597c7290860e Author: Derek Straka AuthorDate: Sun Feb 9 21:12:35 2020 -0500 python3-backports-functools-lru-cache: update to version 1.6.1 License-Checksum updated to use the actual license file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- ...-cache_1.5.bb => python3-backports-functools-lru-cache_1.6.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.1.bb similarity index 61% rename from meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb rename to meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.1.bb index 9182792..c95a759 100644 --- a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb +++ b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.1.bb @@ -2,12 +2,12 @@ SUMMARY = "Backport of functools.lru_cache from Python 3.3" HOMEPAGE = "https://github.com/jaraco/backports.functools_lru_cache" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;beginline=57;endline=57;md5=98fc3658e5970d26f6b2109808c766be" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e" PYPI_PACKAGE = "backports.functools_lru_cache" -SRC_URI[md5sum] = "20f53f54cd3f04b3346ce75a54959754" -SRC_URI[sha256sum] = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a" +SRC_URI[md5sum] = "103000b21a8e683647e2ce41929f2a9d" +SRC_URI[sha256sum] = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:54 +0000 Subject: [oe-commits] [openembedded-core] 01/30: Revert "bzip2: Fix CVE-2019-12900" In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.46E0D232A4D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit ac6150563bd8e4cb2fa09a2777879afc993f1c20 Author: Anuj Mittal AuthorDate: Wed Feb 5 11:32:52 2020 +0800 Revert "bzip2: Fix CVE-2019-12900" This reverts commit 175e6cb75ce328d51a9d4ad18c7e09d9fb92c2e1. This change is already in bzip2 1.0.7. The change fixing a regression caused by this change is in 1.0.8 which is the current version in zeus. This isn't resulting in failures because the patch file isn't included in SRC_URI. Signed-off-by: Anuj Mittal --- .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch deleted file mode 100644 index 9859d9d..0000000 --- a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 May 2019 19:35:18 +0200 -Subject: [PATCH] Make sure nSelectors is not out of range - -nSelectors is used in a loop from 0 to nSelectors to access selectorMtf -which is -UChar selectorMtf[BZ_MAX_SELECTORS]; -so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory -access -Fixes out of bounds access discovered while fuzzying karchive - -Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch - -Upstream-Status: Backport -CVE: CVE-2019-12900.patch -Signed-off-by: Saloni Jain ---- - decompress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/decompress.c b/decompress.c -index ab6a624..f3db91d 100644 ---- a/decompress.c -+++ b/decompress.c -@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); -- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { --- -2.22.0 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:55 +0000 Subject: [oe-commits] [openembedded-core] 02/30: rsync: whitelist CVE-2017-16548 In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.4E515232A4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit be8838387b5dd06abd81cc478d3c2ab9c95930bc Author: Lee Chee Yang AuthorDate: Tue Jan 21 13:26:47 2020 +0800 rsync: whitelist CVE-2017-16548 patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce (From OE-Core rev: 1e2739c821312527010fb0afbde5a20cd3f03d24) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d06..152ff02 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:53 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated (832588c -> 00e0bc9) Message-ID: <158146235385.32553.9803201591076485921@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch zeus in repository openembedded-core. from 832588c build-appliance-image: Update to zeus head revision new ac61505 Revert "bzip2: Fix CVE-2019-12900" new be88383 rsync: whitelist CVE-2017-16548 new 30f4f40 curl: fix CVE-2019-15601 new c06d69e cpio: fix CVE-2019-14866 new 803391e devtool/standard.py: Allow recipe to disable menuconfig logic new 8ebd3b4 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' new 428c8a3 opkg-utils: upgrade to version 0.4.2 new ff31fa7 opkg-utils: Fix reproducibility issues in opkg-build new 38359c7 oeqa/reproducible: Improve test output and ensure deb+ipk compared new 81d3832 classes/reproducible_build: Read SDE file later new 89f517c sudo: Set vardir deterministically new 0e0111a libxshmfence: Set shm directory deterministically new 055766f mc: Fix build reproducibility new 60cdd91 mc: Set zipinfo presence determinstically new feaf05c mc: Fix manpage date indeterminism new af4a284 tar: Fix build determinism, disable rsh new 148f1f8 patch: Extend to native/nativesdk and depend upon new 77be323 libidn2: Fix reproducibility issue new 5c38cdf gtk+3: sort resources for reproducible binaries new e120848 perl: do not install files that contain build host specific data new 1f630fe perl: Fix various reproducibile build issues new 9411343 openssl: Fix reproducibility issue new 46f9c48 iputils: Fix build determinism new f29b56b libinput: Fix determinism issue new cd2e778 libgcrypt: Fix determinism issue new 232430b sudo: specify where target tools are new bde90e4 sysvinit: Fix Reproducibility issue new 7edd5e5 libevdev: Fix determinism issue new 7bc68f7 ncurses: Fix reproducibility issue new 00e0bc9 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig The 30 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/patch.bbclass | 7 + meta/classes/reproducible_build.bbclass | 40 ++- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +- meta/recipes-bsp/u-boot/u-boot.inc | 2 + .../openssl/openssl/reproducible.patch | 32 +++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-core/ncurses/ncurses.inc | 1 + meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++ ...0001-Switch-all-scripts-to-use-Python-3.x.patch | 113 -------- ...g-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 --- .../opkg-utils/fix-reproducibility.patch | 32 +++ .../opkg-utils/opkg-utils/pipefail.patch | 31 -- .../{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 13 +- meta/recipes-devtools/patch/patch_2.7.6.bb | 3 + meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++ meta/recipes-devtools/perl/perl-ptest.inc | 3 + meta/recipes-devtools/perl/perl_5.30.0.bb | 4 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 +++++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + meta/recipes-extended/iputils/iputils_s20190709.bb | 3 +- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 +- ...0001-Add-option-to-control-configure-args.patch | 99 +++++++ meta/recipes-extended/mc/files/nomandate.patch | 21 ++ meta/recipes-extended/mc/mc_4.8.23.bb | 7 +- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.27.bb | 10 +- meta/recipes-extended/tar/tar_1.32.bb | 2 + meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 ++ meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + .../wayland/libinput/determinism.patch | 21 ++ meta/recipes-graphics/wayland/libinput_1.14.1.bb | 4 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 + .../recipes-support/curl/curl/CVE-2019-15601.patch | 46 +++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + .../libevdev/libevdev/determinism.patch | 34 +++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- .../libgcrypt/files/determinism.patch | 32 +++ meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb | 1 + scripts/lib/devtool/standard.py | 6 +- 44 files changed, 935 insertions(+), 252 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} (83%) create mode 100644 meta/recipes-devtools/perl/files/determinism.patch delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch create mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch create mode 100644 meta/recipes-extended/mc/files/nomandate.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:56 +0000 Subject: [oe-commits] [openembedded-core] 03/30: curl: fix CVE-2019-15601 In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.5626B232A4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 30f4f40c4c92b000fa3356fae0504da233b0f601 Author: Anuj Mittal AuthorDate: Wed Feb 5 12:12:43 2020 +0800 curl: fix CVE-2019-15601 Signed-off-by: Anuj Mittal --- .../recipes-support/curl/curl/CVE-2019-15601.patch | 46 ++++++++++++++++++++++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + 2 files changed, 47 insertions(+) diff --git a/meta/recipes-support/curl/curl/CVE-2019-15601.patch b/meta/recipes-support/curl/curl/CVE-2019-15601.patch new file mode 100644 index 0000000..7bfaae7 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2019-15601.patch @@ -0,0 +1,46 @@ +Upstream-Status: Backport [https://github.com/curl/curl/commit/1b71bc532bde8621fd3260843f8197182a467ff2] +CVE: CVE-2019-15601 +Signed-off-by: Anuj Mittal + +From 1b71bc532bde8621fd3260843f8197182a467ff2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 7 Nov 2019 10:13:01 +0100 +Subject: [PATCH] file: on Windows, refuse paths that start with \\ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +... as that might cause an unexpected SMB connection to a given host +name. + +Reported-by: Fernando Mu?oz +CVE-2019-15601 +Bug: https://curl.haxx.se/docs/CVE-2019-15601.html +--- + lib/file.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/file.c b/lib/file.c +index d349cd9241..166931d7f1 100644 +--- a/lib/file.c ++++ b/lib/file.c +@@ -136,7 +136,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done) + struct Curl_easy *data = conn->data; + char *real_path; + struct FILEPROTO *file = data->req.protop; +- int fd; ++ int fd = -1; + #ifdef DOS_FILESYSTEM + size_t i; + char *actual_path; +@@ -181,7 +181,9 @@ static CURLcode file_connect(struct connectdata *conn, bool *done) + return CURLE_URL_MALFORMAT; + } + +- fd = open_readonly(actual_path, O_RDONLY|O_BINARY); ++ if(strncmp("\\\\", actual_path, 2)) ++ /* refuse to open path that starts with two backslashes */ ++ fd = open_readonly(actual_path, O_RDONLY|O_BINARY); + file->path = actual_path; + #else + if(memchr(real_path, 0, real_path_len)) { diff --git a/meta/recipes-support/curl/curl_7.66.0.bb b/meta/recipes-support/curl/curl_7.66.0.bb index d1975f2..a54e053 100644 --- a/meta/recipes-support/curl/curl_7.66.0.bb +++ b/meta/recipes-support/curl/curl_7.66.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=be5d9e1419c4363f4b32037a2d3b7ffa" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ + file://CVE-2019-15601.patch \ " SRC_URI[md5sum] = "c238aa394e3aa47ca4fcb0491774149f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:57 +0000 Subject: [oe-commits] [openembedded-core] 04/30: cpio: fix CVE-2019-14866 In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.5E8AF232A50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit c06d69e6dccb849e60847a33593fa20e192feea2 Author: Anuj Mittal AuthorDate: Wed Feb 5 12:39:05 2020 +0800 cpio: fix CVE-2019-14866 Signed-off-by: Anuj Mittal --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 +++++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + 2 files changed, 317 insertions(+) diff --git a/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch new file mode 100644 index 0000000..5d587fc --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch @@ -0,0 +1,316 @@ +CVE: CVE-2019-14866 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=7554e3e42cd72f6f8304410c47fe6f8918e9bfd7] +Signed-off-by: Anuj Mittal + +From a052401293e45a13cded5959b258204dae6d0af5 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 3 Nov 2019 23:59:39 +0200 +Subject: [PATCH] Fix CVE-2019-14866 + +* src/copyout.c (to_ascii): Additional argument nul controls whether +to add the terminating nul character. +(field_width_error): Improve diagnostics: print the actual and the +maximum allowed field value. +* src/extern.h (to_ascii, field_width_error): New prototypes. +* src/tar.c (to_oct): Remove. +(to_oct_or_error): New function. +(TO_OCT): New macro. +(write_out_tar_header): Use TO_OCT and to_ascii. Return 0 on +success, 1 on error. +--- + src/copyout.c | 49 ++++++++++++++++++++++-------------- + src/extern.h | 15 +++++++++-- + src/tar.c | 69 ++++++++++++++++++++++++--------------------------- + 3 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..1ae5477 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -269,26 +269,32 @@ writeout_final_defers (int out_des) + so it should be moved to paxutils too. + Allowed values for logbase are: 1 (binary), 2, 3 (octal), 4 (hex) */ + int +-to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase) ++to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, bool nul) + { + static char codetab[] = "0123456789ABCDEF"; +- int i = digits; +- +- do ++ ++ if (nul) ++ where[--digits] = 0; ++ while (digits > 0) + { +- where[--i] = codetab[(v & ((1 << logbase) - 1))]; ++ where[--digits] = codetab[(v & ((1 << logbase) - 1))]; + v >>= logbase; + } +- while (i); + + return v != 0; + } + +-static void +-field_width_error (const char *filename, const char *fieldname) ++void ++field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul) + { +- error (0, 0, _("%s: field width not sufficient for storing %s"), +- filename, fieldname); ++ char valbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%s"), ++ filename, fieldname, ++ STRINGIFY_BIGINT (value, valbuf), ++ STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8), ++ maxbuf)); + } + + static void +@@ -303,7 +309,7 @@ to_ascii_or_warn (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + field_width_warning (filename, fieldname); + } + +@@ -312,9 +318,9 @@ to_ascii_or_error (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + { +- field_width_error (filename, fieldname); ++ field_width_error (filename, fieldname, n, digits, false); + return 1; + } + return 0; +@@ -371,7 +377,7 @@ write_out_new_ascii_header (const char *magic_string, + _("name size"))) + return 1; + p += 8; +- to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16); ++ to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16, false); + + tape_buffered_write (ascii_header, out_des, sizeof ascii_header); + +@@ -388,7 +394,7 @@ write_out_old_ascii_header (dev_t dev, dev_t rdev, + char ascii_header[76]; + char *p = ascii_header; + +- to_ascii (p, file_hdr->c_magic, 6, LG_8); ++ to_ascii (p, file_hdr->c_magic, 6, LG_8, false); + p += 6; + to_ascii_or_warn (p, dev, 6, LG_8, file_hdr->c_name, _("device number")); + p += 6; +@@ -492,7 +498,10 @@ write_out_binary_header (dev_t rdev, + short_hdr.c_namesize = file_hdr->c_namesize & 0xFFFF; + if (short_hdr.c_namesize != file_hdr->c_namesize) + { +- field_width_error (file_hdr->c_name, _("name size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%u"), ++ file_hdr->c_name, _("name size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFu); + return 1; + } + +@@ -502,7 +511,10 @@ write_out_binary_header (dev_t rdev, + if (((off_t)short_hdr.c_filesizes[0] << 16) + short_hdr.c_filesizes[1] + != file_hdr->c_filesize) + { +- field_width_error (file_hdr->c_name, _("file size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%lu"), ++ file_hdr->c_name, _("file size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFFFFFlu); + return 1; + } + +@@ -552,8 +564,7 @@ write_out_header (struct cpio_file_stat *file_hdr, int out_des) + error (0, 0, _("%s: file name too long"), file_hdr->c_name); + return 1; + } +- write_out_tar_header (file_hdr, out_des); /* FIXME: No error checking */ +- return 0; ++ return write_out_tar_header (file_hdr, out_des); + + case arf_binary: + return write_out_binary_header (makedev (file_hdr->c_rdev_maj, +diff --git a/src/extern.h b/src/extern.h +index e27d662..f9ef56a 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -117,6 +117,10 @@ void print_name_with_quoting (char *p); + /* copyout.c */ + int write_out_header (struct cpio_file_stat *file_hdr, int out_des); + void process_copy_out (void); ++int to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, ++ bool nul); ++void field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul); + + /* copypass.c */ + void process_copy_pass (void); +@@ -145,7 +149,7 @@ int make_path (char *argpath, uid_t owner, gid_t group, + const char *verbose_fmt_string); + + /* tar.c */ +-void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); ++int write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); + int null_block (long *block, int size); + void read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des); + int otoa (char *s, unsigned long *n); +@@ -204,9 +208,16 @@ void cpio_safer_name_suffix (char *name, bool link_target, + int cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir); + void change_dir (void); + +-/* FIXME: These two defines should be defined in paxutils */ ++/* FIXME: The following three should be defined in paxutils */ + #define LG_8 3 + #define LG_16 4 ++/* The maximum uintmax_t value that can be represented with DIGITS digits, ++ assuming that each digit is BITS_PER_DIGIT wide. */ ++#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ ++ ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ ++ ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ ++ : (uintmax_t) -1) ++ + + uintmax_t from_ascii (char const *where, size_t digs, unsigned logbase); + +diff --git a/src/tar.c b/src/tar.c +index a2ce171..ef58027 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -79,36 +79,17 @@ stash_tar_filename (char *prefix, char *filename) + return hold_tar_filename; + } + +-/* Convert a number into a string of octal digits. +- Convert long VALUE into a DIGITS-digit field at WHERE, +- including a trailing space and room for a NUL. DIGITS==3 means +- 1 digit, a space, and room for a NUL. +- +- We assume the trailing NUL is already there and don't fill it in. +- This fact is used by start_header and finish_header, so don't change it! +- +- This is be equivalent to: +- sprintf (where, "%*lo ", digits - 2, value); +- except that sprintf fills in the trailing NUL and we don't. */ +- +-static void +-to_oct (register long value, register int digits, register char *where) ++static int ++to_oct_or_error (uintmax_t value, size_t digits, char *where, char const *field, ++ char const *file) + { +- --digits; /* Leave the trailing NUL slot alone. */ +- +- /* Produce the digits -- at least one. */ +- do ++ if (to_ascii (where, value, digits, LG_8, true)) + { +- where[--digits] = '0' + (char) (value & 7); /* One octal digit. */ +- value >>= 3; ++ field_width_error (file, field, value, digits, true); ++ return 1; + } +- while (digits > 0 && value != 0); +- +- /* Add leading zeroes, if necessary. */ +- while (digits > 0) +- where[--digits] = '0'; ++ return 0; + } +- + + + /* Compute and return a checksum for TAR_HDR, +@@ -134,10 +115,22 @@ tar_checksum (struct tar_header *tar_hdr) + return sum; + } + ++#define TO_OCT(file_hdr, c_fld, digits, tar_hdr, tar_field) \ ++ do \ ++ { \ ++ if (to_oct_or_error (file_hdr -> c_fld, \ ++ digits, \ ++ tar_hdr -> tar_field, \ ++ #tar_field, \ ++ file_hdr->c_name)) \ ++ return 1; \ ++ } \ ++ while (0) ++ + /* Write out header FILE_HDR, including the file name, to file + descriptor OUT_DES. */ + +-void ++int + write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + { + int name_len; +@@ -166,11 +159,11 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + + /* Ustar standard (POSIX.1-1988) requires the mode to contain only 3 octal + digits */ +- to_oct (file_hdr->c_mode & MODE_ALL, 8, tar_hdr->mode); +- to_oct (file_hdr->c_uid, 8, tar_hdr->uid); +- to_oct (file_hdr->c_gid, 8, tar_hdr->gid); +- to_oct (file_hdr->c_filesize, 12, tar_hdr->size); +- to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime); ++ TO_OCT (file_hdr, c_mode & MODE_ALL, 8, tar_hdr, mode); ++ TO_OCT (file_hdr, c_uid, 8, tar_hdr, uid); ++ TO_OCT (file_hdr, c_gid, 8, tar_hdr, gid); ++ TO_OCT (file_hdr, c_filesize, 12, tar_hdr, size); ++ TO_OCT (file_hdr, c_mtime, 12, tar_hdr, mtime); + + switch (file_hdr->c_mode & CP_IFMT) + { +@@ -182,7 +175,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); + tar_hdr->typeflag = LNKTYPE; +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + } + else + tar_hdr->typeflag = REGTYPE; +@@ -208,7 +201,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + than TARLINKNAMESIZE. */ + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + break; + #endif /* CP_IFLNK */ + } +@@ -227,13 +220,15 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + if (name) + strcpy (tar_hdr->gname, name); + +- to_oct (file_hdr->c_rdev_maj, 8, tar_hdr->devmajor); +- to_oct (file_hdr->c_rdev_min, 8, tar_hdr->devminor); ++ TO_OCT (file_hdr, c_rdev_maj, 8, tar_hdr, devmajor); ++ TO_OCT (file_hdr, c_rdev_min, 8, tar_hdr, devminor); + } + +- to_oct (tar_checksum (tar_hdr), 8, tar_hdr->chksum); ++ to_ascii (tar_hdr->chksum, tar_checksum (tar_hdr), 8, LG_8, true); + + tape_buffered_write ((char *) &tar_rec, out_des, TARRECORDSIZE); ++ ++ return 0; + } + + /* Return nonzero iff all the bytes in BLOCK are NUL. +-- +2.24.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 3713bf0..5abe494 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ file://0001-Fix-segfault-with-append.patch \ + file://CVE-2019-14866.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:58 +0000 Subject: [oe-commits] [openembedded-core] 05/30: devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.68D8B232A51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 803391ef7ba662a5ee58609d9c81aeffa494287c Author: Tom Hochstein AuthorDate: Wed Feb 5 20:15:40 2020 +0100 devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie Signed-off-by: Peter Kjellerstedt Signed-off-by: Anuj Mittal --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 60c9a04..b43c725 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -940,8 +940,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:02 +0000 Subject: [oe-commits] [openembedded-core] 09/30: oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.8B089232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 38359c79dc6e02a21d1bc26756c8bd88da762ef8 Author: Richard Purdie AuthorDate: Mon Feb 3 23:39:29 2020 +0000 oeqa/reproducible: Improve test output and ensure deb+ipk compared Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. (From OE-Core rev: 6e2e0480852177db75a6108d77c99c92c4e9950f) (From OE-Core rev: 4d470f48f7fb5e05fba1ca3a59fb4f85d910026e) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index a911056..1b0b5ba 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -174,6 +174,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -197,6 +199,9 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:05:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:05:59 +0000 Subject: [oe-commits] [openembedded-core] 06/30: gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.708BD232A52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 8ebd3b4ed4995f27c1568cf873067ce24b1998bd Author: Taras Kondratiuk via Openembedded-core AuthorDate: Tue Feb 4 02:20:06 2020 +0000 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' Linux kernel compilation for aarch64 triggers ICE if CONFIG_CC_OPTIMIZE_FOR_SIZE=y. The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. Apply the fix to 9.2. (From OE-Core rev: 14f34d32bfdaa752f5043e62750d2e7b92c4b419) Signed-off-by: Taras Kondratiuk Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index c639599..4f06823 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -68,6 +68,7 @@ SRC_URI = "\ file://CVE-2019-15847_1.patch \ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch new file mode 100644 index 0000000..c37e0bb --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch @@ -0,0 +1,95 @@ +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From: Vladimir Makarov +Date: Wed, 10 Jul 2019 16:07:10 +0000 +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os + starting with r270266) + +2019-07-10 Vladimir Makarov + + PR target/91102 + * lra-constraints.c (process_alt_operands): Don't match user + defined regs only if they are early clobbers. + +2019-07-10 Vladimir Makarov + + PR target/91102 + * gcc.target/aarch64/pr91102.c: New test. + +From-SVN: r273357 +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] +[takondra: dropped conflicting ChangeLog changes] +Signed-off-by: Taras Kondratiuk +--- + gcc/lra-constraints.c | 17 ++++++++++---- + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 4 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index cf33da8013e4..6382dbf852b6 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) + else + { + /* Operands don't match. If the operands are +- different user defined explicit hard registers, +- then we cannot make them match. */ ++ different user defined explicit hard ++ registers, then we cannot make them match ++ when one is early clobber operand. */ + if ((REG_P (*curr_id->operand_loc[nop]) + || SUBREG_P (*curr_id->operand_loc[nop])) + && (REG_P (*curr_id->operand_loc[m]) +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) + && REG_P (m_reg) + && HARD_REGISTER_P (m_reg) + && REG_USERVAR_P (m_reg)) +- break; ++ { ++ int i; ++ ++ for (i = 0; i < early_clobbered_regs_num; i++) ++ if (m == early_clobbered_nops[i]) ++ break; ++ if (i < early_clobbered_regs_num ++ || early_clobber_p) ++ break; ++ } + } +- + /* Both operands must allow a reload register, + otherwise we cannot make them match. */ + if (curr_alt[m] == NO_REGS) +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c +new file mode 100644 +index 000000000000..70b99045a48e +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c +@@ -0,0 +1,26 @@ ++/* PR target/91102 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++int ++foo (long d, long l) ++{ ++ register long e asm ("x1") = d; ++ register long f asm("x2") = l; ++ asm ("" : : "r" (e), "r" (f)); ++ return 3; ++} ++ ++struct T { int i; int j; }; ++union S { long h; struct T t; }; ++ ++void ++bar (union S b) ++{ ++ while (1) ++ { ++ union S c = b; ++ c.t.j++; ++ b.h = foo (b.h, c.h); ++ } ++} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:04 +0000 Subject: [oe-commits] [openembedded-core] 11/30: sudo: Set vardir deterministically In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.9AD8E232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 89f517c2775338db92874484c28b4224d670ec1f Author: Richard Purdie AuthorDate: Mon Feb 3 14:13:31 2020 +0000 sudo: Set vardir deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13775] (From OE-Core rev: 39fe849b56d70689846262c31ab7c182c8443923) (From OE-Core rev: 51274c9b195ad00dd6362f352ad9bbf7e9a3e098) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/sudo/sudo_1.8.27.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb index 0a11a1b..ee3be95 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.27.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb @@ -19,6 +19,7 @@ EXTRA_OECONF += " \ ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-vardir=/var/lib/sudo \ " do_install_append () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:00 +0000 Subject: [oe-commits] [openembedded-core] 07/30: opkg-utils: upgrade to version 0.4.2 In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.78B19232A53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 428c8a3887c86ea882b264fdad606612b9d9eb8e Author: Alejandro del Castillo AuthorDate: Tue Dec 17 18:16:08 2019 -0600 opkg-utils: upgrade to version 0.4.2 - Drop 00001-Switch-all-scripts-to-use-Python-3.x.patch - Drop 00001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch - Drop pipefail.patch (From OE-Core rev: bf51a4a1312562cc9b5944b7dfccba0b3d11dc3c) (From OE-Core rev: 1b71c28e1ca4fddc0f3c340ea4bcd76854ef620c) Signed-off-by: Alejandro del Castillo Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- ...0001-Switch-all-scripts-to-use-Python-3.x.patch | 113 --------------------- ...g-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 -------- .../opkg-utils/opkg-utils/pipefail.patch | 31 ------ .../{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 12 +-- 4 files changed, 4 insertions(+), 196 deletions(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch deleted file mode 100644 index 691ed50..0000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch +++ /dev/null @@ -1,113 +0,0 @@ -From d42b23f4fb5d6bd58e92e995fe5befc76efbae0c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 27 Apr 2017 15:47:58 +0300 -Subject: [PATCH] Switch all scripts to use Python 3.x - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - makePackage | 2 +- - opkg-compare-indexes | 2 +- - opkg-graph-deps | 2 +- - opkg-list-fields | 2 +- - opkg-make-index | 2 +- - opkg-show-deps | 2 +- - opkg-unbuild | 2 +- - opkg-update-index | 2 +- - opkg.py | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/makePackage b/makePackage -index 4bdfc56..02124dd 100755 ---- a/makePackage -+++ b/makePackage -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - - # The general algorithm this program follows goes like this: - # Run tar to extract control from control.tar.gz from the package. -diff --git a/opkg-compare-indexes b/opkg-compare-indexes -index b60d20a..80c1263 100755 ---- a/opkg-compare-indexes -+++ b/opkg-compare-indexes -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-graph-deps b/opkg-graph-deps -index 6653fd5..f1e376a 100755 ---- a/opkg-graph-deps -+++ b/opkg-graph-deps -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-list-fields b/opkg-list-fields -index c14a90f..24f7955 100755 ---- a/opkg-list-fields -+++ b/opkg-list-fields -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-make-index b/opkg-make-index -index 3f757f6..2988f9f 100755 ---- a/opkg-make-index -+++ b/opkg-make-index -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Utility to create opkg compatible indexes - """ - -diff --git a/opkg-show-deps b/opkg-show-deps -index 153f21e..4e18b4f 100755 ---- a/opkg-show-deps -+++ b/opkg-show-deps -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-unbuild b/opkg-unbuild -index 4f36bec..57642c9 100755 ---- a/opkg-unbuild -+++ b/opkg-unbuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-update-index b/opkg-update-index -index 341c1c2..7bff8a1 100755 ---- a/opkg-update-index -+++ b/opkg-update-index -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - - import sys, os -diff --git a/opkg.py b/opkg.py -index 2ecac8a..7e64de4 100644 ---- a/opkg.py -+++ b/opkg.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Copyright (C) 2001 Alexander S. Guy - # Andern Research Labs - # --- -2.11.0 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index a181169..0000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 59da5577bf8df441c6ca958e50fcb83228702764 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo -Date: Thu, 12 Sep 2019 10:24:58 -0500 -Subject: [PATCH] opkg-build: clamp mtimes to SOURCE_DATE_EPOCH - -For reproducible builds, clamp mtimes bigger than SOURCE_DATE_EPOCH to -SOURCE_DATE_EPOCH (build generated files, usually). - -Fixes bugzilla 13450 - -Signed-off-by: Alejandro del Castillo -Signed-off-by: Ross Burton ---- - opkg-build | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/opkg-build b/opkg-build -index dcd2d68..2517a2b 100755 ---- a/opkg-build -+++ b/opkg-build -@@ -297,9 +297,16 @@ mkdir $tmp_dir - - build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" - -+mtime_args="" -+# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. -+# this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. -+if [ ! -z "$SOURCE_DATE_EPOCH" ]; then -+ mtime_args="--mtime=@$build_date --clamp-mtime" -+fi -+ - ( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) - ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -print > $tmp_dir/file_list ) --( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) - rm $tmp_dir/file_list - rm $tmp_dir/control_list --- -2.20.1 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch deleted file mode 100644 index 55ddcc1..0000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch +++ /dev/null @@ -1,31 +0,0 @@ -We need opkg-build to fail if for example the tar command is passed invalid -options. Without this, we see silently created empty packaged where data.tar -is zero bytes in size. This creates hard to debug problems. - -An example is when reproducible builds are enabled and run on old hosts like -centos7 which has tar < 1.28: - -Subprocess output:tar: unrecognized option '--clamp-mtime' -Try `tar --help' or `tar --usage' for more information. - -Upstream-Status: Pending -Signed-off-by: Richard Purdie - -Index: opkg-utils-0.4.1/opkg-build -=================================================================== ---- opkg-utils-0.4.1.orig/opkg-build -+++ opkg-utils-0.4.1/opkg-build -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - : <<=cut - =head1 NAME -@@ -12,6 +12,7 @@ opkg-build - construct an .opk from a di - # Updated to work on Familiar Pre0.7rc1, with busybox tar. - # Note it Requires: binutils-ar (since the busybox ar can't create) - set -e -+set -o pipefail - - version=1.0 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb similarity index 83% rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index eb6c7a3..6495726 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -4,19 +4,15 @@ SECTION = "base" HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://opkg.py;beginline=2;endline=18;md5=63ce9e6bcc445181cd9e4baf4b4ccc35" + file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" -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://0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch \ - file://pipefail.patch \ +SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" - -SRC_URI[md5sum] = "8c140f835b694a0c27cfb23d2426a02b" -SRC_URI[sha256sum] = "9ea9efdd9fe13661ad251e3a2860c1c93045adcfaa6659c3e86d9748ecda3b6e" +SRC_URI[md5sum] = "cc210650644fcb9bba06ad5ec95a63ec" +SRC_URI[sha256sum] = "5929ad87d541789e0b82d626db01a1201ac48df6f49f2262fcfb86cf815e5d6c" TARGET_CC_ARCH += "${LDFLAGS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:05 +0000 Subject: [oe-commits] [openembedded-core] 12/30: libxshmfence: Set shm directory deterministically In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.A1FAB232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 0e0111a9adad2faadfc825f14b0ad34c429ab95b Author: Richard Purdie AuthorDate: Mon Feb 3 14:14:31 2020 +0000 libxshmfence: Set shm directory deterministically Without setting this it will vary depending on which directories are present on the host. [YOCTO #13778] (From OE-Core rev: 6217c3a7201b34888aa2fbae8b6e490bea545574) (From OE-Core rev: 10357b0bf3f6b34b54c0329e7e392ecf2c7043cd) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 85a48e4..cc45696 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:01 +0000 Subject: [oe-commits] [openembedded-core] 08/30: opkg-utils: Fix reproducibility issues in opkg-build In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.81533232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit ff31fa7ae18cffb1618c3859c5dff7eb3c587692 Author: Richard Purdie AuthorDate: Mon Feb 3 20:39:14 2020 +0000 opkg-utils: Fix reproducibility issues in opkg-build There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. (From OE-Core rev: a9b8287984c63420e10329a69f7ac5125f1687f8) (From OE-Core rev: b577a6d923042cfc04e67d470e0987488ea61412) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../opkg-utils/fix-reproducibility.patch | 32 ++++++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000..945979b --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726..042eec7 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:07 +0000 Subject: [oe-commits] [openembedded-core] 14/30: mc: Set zipinfo presence determinstically In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.B1678232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 60cdd912b565207b9f236116d8832719cfa9ccfd Author: Richard Purdie AuthorDate: Tue Feb 4 13:59:26 2020 +0000 mc: Set zipinfo presence determinstically This value was floating causing differences in generated files. Set it determinstically. (From OE-Core rev: 11d7a9e37c1d3fc21396a98fefc9d34c0b9e784b) (From OE-Core rev: 8f77075425e2ef9c3b5adbf8e5b29e7cfd7b9b7a) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 71f61b4..5667038 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -27,6 +27,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:03 +0000 Subject: [oe-commits] [openembedded-core] 10/30: classes/reproducible_build: Read SDE file later In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.93483232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 81d3832728aeae0e02e775bab9fc13e159fb61d3 Author: Joshua Watt AuthorDate: Fri Jan 31 13:04:16 2020 -0600 classes/reproducible_build: Read SDE file later Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] (From OE-Core rev: b3313a10a3eb93f0a3710a35de0404fb49cd6202) (From OE-Core rev: 10515e5f7e38edbc4430e2599062a9ce6fdb42a8) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40..750eb95 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:06 +0000 Subject: [oe-commits] [openembedded-core] 13/30: mc: Fix build reproducibility In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.A9ABD232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 055766f135b4373264827c5b33c8c385b1ff4748 Author: Joshua Watt AuthorDate: Tue Nov 12 22:10:31 2019 -0600 mc: Fix build reproducibility Fixes some issues with reproducible builds. Adds a patch to allow the configure arguments to be omitted from the build and also explicitly setting some autoconf paths that were picking up hosttools. (From OE-Core rev: f54d60ee8f15229aa515e168b9c7d248663b48fe) (From OE-Core rev: 164d72b7a6ab20940f9a124beaf485be9ddc07ba) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- ...0001-Add-option-to-control-configure-args.patch | 99 ++++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 5 +- 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch new file mode 100644 index 0000000..e76aac8 --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch @@ -0,0 +1,99 @@ +From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Sat, 9 Nov 2019 20:01:48 -0600 +Subject: [PATCH] Add option to control configure args + +Embedding the configure time options into the executable can lead to +non-reproducible builds, since configure options often have embedded +paths. Add a configure time option to control if the configure args are +embedded so this can be disabled. + +Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] +Signed-off-by: Joshua Watt +--- + configure.ac | 6 ++++++ + src/args.c | 6 ++++++ + src/textconf.c | 2 ++ + 3 files changed, 14 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 19d1a76be..a1948f6b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule + AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ + test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) + ++AC_ARG_ENABLE([configure-args], ++ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) ++if test "x$enable_configure_args" != xno; then ++ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) ++fi ++ + AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) + + AC_CONFIG_FILES( +diff --git a/src/args.c b/src/args.c +index baef1a1c8..f8dc24020 100644 +--- a/src/args.c ++++ b/src/args.c +@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; + #endif /* ENABLE_SUBSHELL */ + static gboolean mc_args__show_datadirs = FALSE; + static gboolean mc_args__show_datadirs_extended = FALSE; ++#ifdef ENABLE_CONFIGURE_ARGS + static gboolean mc_args__show_configure_opts = FALSE; ++#endif + + static GOptionGroup *main_group; + +@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { + NULL + }, + ++#ifdef ENABLE_CONFIGURE_ARGS + /* show configure options */ + { + "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, +@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { + N_("Print configure options"), + NULL + }, ++#endif + + { + "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, +@@ -758,11 +762,13 @@ mc_args_show_info (void) + return FALSE; + } + ++#ifdef ENABLE_CONFIGURE_ARGS + if (mc_args__show_configure_opts) + { + show_configure_options (); + return FALSE; + } ++#endif + + return TRUE; + } +diff --git a/src/textconf.c b/src/textconf.c +index 1e0613e58..f39b9e028 100644 +--- a/src/textconf.c ++++ b/src/textconf.c +@@ -232,10 +232,12 @@ show_datadirs_extended (void) + + /* --------------------------------------------------------------------------------------------- */ + ++#ifdef ENABLE_CONFIGURE_ARGS + void + show_configure_options (void) + { + (void) printf ("%s\n", MC_CONFIGURE_ARGS); + } ++#endif + + /* --------------------------------------------------------------------------------------------- */ +-- +2.23.0 + diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 83de8db..71f61b4 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -8,6 +8,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ + file://0001-Add-option-to-control-configure-args.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" @@ -21,9 +22,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," -EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" +CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:08 +0000 Subject: [oe-commits] [openembedded-core] 15/30: mc: Fix manpage date indeterminism In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.B941F232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit feaf05c39ffecd7a9fd8bd81fc1872ce26b7801e Author: Richard Purdie AuthorDate: Tue Feb 4 18:12:15 2020 +0000 mc: Fix manpage date indeterminism The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. (From OE-Core rev: 5553c20f9fa4f35bf711b6b9d5717dcf4bfefafa) (From OE-Core rev: 3653fd41fbc28f70259a00bb0098ec8731526449) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 0000000..48bd73b --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 5667038..de76591 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -9,6 +9,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:12 +0000 Subject: [oe-commits] [openembedded-core] 19/30: gtk+3: sort resources for reproducible binaries In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.DABE4232A4D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 5c38cdfc67fb2da167012190d24a607dc7b273ba Author: Ross Burton AuthorDate: Wed Feb 5 17:32:01 2020 +0000 gtk+3: sort resources for reproducible binaries The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. (From OE-Core rev: f3675be6be29426688187a135221431a0941d007) (From OE-Core rev: a2a6d9fa4df66a1f52c1c1fec45eedb4199e8162) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + 2 files changed, 20 insertions(+) diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 0000000..7f87372 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb index d79b18b..596dee6 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5" SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:13 +0000 Subject: [oe-commits] [openembedded-core] 20/30: perl: do not install files that contain build host specific data In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.E3A3E232A4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit e120848c6bba6ce2cf910e762d53193d85280a98 Author: Alexander Kanavin AuthorDate: Thu Feb 6 23:14:38 2020 +0100 perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] (From OE-Core rev: 2e0f30c4680221c693495e3a0327378d502a518b) (From OE-Core rev: 208efc88fa3c57244b272bf7e7f7f8163f14630c) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.0.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057..98e3361 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index ba2a843..c567d4e 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -135,6 +135,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:19 +0000 Subject: [oe-commits] [openembedded-core] 26/30: sudo: specify where target tools are In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.225CE232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 232430bdee74bb266ded6ccf2fb3842caad06181 Author: Ross Burton AuthorDate: Fri Feb 7 14:29:28 2020 +0000 sudo: specify where target tools are sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. (From OE-Core rev: 61650dd8498a093f3bfa93202c9cd2e9a7fb7834) (From OE-Core rev: 6e809474ab686fba6924d8b46fd0b9eab5c66c06) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.27.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 15075bc..4edfabe 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb index ee3be95..6d470d0 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.27.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb @@ -15,8 +15,15 @@ SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd3 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:17 +0000 Subject: [oe-commits] [openembedded-core] 24/30: libinput: Fix determinism issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.12454232A50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit f29b56b9c140a03edeba69ffc2dc9888b2fde106 Author: Richard Purdie AuthorDate: Thu Feb 6 23:57:28 2020 +0000 libinput: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: c3f6a6113f562ecdb13386c3ff52adb7973980a4) (From OE-Core rev: 22dc9a3314eef5925241a9a961bd79815d3172b6) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++++ meta/recipes-graphics/wayland/libinput_1.14.1.bb | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.1.bb b/meta/recipes-graphics/wayland/libinput_1.14.1.bb index 38bc8d2..2c5733f 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.1.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.1.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" DEPENDS = "libevdev udev mtdev" -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://determinism.patch \ +" SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340" SRC_URI[sha256sum] = "e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:14 +0000 Subject: [oe-commits] [openembedded-core] 21/30: perl: Fix various reproducibile build issues In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.ECCAA232A4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 1f630fe43ec3c3e78c25f93d6badc8a35ff782ad Author: Richard Purdie AuthorDate: Wed Feb 5 23:54:02 2020 +0000 perl: Fix various reproducibile build issues Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 (From OE-Core rev: 482fd0d99f989b5a72a25bdf402fb2f219420b5d) (From OE-Core rev: def3a9d748564883d71c506726554df622701b00) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/files/determinism.patch | 81 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.0.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000..ed4d06f --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index c567d4e..838e52c 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://fix-setgroup.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:10 +0000 Subject: [oe-commits] [openembedded-core] 17/30: patch: Extend to native/nativesdk and depend upon In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.C88A8232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 148f1f8caf5d9a262c1f55e437326ce6139a743e Author: Richard Purdie AuthorDate: Tue Feb 4 22:20:35 2020 +0000 patch: Extend to native/nativesdk and depend upon There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] (From OE-Core rev: 5ed0840c93804488cd1c1aba6cb382b2434714a5) (From OE-Core rev: fd3bd61a6fe5190c575dc968f3a0be9c1cbf21ed) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1..25ec089 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 91df6f1..6620151 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f..b5897b3 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:23 +0000 Subject: [oe-commits] [openembedded-core] 30/30: u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.45C54232A65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 00e0bc966cc21e8560587c73e72858b9d2e8c891 Author: Tom Hochstein AuthorDate: Wed Nov 20 19:25:51 2019 +0000 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie (cherry picked from commit a6c430b0077eb56b4adbe391a0a05a52133cc8f0) Signed-off-by: Armin Kuster --- meta/recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 9a754fd..d241347 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -87,6 +87,8 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + else + DEVTOOL_DISABLE_MENUCONFIG=true fi } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:09 +0000 Subject: [oe-commits] [openembedded-core] 16/30: tar: Fix build determinism, disable rsh In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.C0985232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit af4a284bb6fbfd8b58d10d4a5f0f10297c949912 Author: Richard Purdie AuthorDate: Wed Feb 5 15:37:19 2020 +0000 tar: Fix build determinism, disable rsh rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. (From OE-Core rev: d14a4b0db92a9a7d1ff72a2e0faca7f1a23a0b68) (From OE-Core rev: 6bdc5f787af46e9c849947cad06ad40aa401b767) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5..ebe6cb0 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:11 +0000 Subject: [oe-commits] [openembedded-core] 18/30: libidn2: Fix reproducibility issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230554.D1A2C232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 77be3238269de636199f9e1e40133711b7440cb4 Author: Richard Purdie AuthorDate: Wed Feb 5 15:55:16 2020 +0000 libidn2: Fix reproducibility issue The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] (From OE-Core rev: 0392fcbdc85180581ce7392212808ebb822cc2e8) (From OE-Core rev: ca213de432d8d9d715ef09e17cea2aa1e6666e91) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.2.0.bb b/meta/recipes-extended/libidn/libidn2_2.2.0.bb index bcbfdd8..7131414 100644 --- a/meta/recipes-extended/libidn/libidn2_2.2.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.2.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:21 +0000 Subject: [oe-commits] [openembedded-core] 28/30: libevdev: Fix determinism issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.3218C232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 7edd5e5fd392fe2bc5eb41e40ee49a2b0f118e41 Author: Richard Purdie AuthorDate: Fri Feb 7 12:29:56 2020 +0000 libevdev: Fix determinism issue We need to sort python dict output to be deterministic and generate consistent header files. (From OE-Core rev: 75e4cedb986379db2e8a897df52ee1363f9a9a80) (From OE-Core rev: fc6e8e527698a82bf8047d02e0e792c4a1a64449) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libevdev/libevdev/determinism.patch | 34 ++++++++++++++++++++++ meta/recipes-support/libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000..33a6076 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 8427498..46ed5d7 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:16 +0000 Subject: [oe-commits] [openembedded-core] 23/30: iputils: Fix build determinism In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.08D0E232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 46f9c48dc11928ace672e9a3dea7c01d29cf3f04 Author: Richard Purdie AuthorDate: Thu Feb 6 23:34:46 2020 +0000 iputils: Fix build determinism The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. (From OE-Core rev: 8b00ec484fb851c301f13145e17707c0167feab1) (From OE-Core rev: 3997c47dea49d583fd48cb03f83c007f61d2cb35) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index 3f9e991..42260f5 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -32,7 +32,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:20 +0000 Subject: [oe-commits] [openembedded-core] 27/30: sysvinit: Fix Reproducibility issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.29CF7232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit bde90e407c8ae0b851534ae84d9d54980e908046 Author: Richard Purdie AuthorDate: Fri Feb 7 14:33:30 2020 +0000 sysvinit: Fix Reproducibility issue With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] (From OE-Core rev: 0227e929021263c51d2e7db36224000fecb01f1c) (From OE-Core rev: cbcba43c18d67aea0ba41f019b357fbec6570ee1) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index bfc1283..39f612b 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -31,6 +31,7 @@ B = "${S}/src" inherit update-alternatives distro_features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:22 +0000 Subject: [oe-commits] [openembedded-core] 29/30: ncurses: Fix reproducibility issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.39B1A232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 7bc68f7b946b1aaaafb161a57aa889b200abc2eb Author: Richard Purdie AuthorDate: Fri Feb 7 15:09:48 2020 +0000 ncurses: Fix reproducibility issue The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] (From OE-Core rev: 09c8a28893e7ca94a44232d802e1cb02a8f34b87) (From OE-Core rev: 3d114c08c32578426646f5d97769d2c66fea06cb) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35..b7bf4c0 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:15 +0000 Subject: [oe-commits] [openembedded-core] 22/30: openssl: Fix reproducibility issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.00621232A4C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit 94113433887dab43d54f3a76b1e0aa1bacb0d086 Author: Richard Purdie AuthorDate: Thu Feb 6 22:47:07 2020 +0000 openssl: Fix reproducibility issue There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] (From OE-Core rev: 37db519eedb7eb5cd4f14d05f30f5d580aa7458d) (From OE-Core rev: c31c676319812e6fc036741db2ab8e16eccff723) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../openssl/openssl/reproducible.patch | 32 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000..a24260c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 458ae7d..169824a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:18 +0000 Subject: [oe-commits] [openembedded-core] 25/30: libgcrypt: Fix determinism issue In-Reply-To: <158146235385.32553.9803201591076485921@git.openembedded.org> References: <158146235385.32553.9803201591076485921@git.openembedded.org> Message-ID: <20200211230555.1AA53232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. commit cd2e778771d836e04f76a0ff283c250dc19372c6 Author: Richard Purdie AuthorDate: Thu Feb 6 23:58:46 2020 +0000 libgcrypt: Fix determinism issue The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: 506b36b6d86b3454fcc3cb85f6229cbe8d14f5b5) (From OE-Core rev: 2b68ffc6d7c45541958f1b0c0b9ca9e39064e096) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libgcrypt/files/determinism.patch | 32 ++++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000..ad0b8c7 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb index 1bd3551..92eb2d2 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb @@ -26,6 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ file://0001-ecc-Add-mitigation-against-timing-attack.patch \ file://0001-dsa-ecdsa-Fix-use-of-nonce-use-larger-one.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:00 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: pkgconf: Remove pointless DEFAULT_PREFERENCE Message-ID: <158146236090.657.2443859963955427370@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new b5f8ba5 pkgconf: Remove pointless DEFAULT_PREFERENCE b5f8ba5 is described below commit b5f8ba5d79311cc18eec6f2012fa06aacb4843c0 Author: Richard Purdie AuthorDate: Mon Feb 10 15:58:45 2020 +0000 pkgconf: Remove pointless DEFAULT_PREFERENCE There is no other version of pkgconfig to have a preference against, remove the unneeded variable. Signed-off-by: Richard Purdie --- meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb index 94bc112..732ca2a 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb @@ -8,7 +8,6 @@ BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" RPROVIDES_${PN} += "pkgconfig" -DEFAULT_PREFERENCE = "-1" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:01 +0000 Subject: [oe-commits] [openembedded-core] branch zeus-next updated (3d114c0 -> 00e0bc9) Message-ID: <158146236092.657.7660980895872556480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch zeus-next in repository openembedded-core. discard 3d114c0 ncurses: Fix reproducibility issue discard fc6e8e5 libevdev: Fix determinism issue discard cbcba43 sysvinit: Fix Reproducibility issue discard 6e80947 sudo: specify where target tools are discard 2b68ffc libgcrypt: Fix determinism issue discard 22dc9a3 libinput: Fix determinism issue discard 3997c47 iputils: Fix build determinism discard c31c676 openssl: Fix reproducibility issue discard def3a9d perl: Fix various reproducibile build issues discard 208efc8 perl: do not install files that contain build host specific data discard a2a6d9f gtk+3: sort resources for reproducible binaries discard ca213de libidn2: Fix reproducibility issue discard fd3bd61 patch: Extend to native/nativesdk and depend upon discard 6bdc5f7 tar: Fix build determinism, disable rsh discard 3653fd4 mc: Fix manpage date indeterminism discard 8f77075 mc: Set zipinfo presence determinstically discard 164d72b mc: Fix build reproducibility discard 10357b0 libxshmfence: Set shm directory deterministically discard 51274c9 sudo: Set vardir deterministically discard 10515e5 classes/reproducible_build: Read SDE file later discard 4d470f4 oeqa/reproducible: Improve test output and ensure deb+ipk compared discard b577a6d opkg-utils: Fix reproducibility issues in opkg-build discard 1b71c28 opkg-utils: upgrade to version 0.4.2 add ac61505 Revert "bzip2: Fix CVE-2019-12900" add be88383 rsync: whitelist CVE-2017-16548 add 30f4f40 curl: fix CVE-2019-15601 add c06d69e cpio: fix CVE-2019-14866 add 803391e devtool/standard.py: Allow recipe to disable menuconfig logic add 8ebd3b4 gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' add 428c8a3 opkg-utils: upgrade to version 0.4.2 add ff31fa7 opkg-utils: Fix reproducibility issues in opkg-build add 38359c7 oeqa/reproducible: Improve test output and ensure deb+ipk compared add 81d3832 classes/reproducible_build: Read SDE file later add 89f517c sudo: Set vardir deterministically add 0e0111a libxshmfence: Set shm directory deterministically add 055766f mc: Fix build reproducibility add 60cdd91 mc: Set zipinfo presence determinstically add feaf05c mc: Fix manpage date indeterminism add af4a284 tar: Fix build determinism, disable rsh add 148f1f8 patch: Extend to native/nativesdk and depend upon add 77be323 libidn2: Fix reproducibility issue add 5c38cdf gtk+3: sort resources for reproducible binaries add e120848 perl: do not install files that contain build host specific data add 1f630fe perl: Fix various reproducibile build issues add 9411343 openssl: Fix reproducibility issue add 46f9c48 iputils: Fix build determinism add f29b56b libinput: Fix determinism issue add cd2e778 libgcrypt: Fix determinism issue add 232430b sudo: specify where target tools are add bde90e4 sysvinit: Fix Reproducibility issue add 7edd5e5 libevdev: Fix determinism issue add 7bc68f7 ncurses: Fix reproducibility issue add 00e0bc9 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3d114c0) \ N -- N -- N refs/heads/zeus-next (00e0bc9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: meta/recipes-bsp/u-boot/u-boot.inc | 2 + meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...t-91102-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++ meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 +++++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + .../recipes-support/curl/curl/CVE-2019-15601.patch | 46 +++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + scripts/lib/devtool/standard.py | 6 +- 10 files changed, 469 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:13 +0000 Subject: [oe-commits] [bitbake] branch 1.44 updated (1a026d4 -> 95687be) Message-ID: <158146237394.921.15443822109054194304@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch 1.44 in repository bitbake. from 1a026d4 runqueue: Use a set for the setscene tasks list new 6355625 fetch2: do not suffix srcrev cache key with PN new 716cdf7 fetch2/git: _revision_key: collapse adjacent slashes new 2ba2f22 persist_data.py: Immediately get exclusive lock in __setitem__ new c131015 cooker/toaster: replaced deprecated method warn() with warning() new 8f4f6c2 siggen: Optimise get_unihash disk based cache handling new 1f5a662 siggen: Cache unihash values to avoid cache lookup new 95687be siggen: Avoid cache mismatch issues with locked sigs The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lib/bb/cooker.py | 2 +- lib/bb/fetch2/__init__.py | 3 +- lib/bb/fetch2/git.py | 4 +- lib/bb/persist_data.py | 3 + lib/bb/siggen.py | 68 ++++++++++++++++------ .../bldcontrol/management/commands/runbuilds.py | 6 +- 6 files changed, 60 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:14 +0000 Subject: [oe-commits] [bitbake] 01/07: fetch2: do not suffix srcrev cache key with PN In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.2B74C232A4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit 63556259f2e34003ad0618a8fe19e1cfe8aef5c9 Author: Chris Laplante AuthorDate: Thu Jan 16 11:28:03 2020 -0500 fetch2: do not suffix srcrev cache key with PN Prior to this change, two different recipes pulling from the same exact repo could get a different SRCREV during a single parse session. This was originally observed using git. For git at least, it still allows recipes to pull from the same repo, but with different branches or tags, since the form of the srcrev cache key for git is: "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name] Where the 'unresolvedrev' part is the branch or tag name. Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie (cherry picked from commit 6c938e6fd29beebe09b32be839dae008fe6491d2) Signed-off-by: Armin Kuster --- lib/bb/fetch2/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 731c160..4a781bd 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1567,8 +1567,7 @@ class FetchMethod(object): return True, str(latest_rev) def generate_revision_key(self, ud, d, name): - key = self._revision_key(ud, d, name) - return "%s-%s" % (key, d.getVar("PN") or "") + return self._revision_key(ud, d, name) def latest_versionstring(self, ud, d): """ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:15 +0000 Subject: [oe-commits] [bitbake] 02/07: fetch2/git: _revision_key: collapse adjacent slashes In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.3B094232A50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit 716cdf737bc536f84ed1254d464c9f286e0d5a9a Author: Chris Laplante AuthorDate: Thu Jan 16 11:28:04 2020 -0500 fetch2/git: _revision_key: collapse adjacent slashes >From a SRCREV caching point of view, there is no reason to treat the following upstreams as different: SRC_URI = "git://github.com/file/file.git" SRC_URI = "git://github.com//file/file.git" Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie (cherry picked from commit 425e21c14955dd38868c6e97637df3bbe0f89fac) Signed-off-by: Armin Kuster --- lib/bb/fetch2/git.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index fa41b07..9ba9cdc 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -594,7 +594,9 @@ class Git(FetchMethod): """ Return a unique key for the url """ - return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name] + # Collapse adjacent slashes + slash_re = re.compile(r"/+") + return "git:" + ud.host + slash_re.sub(".", ud.path) + ud.unresolvedrev[name] def _lsremote(self, ud, d, search): """ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:16 +0000 Subject: [oe-commits] [bitbake] 03/07: persist_data.py: Immediately get exclusive lock in __setitem__ In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.48B3E232A51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit 2ba2f224b50956313f5c2ba01942143b4d6098f2 Author: Chris Laplante AuthorDate: Thu Jan 16 11:28:05 2020 -0500 persist_data.py: Immediately get exclusive lock in __setitem__ To avoid races, SQLTable::__setitem__ needs an exclusive lock for the entire transaction, not just the INSERT/UPDATE part. Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie (cherry picked from commit feb43e7c30f5bfab75d718896c45df621810d06f) Signed-off-by: Armin Kuster --- lib/bb/persist_data.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py index de8f87a..7357ab2 100644 --- a/lib/bb/persist_data.py +++ b/lib/bb/persist_data.py @@ -179,6 +179,9 @@ class SQLTable(collections.MutableMapping): elif not isinstance(value, str): raise TypeError('Only string values are supported') + # Ensure the entire transaction (including SELECT) executes under write lock + cursor.execute("BEGIN EXCLUSIVE") + cursor.execute("SELECT * from %s where key=?;" % self.table, [key]) row = cursor.fetchone() if row is not None: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:17 +0000 Subject: [oe-commits] [bitbake] 04/07: cooker/toaster: replaced deprecated method warn() with warning() In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.5C901232A52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit c131015f1ac152f1fea4b83a3d451c3e4d05ebec Author: Frazer Clews AuthorDate: Tue Jan 14 14:46:06 2020 +0000 cooker/toaster: replaced deprecated method warn() with warning() Removed the deprecated methods as it will only cause problems later on, and since warn() just calls warning(), it shouldn't change anything Signed-off-by: Frazer Clews Signed-off-by: Richard Purdie (cherry picked from commit a194f275235f22411cb2368f06a44f61ceb6a0f3) Signed-off-by: Armin Kuster --- lib/bb/cooker.py | 2 +- lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index b74affa..911805a 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1788,7 +1788,7 @@ class CookerCollectFiles(object): # When constructing an older style single regex, it's possible for BBMASK # to end up beginning with '|', which matches and masks _everything_. if mask.startswith("|"): - collectlog.warn("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) + collectlog.warning("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) mask = mask[1:] try: re.compile(mask) diff --git a/lib/toaster/bldcontrol/management/commands/runbuilds.py b/lib/toaster/bldcontrol/management/commands/runbuilds.py index 50ec409..19f659e 100644 --- a/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/lib/toaster/bldcontrol/management/commands/runbuilds.py @@ -168,17 +168,17 @@ class Command(BaseCommand): try: self.cleanup() except Exception as e: - logger.warn("runbuilds: cleanup exception %s" % str(e)) + logger.warning("runbuilds: cleanup exception %s" % str(e)) try: self.archive() except Exception as e: - logger.warn("runbuilds: archive exception %s" % str(e)) + logger.warning("runbuilds: archive exception %s" % str(e)) try: self.schedule() except Exception as e: - logger.warn("runbuilds: schedule exception %s" % str(e)) + logger.warning("runbuilds: schedule exception %s" % str(e)) def handle(self, **options): pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:19 +0000 Subject: [oe-commits] [bitbake] 06/07: siggen: Cache unihash values to avoid cache lookup In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.78B2E232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit 1f5a662176fd174c4793e3e28d1b4e95616b1715 Author: Richard Purdie AuthorDate: Sat Dec 14 18:17:01 2019 +0000 siggen: Cache unihash values to avoid cache lookup Add unihash cache of values to speed up cache lookup. This avoids the overhead of the disk based check functions. Signed-off-by: Richard Purdie (cherry picked from commit 5c9cc45b60904a1c355db9bf9c4495f1b25aca37) Signed-off-by: Armin Kuster --- lib/bb/siggen.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 209a342..96807c4 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -40,6 +40,7 @@ class SignatureGenerator(object): def __init__(self, data): self.basehash = {} self.taskhash = {} + self.unihash = {} self.runtaskdeps = {} self.file_checksum_values = {} self.taints = {} @@ -80,19 +81,19 @@ class SignatureGenerator(object): return def get_taskdata(self): - return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) + return (self.runtaskdeps, self.taskhash, self.unihash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) def set_taskdata(self, data): - self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data + self.runtaskdeps, self.taskhash, self.unihash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data def reset(self, data): self.__init__(data) def get_taskhashes(self): - return self.taskhash, self.unitaskhashes, self.tidtopn + return self.taskhash, self.unihash, self.unitaskhashes, self.tidtopn def set_taskhashes(self, hashes): - self.taskhash, self.unitaskhashes, self.tidtopn = hashes + self.taskhash, self.unihash, self.unitaskhashes, self.tidtopn = hashes def save_unitaskhashes(self): return @@ -108,6 +109,7 @@ class SignatureGeneratorBasic(SignatureGenerator): def __init__(self, data): self.basehash = {} self.taskhash = {} + self.unihash = {} self.taskdeps = {} self.runtaskdeps = {} self.file_checksum_values = {} @@ -256,7 +258,13 @@ class SignatureGeneratorBasic(SignatureGenerator): data = self.basehash[tid] for dep in self.runtaskdeps[tid]: - data = data + self.get_unihash(dep) + if dep in self.unihash: + if self.unihash[dep] is None: + data = data + self.taskhash[dep] + else: + data = data + self.unihash[dep] + else: + data = data + self.get_unihash(dep) for (f, cs) in self.file_checksum_values[tid]: if cs: @@ -427,6 +435,7 @@ class SignatureGeneratorUniHashMixIn(object): (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) key = mc + ":" + self.tidtopn[tid] + ":" + taskname self.unitaskhashes[key] = (self.taskhash[tid], unihash) + self.unihash[tid] = unihash def _get_unihash(self, tid, checkkey=None): if tid not in self.tidtopn: @@ -447,12 +456,14 @@ class SignatureGeneratorUniHashMixIn(object): # If its not a setscene task we can return if self.setscenetasks and tid not in self.setscenetasks: + self.unihash[tid] = None return taskhash # TODO: This cache can grow unbounded. It probably only needs to keep # for each task unihash = self._get_unihash(tid) if unihash is not None: + self.unihash[tid] = unihash return unihash # In the absence of being able to discover a unique hash from the @@ -487,6 +498,7 @@ class SignatureGeneratorUniHashMixIn(object): bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) self.set_unihash(tid, unihash) + self.unihash[tid] = unihash return unihash def report_unihash(self, path, task, d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:18 +0000 Subject: [oe-commits] [bitbake] 05/07: siggen: Optimise get_unihash disk based cache handling In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.6ACEA232A53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit 8f4f6c2f9acab23bc795ffe389c4cd74711d10ff Author: Richard Purdie AuthorDate: Thu Dec 12 18:07:14 2019 +0000 siggen: Optimise get_unihash disk based cache handling Currently the cache can grow huge since any previously used hash is retained in the cache. This change moves to use one hash per task which improves the speed of the functions considerably. Currently performance is an issue, as are very large cache files and cache load time. By moving to a single hash per task, the shorted filename as a key is no longer usable as the same recipe has multiple variants for the same filename so this has to change. Signed-off-by: Richard Purdie (cherry picked from commit ed764e7fcf04b6d0ba6b4cac7415b1ee8f492865) Signed-off-by: Armin Kuster --- lib/bb/siggen.py | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ded1da0..209a342 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -44,6 +44,7 @@ class SignatureGenerator(object): self.file_checksum_values = {} self.taints = {} self.unitaskhashes = {} + self.tidtopn = {} self.setscenetasks = set() def finalise(self, fn, d, varient): @@ -79,19 +80,19 @@ class SignatureGenerator(object): return def get_taskdata(self): - return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.setscenetasks) + return (self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks) def set_taskdata(self, data): - self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.setscenetasks = data + self.runtaskdeps, self.taskhash, self.file_checksum_values, self.taints, self.basehash, self.unitaskhashes, self.tidtopn, self.setscenetasks = data def reset(self, data): self.__init__(data) def get_taskhashes(self): - return self.taskhash, self.unitaskhashes + return self.taskhash, self.unitaskhashes, self.tidtopn def set_taskhashes(self, hashes): - self.taskhash, self.unitaskhashes = hashes + self.taskhash, self.unitaskhashes, self.tidtopn = hashes def save_unitaskhashes(self): return @@ -124,9 +125,10 @@ class SignatureGeneratorBasic(SignatureGenerator): else: self.checksum_cache = None - self.unihash_cache = bb.cache.SimpleCache("1") + self.unihash_cache = bb.cache.SimpleCache("3") self.unitaskhashes = self.unihash_cache.init_cache(data, "bb_unihashes.dat", {}) self.localdirsexclude = (data.getVar("BB_SIGNATURE_LOCAL_DIRS_EXCLUDE") or "CVS .bzr .git .hg .osc .p4 .repo .svn").split() + self.tidtopn = {} def init_rundepcheck(self, data): self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None @@ -210,6 +212,9 @@ class SignatureGeneratorBasic(SignatureGenerator): self.runtaskdeps[tid] = [] self.file_checksum_values[tid] = [] recipename = dataCache.pkg_fn[fn] + + self.tidtopn[tid] = recipename + for dep in sorted(deps, key=clean_basepath): (depmc, _, deptaskname, depfn) = bb.runqueue.split_tid_mcfn(dep) if mc != depmc: @@ -407,24 +412,35 @@ class SignatureGeneratorUniHashMixIn(object): self._client = hashserv.create_client(self.server) return self._client - def __get_task_unihash_key(self, tid): - # TODO: The key only *needs* to be the taskhash, the tid is just - # convenient - return '%s:%s' % (tid.rsplit("/", 1)[1], self.taskhash[tid]) - def get_stampfile_hash(self, tid): if tid in self.taskhash: # If a unique hash is reported, use it as the stampfile hash. This # ensures that if a task won't be re-run if the taskhash changes, # but it would result in the same output hash - unihash = self.unitaskhashes.get(self.__get_task_unihash_key(tid), None) + unihash = self._get_unihash(tid) if unihash is not None: return unihash return super().get_stampfile_hash(tid) def set_unihash(self, tid, unihash): - self.unitaskhashes[self.__get_task_unihash_key(tid)] = unihash + (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) + key = mc + ":" + self.tidtopn[tid] + ":" + taskname + self.unitaskhashes[key] = (self.taskhash[tid], unihash) + + def _get_unihash(self, tid, checkkey=None): + if tid not in self.tidtopn: + return None + (mc, fn, taskname, taskfn) = bb.runqueue.split_tid_mcfn(tid) + key = mc + ":" + self.tidtopn[tid] + ":" + taskname + if key not in self.unitaskhashes: + return None + if not checkkey: + checkkey = self.taskhash[tid] + (key, unihash) = self.unitaskhashes[key] + if key != checkkey: + return None + return unihash def get_unihash(self, tid): taskhash = self.taskhash[tid] @@ -433,11 +449,9 @@ class SignatureGeneratorUniHashMixIn(object): if self.setscenetasks and tid not in self.setscenetasks: return taskhash - key = self.__get_task_unihash_key(tid) - # TODO: This cache can grow unbounded. It probably only needs to keep # for each task - unihash = self.unitaskhashes.get(key, None) + unihash = self._get_unihash(tid) if unihash is not None: return unihash @@ -472,7 +486,7 @@ class SignatureGeneratorUniHashMixIn(object): except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) - self.unitaskhashes[key] = unihash + self.set_unihash(tid, unihash) return unihash def report_unihash(self, path, task, d): @@ -484,13 +498,13 @@ class SignatureGeneratorUniHashMixIn(object): tempdir = d.getVar('T') fn = d.getVar('BB_FILENAME') tid = fn + ':do_' + task - key = tid.rsplit("/", 1)[1] + ':' + taskhash + key = tid + ':' + taskhash if self.setscenetasks and tid not in self.setscenetasks: return # Sanity checks - cache_unihash = self.unitaskhashes.get(key, None) + cache_unihash = self._get_unihash(tid, checkkey=taskhash) if cache_unihash is None: bb.fatal('%s not in unihash cache. Please report this error' % key) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:20 +0000 Subject: [oe-commits] [bitbake] 07/07: siggen: Avoid cache mismatch issues with locked sigs In-Reply-To: <158146237394.921.15443822109054194304@git.openembedded.org> References: <158146237394.921.15443822109054194304@git.openembedded.org> Message-ID: <20200211230614.84E0F232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. commit 95687be83e716220eb3893b67428f97fd59fc2c5 Author: Richard Purdie AuthorDate: Sun Jan 5 14:04:59 2020 +0000 siggen: Avoid cache mismatch issues with locked sigs If locked sigs are in use this function makes little sense, need to avoid generating mismatch warnings. Signed-off-by: Richard Purdie (cherry picked from commit 27ad9c1d468fba858a4adeb56b605227b415ae0f) Signed-off-by: Armin Kuster --- lib/bb/siggen.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 96807c4..ffd8fca 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -515,6 +515,10 @@ class SignatureGeneratorUniHashMixIn(object): if self.setscenetasks and tid not in self.setscenetasks: return + # This can happen if locked sigs are in action. Detect and just abort + if taskhash != self.taskhash[tid]: + return + # Sanity checks cache_unihash = self._get_unihash(tid, checkkey=taskhash) if cache_unihash is None: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 11 23:06:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 11 Feb 2020 23:06:56 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated: build-appliance-image: Update to zeus head revision Message-ID: <158146241662.1336.7720203321008775058@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. The following commit(s) were added to refs/heads/zeus by this push: new 799b3cd build-appliance-image: Update to zeus head revision 799b3cd is described below commit 799b3cd1016bd765f4452a5e81ea5613c9089bce Author: Richard Purdie AuthorDate: Tue Feb 11 23:06:25 2020 +0000 build-appliance-image: Update to zeus head revision Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index f071f6c..0c57d2a 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "36520aa3829288e561f160f679c06246904591b6" +SRCREV ?= "65d341daaf1edf7241b0ea518ef9beb4328f16e9" SRC_URI = "git://git.yoctoproject.org/poky;branch=zeus \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:16 +0000 Subject: [oe-commits] [meta-openembedded] 01/08: protobuf: upgrade to 3.11.3 In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004715.F02D3232A50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dbdade508170aa98ecf179b16a2ada5ffd30237a Author: Sinan Kaya AuthorDate: Mon Feb 10 18:11:19 2020 +0000 protobuf: upgrade to 3.11.3 Signed-off-by: Sinan Kaya Signed-off-by: Khem Raj --- .../protobuf/{protobuf_3.10.1.bb => protobuf_3.11.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb similarity index 96% rename from meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb rename to meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb index 58526f1..4fa576a 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "d09d649aea36f02c03f8396ba39a8d4db8a607e4" +SRCREV = "498de9f761bef56a032815ee44b6e6dbe0892cc4" -SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ +SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.x \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:15 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (df65d98 -> c13246e) Message-ID: <158146843543.3968.13550232952821530728@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from df65d98 python3-backports-functools-lru-cache: update to version 1.6.1 new dbdade5 protobuf: upgrade to 3.11.3 new 257ea01 mosquitto: Use mosquitto.init for daemon init new f5ab147 python3-bitarray: fix name new 89b9507 mozjs: Fix python3 build with gold new 14cdea0 packagegroup-meta-perl: fix package name new cc8d955 wireshark: upgrade 3.2.0 -> 3.2.1 new d671941 xterm: upgrade 351 -> 353 new c13246e zabbix: upgrade 4.4.1 -> 4.4.5 The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-connectivity/mosquitto/files/mosquitto.init | 2 +- .../wireshark/{wireshark_3.2.0.bb => wireshark_3.2.1.bb} | 4 ++-- .../zabbix/{zabbix_4.4.1.bb => zabbix_4.4.5.bb} | 4 ++-- .../protobuf/{protobuf_3.10.1.bb => protobuf_3.11.3.bb} | 4 ++-- .../mozjs/mozjs/0001-Port-build-to-python3.patch | 11 ++++++++++- .../recipes-graphics/xorg-app/{xterm_351.bb => xterm_353.bb} | 6 +++--- .../recipes-perl/packagegroups/packagegroup-meta-perl.bb | 2 +- .../{python3-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} | 0 8 files changed, 21 insertions(+), 12 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.2.0.bb => wireshark_3.2.1.bb} (95%) rename meta-oe/recipes-connectivity/zabbix/{zabbix_4.4.1.bb => zabbix_4.4.5.bb} (95%) rename meta-oe/recipes-devtools/protobuf/{protobuf_3.10.1.bb => protobuf_3.11.3.bb} (96%) rename meta-oe/recipes-graphics/xorg-app/{xterm_351.bb => xterm_353.bb} (81%) rename meta-python/recipes-devtools/python/{python3-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:17 +0000 Subject: [oe-commits] [meta-openembedded] 02/08: mosquitto: Use mosquitto.init for daemon init In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.0C68E232A51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 257ea010b716073acbe6866f4c3968b4962fdc37 Author: Mike Krupicka AuthorDate: Mon Feb 10 14:41:43 2020 +0000 mosquitto: Use mosquitto.init for daemon init Config file specification is missing in start) case. It is present already in restart) case. Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init index 6a0c127..9d5963c 100644 --- a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init +++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init @@ -38,7 +38,7 @@ export PATH="${PATH:+$PATH:}@SBINDIR@:@BASE_SBINDIR@" case "$1" in start) echo "Starting Mosquitto message broker" "mosquitto" - if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} ; then + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c @SYSCONFDIR@/mosquitto/mosquitto.conf ; then exit 0 else exit 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:18 +0000 Subject: [oe-commits] [meta-openembedded] 03/08: python3-bitarray: fix name In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.1BD10232A52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f5ab14744a6abec6ece2a7aeab584278ddbeac78 Author: Trevor Woerner AuthorDate: Mon Feb 10 17:45:30 2020 -0500 python3-bitarray: fix name This recipe's filename is missing a trailing 'b'. Signed-off-by: Trevor Woerner Signed-off-by: Khem Raj --- .../python/{python3-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-bitarray_1.2.1.b b/meta-python/recipes-devtools/python/python3-bitarray_1.2.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-bitarray_1.2.1.b rename to meta-python/recipes-devtools/python/python3-bitarray_1.2.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:19 +0000 Subject: [oe-commits] [meta-openembedded] 04/08: mozjs: Fix python3 build with gold In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.30E98232A53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 89b9507d8954bcef8d5df13420dc217f98858815 Author: Andreas M?ller AuthorDate: Tue Feb 11 00:22:15 2020 +0100 mozjs: Fix python3 build with gold Fixes [1] [1] http://errors.yoctoproject.org/Errors/Details/390559/ Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../mozjs/mozjs/0001-Port-build-to-python3.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch index 695dd97..e525047 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch @@ -35,7 +35,7 @@ Signed-off-by: Andreas M?ller build/moz.configure/init.configure | 31 +- build/moz.configure/keyfiles.configure | 4 +- build/moz.configure/old.configure | 32 +- - build/moz.configure/toolchain.configure | 16 +- + build/moz.configure/toolchain.configure | 18 +- build/moz.configure/util.configure | 9 +- build/moz.configure/windows.configure | 10 +- build/templates.mozbuild | 2 +- @@ -451,6 +451,15 @@ index fc640c75e..c5508dfb7 100755 def pgo_flags(compiler): if compiler.type in ('gcc', 'clang'): return namespace( +@@ -1517,6 +1517,8 @@ def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_e + gold = check_cmd_output(*detection_cmd).strip() + if not gold: + return ++ if isinstance(gold, bytes): ++ gold = gold.decode('utf-8') + + goldFullPath = find_program(gold) + if goldFullPath is None: diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure index 3284fd8b5..218813e2d 100644 --- a/build/moz.configure/util.configure -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:22 +0000 Subject: [oe-commits] [meta-openembedded] 07/08: xterm: upgrade 351 -> 353 In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.76FB7232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d671941f3fbecc8d07e9ab66ea12802a80f81b8c Author: Wang Mingyu AuthorDate: Tue Feb 11 09:21:32 2020 -0800 xterm: upgrade 351 -> 353 Copyright updated: 1996-2018,2019 -> 1999-2019,2020 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/xorg-app/{xterm_351.bb => xterm_353.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_351.bb b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb similarity index 81% rename from meta-oe/recipes-graphics/xorg-app/xterm_351.bb rename to meta-oe/recipes-graphics/xorg-app/xterm_353.bb index 40ee555..6de704d 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_351.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb @@ -2,14 +2,14 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=c7faceb872d90115e7c0ad90e90c390d" +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[md5sum] = "a07edfbee2e2f4c6a9ddbf834fa4bbec" -SRC_URI[sha256sum] = "760a8a10221c9c9744afd86db87c7ad95bbf9be4f5f525fecf39125f0d2a6e16" +SRC_URI[md5sum] = "247c30ebfa44623f3a2d100e0cae5c7f" +SRC_URI[sha256sum] = "e521d3ee9def61f5d5c911afc74dd5c3a56ce147c7071c74023ea24cac9bb768" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:20 +0000 Subject: [oe-commits] [meta-openembedded] 05/08: packagegroup-meta-perl: fix package name In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.4CB16232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 14cdea0f901d8567c44a6d8792fd4b11feb47130 Author: Trevor Woerner AuthorDate: Mon Feb 10 17:49:08 2020 -0500 packagegroup-meta-perl: fix package name There is no libcrypt-openssl-guess package, but there is a libcrypt-openssl-guess-perl. Signed-off-by: Trevor Woerner Signed-off-by: Khem Raj --- meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb b/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb index 9d0e33b..9b2406b 100644 --- a/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb +++ b/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb @@ -16,7 +16,7 @@ RDEPENDS_packagegroup-meta-perl = "\ libtext-wrapi18n-perl liblocale-gettext-perl libdata-hexdump-perl \ libextutils-installpaths-perl libextutils-helpers-perl libextutils-parsexs-perl \ libextutils-config-perl libextutils-cppguess-perl libimport-into-perl \ - libcrypt-openssl-rsa-perl libcrypt-openssl-guess libcrypt-openssl-random-perl \ + libcrypt-openssl-rsa-perl libcrypt-openssl-guess-perl libcrypt-openssl-random-perl \ libxml-sax-writer-perl libxml-libxml-perl libxml-filter-buffertext-perl \ adduser \ libauthen-sasl-perl libnet-ldap-perl libnet-dns-perl \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:21 +0000 Subject: [oe-commits] [meta-openembedded] 06/08: wireshark: upgrade 3.2.0 -> 3.2.1 In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.61C31232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cc8d955f2f229b75ca1ae81601a6e9f5df7b9ac9 Author: Wang Mingyu AuthorDate: Tue Feb 11 09:21:31 2020 -0800 wireshark: upgrade 3.2.0 -> 3.2.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../wireshark/{wireshark_3.2.0.bb => wireshark_3.2.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb similarity index 95% rename from meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb rename to meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb index df46b33..5f89ec8 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.2.0.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb @@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[md5sum] = "259915adbbaded15de075afe7b4b03b6" -SRC_URI[sha256sum] = "4cfd33a19a454ff4002243e9d04d6afd64280a109a21ae652a192f2be2b1b66c" +SRC_URI[md5sum] = "e699b1e001c6303013791d81faf7727d" +SRC_URI[sha256sum] = "589f640058d6408ebbd695a80ebbd6e7bd99d8db64ecda253d27100dfd27e85b" PE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 12 00:47:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 12 Feb 2020 00:47:23 +0000 Subject: [oe-commits] [meta-openembedded] 08/08: zabbix: upgrade 4.4.1 -> 4.4.5 In-Reply-To: <158146843543.3968.13550232952821530728@git.openembedded.org> References: <158146843543.3968.13550232952821530728@git.openembedded.org> Message-ID: <20200212004716.8B32F232A4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c13246e4631288966ddffc02eae49e66d5eccb31 Author: Wang Mingyu AuthorDate: Tue Feb 11 09:21:33 2020 -0800 zabbix: upgrade 4.4.1 -> 4.4.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-connectivity/zabbix/{zabbix_4.4.1.bb => zabbix_4.4.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.1.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.5.bb similarity index 95% rename from meta-oe/recipes-connectivity/zabbix/zabbix_4.4.1.bb rename to meta-oe/recipes-connectivity/zabbix/zabbix_4.4.5.bb index 656ff0d..108813f 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.1.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.5.bb @@ -28,8 +28,8 @@ SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stab file://zabbix-agent.service \ " -SRC_URI[md5sum] = "e9df94149790f86732f18d042b70155d" -SRC_URI[sha256sum] = "0bf74e597dd41a558305fe17a2b1ed6fe2d77044b87696a92e4227fbf315564a" +SRC_URI[md5sum] = "69ab0c1bbf9d1f8979664498d36cc9a6" +SRC_URI[sha256sum] = "94a897825b062e17b34767c0864305cee6a87476dda8bee88dcf845b24bed0ea" inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 02:15:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 02:15:04 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (611b0c7 -> c13246e) Message-ID: <158156010470.15209.4503739810512683199@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from 611b0c7 python3-alembic: update to version 1.4.0 add 036169a python3-aiofiles: consolidate inc and bb files into a single bb file add 999b334 python3-anyjson: consolidate inc and bb files into a single bb file add 299e3ac python3-appdirs: consolidate inc and bb files into a single bb file add 0e902f8 python3-asn1crypto: consolidate inc and bb files into a single bb file add 6c2b3ae python3-astroid: consolidate inc and bb files into a single bb file add 190dc15 python3-async-timeout: consolidate inc and bb files into a single bb file add bd1d27c python3-atomicwrites: consolidate inc and bb files into a single bb file add b9db125 python3-attr: consolidate inc and bb files into a single bb file add 04cd18f python3-attrs: consolidate inc and bb files into a single bb file add 6b9db43 python3-automat: consolidate inc and bb files into a single bb file add d2cdaa9 python3-aws-iot-device-sdk-python: consolidate inc and bb files into a single bb file add 17bf230 python3-babel: consolidate inc and bb files into a single bb file add 4fc03d0 python3-babel: upgrade to version 2.8.0 add c6e9762 python3-backports-functools-lru-cache: consolidate inc and bb files into a single bb file add df65d98 python3-backports-functools-lru-cache: update to version 1.6.1 add dbdade5 protobuf: upgrade to 3.11.3 add 257ea01 mosquitto: Use mosquitto.init for daemon init add f5ab147 python3-bitarray: fix name add 89b9507 mozjs: Fix python3 build with gold add 14cdea0 packagegroup-meta-perl: fix package name add cc8d955 wireshark: upgrade 3.2.0 -> 3.2.1 add d671941 xterm: upgrade 351 -> 353 add c13246e zabbix: upgrade 4.4.1 -> 4.4.5 No new revisions were added by this update. Summary of changes: .../mosquitto/files/mosquitto.init | 2 +- .../{wireshark_3.2.0.bb => wireshark_3.2.1.bb} | 4 +- .../zabbix/{zabbix_4.4.1.bb => zabbix_4.4.5.bb} | 4 +- .../{protobuf_3.10.1.bb => protobuf_3.11.3.bb} | 4 +- .../mozjs/mozjs/0001-Port-build-to-python3.patch | 11 +++++- .../xorg-app/{xterm_351.bb => xterm_353.bb} | 6 +-- .../packagegroups/packagegroup-meta-perl.bb | 2 +- .../recipes-devtools/python/python-aiofiles.inc | 14 ------- .../recipes-devtools/python/python-anyjson.inc | 13 ------- .../recipes-devtools/python/python-appdirs.inc | 8 ---- .../recipes-devtools/python/python-asn1crypto.inc | 23 ------------ .../recipes-devtools/python/python-astroid.inc | 33 ----------------- .../python/python-async-timeout.inc | 19 ---------- .../python/python-atomicwrites.inc | 7 ---- .../recipes-devtools/python/python-attr.inc | 9 ----- .../recipes-devtools/python/python-attrs.inc | 16 -------- .../recipes-devtools/python/python-automat.inc | 24 ------------ .../python/python-aws-iot-device-sdk-python.inc | 41 --------------------- .../python/python3-aiofiles_0.4.0.bb | 18 ++++++++- .../python/python3-anyjson_0.3.3.bb | 15 +++++++- .../python/python3-appdirs_1.4.3.bb | 10 ++++- .../python/python3-asn1crypto_1.3.0.bb | 22 ++++++++++- .../python/python3-astroid_2.3.3.bb | 35 +++++++++++++++++- .../python/python3-async-timeout_3.0.1.bb | 21 ++++++++++- .../python/python3-atomicwrites_1.3.0.bb | 9 ++++- .../recipes-devtools/python/python3-attr_0.3.1.bb | 11 +++++- .../python/python3-attrs_19.3.0.bb | 18 ++++++++- ...001-setup.py-remove-the-dependency-on-m2r.patch | 0 .../python/python3-automat_0.8.0.bb | 23 +++++++++++- .../python3-aws-iot-device-sdk-python_1.4.7.bb | 43 +++++++++++++++++++++- .../recipes-devtools/python/python3-babel_2.7.0.bb | 2 - .../{python-babel.inc => python3-babel_2.8.0.bb} | 6 +-- .../python3-backports-functools-lru-cache_1.5.bb | 2 - ...python3-backports-functools-lru-cache_1.6.1.bb} | 8 ++-- ...-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} | 0 35 files changed, 232 insertions(+), 251 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.2.0.bb => wireshark_3.2.1.bb} (95%) rename meta-oe/recipes-connectivity/zabbix/{zabbix_4.4.1.bb => zabbix_4.4.5.bb} (95%) rename meta-oe/recipes-devtools/protobuf/{protobuf_3.10.1.bb => protobuf_3.11.3.bb} (96%) rename meta-oe/recipes-graphics/xorg-app/{xterm_351.bb => xterm_353.bb} (81%) delete mode 100644 meta-python/recipes-devtools/python/python-aiofiles.inc delete mode 100644 meta-python/recipes-devtools/python/python-anyjson.inc delete mode 100644 meta-python/recipes-devtools/python/python-appdirs.inc delete mode 100644 meta-python/recipes-devtools/python/python-asn1crypto.inc delete mode 100644 meta-python/recipes-devtools/python/python-astroid.inc delete mode 100644 meta-python/recipes-devtools/python/python-async-timeout.inc delete mode 100644 meta-python/recipes-devtools/python/python-atomicwrites.inc delete mode 100644 meta-python/recipes-devtools/python/python-attr.inc delete mode 100644 meta-python/recipes-devtools/python/python-attrs.inc delete mode 100644 meta-python/recipes-devtools/python/python-automat.inc delete mode 100644 meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc rename meta-python/recipes-devtools/python/{python-automat => python3-automat}/0001-setup.py-remove-the-dependency-on-m2r.patch (100%) delete mode 100644 meta-python/recipes-devtools/python/python3-babel_2.7.0.bb rename meta-python/recipes-devtools/python/{python-babel.inc => python3-babel_2.8.0.bb} (77%) delete mode 100644 meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.5.bb rename meta-python/recipes-devtools/python/{python-backports-functools-lru-cache.inc => python3-backports-functools-lru-cache_1.6.1.bb} (58%) rename meta-python/recipes-devtools/python/{python3-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:51 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (44a4ac2 -> 837cd3c) Message-ID: <158159639122.6676.8846206379968265496@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 44a4ac2 systemd: upgrade 243.4 -> 244.1 new 498e0f8 pciutils: upgrade 3.6.2 -> 3.6.4 new a50d016 testimage: Allow testing on QEMU machines with a single serial port new 3ab2cbf testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested new cfd71a6 xserver-nodm-init: Fix the start failure for non-root user new 169ebd5 kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE new c7c12ef populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK new a60bf84 libubootenv: Split binaries to a libubootenv-bin package new d303280 meta/recipes-graphics/waffle: Add python3 dependency new 7161310 scripts/lib/resulttool/report: Enable report selected test case result new 837cd3c pkgconf: Remove pointless DEFAULT_PREFERENCE The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel-fitimage.bbclass | 5 ++- meta/classes/populate_sdk_base.bbclass | 1 + meta/classes/testimage.bbclass | 40 ++++++++++++++++++++++ meta/lib/oeqa/core/target/qemu.py | 8 +++-- meta/lib/oeqa/utils/qemurunner.py | 31 ++++++++++++++--- meta/recipes-bsp/pciutils/pciutils/configure.patch | 4 +-- .../{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 +-- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 4 +-- meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb | 1 - meta/recipes-graphics/waffle/waffle_1.6.0.bb | 2 ++ .../x11-common/xserver-nodm-init/capability.conf | 2 ++ .../x11-common/xserver-nodm-init/xserver-nodm | 8 +++++ .../x11-common/xserver-nodm-init_3.0.bb | 7 ++-- scripts/lib/resulttool/report.py | 33 +++++++++++++++--- 14 files changed, 126 insertions(+), 24 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} (92%) create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:52 +0000 Subject: [oe-commits] [openembedded-core] 01/10: pciutils: upgrade 3.6.2 -> 3.6.4 In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.7EBED232A53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 498e0f83040fe2e83805d8b13d69c17c74a520ba Author: Wang Mingyu AuthorDate: Sat Feb 8 09:00:55 2020 -0800 pciutils: upgrade 3.6.2 -> 3.6.4 refresh the following patch: configure.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 4 ++-- meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index a7e4457..e444c13 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -24,7 +24,7 @@ Index: pciutils-3.5.6/Makefile - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ - %.8 %.7: %.man + %.8 %.7 %.5: %.man M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" Index: pciutils-3.5.6/lib/configure =================================================================== @@ -70,7 +70,7 @@ Index: pciutils-3.5.6/lib/configure fi [ -n "$RELEASE" ] && rel="${RELEASE}" # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. -@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ +@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo " $host $rel $cpu $sys" diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb similarity index 92% rename from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb rename to meta/recipes-bsp/pciutils/pciutils_3.6.4.bb index 413421c..034bb63 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82" -SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" +SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" +SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" inherit multilib_header pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:54 +0000 Subject: [oe-commits] [openembedded-core] 03/10: testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.974E0232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3ab2cbfeff371e8791b031a2852eeef80101a831 Author: Alejandro Hernandez Samaniego AuthorDate: Sat Feb 8 02:32:02 2020 -0800 testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested The current runtime infrastructure contains hardcoded values which Ill refer to as patterns, these patterns are either searched through or sent via the serial terminal to communicate between HOST and TARGET. These patterns are required since they allow us to check when a device has finished booting, to log in, and to check whether a command sent from our tests has returned, this way we are able to check both the status of the commands that were sent along with its output. The testing process goes somewhat as follows: 1. Launch QEMU and start booting. 2. Check when the device has booted by looking for the pattern login:. 3. Log in as the root user (default for our images). 4. Check that we were able to log in succesfully. 5. Start running the runtime test cases defined by TEST_SUITES. 6. One of such test cases could send a command to the QEMU target. 7. Check whether that command returned. 8. Check its output and status, return whether the test case passed or failed. This patch allows this set of patterns to be defined instead of being hardcoded, but it also automatically sets the defaults that we have been using in the past if they have not been manually defined, for this reason, the patch is less invasive and should not affect in any way how tests are currently being run. Cases that can be enabled with this patch: - A customized image that does not use the root user (or maybe we want to check what happens if we dont use the root user). - An image where the PS1 env variable has been modified, and the prompt pattern wouldnt match the default. - Baremetal applications, which do not follow the conventional way of booting Linux and would probably not show a prompt for a user to log in, same applies for testing bootloaders. - poky-tiny: Using DISTRO=poky-tiny and an image such as the core-image-tiny from meta-intel, which boots directly to RAM, and does not show a log in prompt since it does not contain a conventional init process. The code itself contains comments that should be self explanatory but here is an example on how these patterns can be defined in a hypothetical case where we want to run test cases as the webserver user instead: TESTIMAGE_BOOT_PATTERNS = "send_login_user search_login_succeeded" TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" TESTIMAGE_BOOT_PATTERNS[search_login_succeeded] = "webserver@[a-zA-Z0-9\-]+:~#" The variable TESTIMAGE_BOOT_PATTERNS defines which patterns to override when used to communicate with the target when booting, anyone familiar with the PACKAGECONFIG syntax should have no trouble setting these. Other patterns would still be set up as default, e.g. search_reached_prompt would still be login: The accepted flags for TESTIMAGE_BOOT_PATTERNS are the following: search_reached_prompt, send_login_user, search_login_succeeded, search_cmd_finished. They are prefixed with either search/send, to differentiate if the pattern is meant to be sent or searched to/from the target terminal. A working example of this code that falls under the baremetal case mentioned above along with a test case is present on the meta-freertos layer, which tests an RTOS image built with OpenEmbedded and automatically runs a test case on it after booting such image: As usual, INHERIT += "testimage" needs to be present on local.conf $ bitbake freertos-demo -c testimage RESULTS: RESULTS - freertos_echo.FreeRTOSTest.test_freertos_echo: PASSED (2.00s) SUMMARY: freertos-demo () - Ran 1 test in 2.006s freertos-demo - OK - All required tests passed (successes=1, skipped=0, failures=0, errors=0) Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 39 +++++++++++++++++++++++++++++++++++++++ meta/lib/oeqa/core/target/qemu.py | 7 +++++-- meta/lib/oeqa/utils/qemurunner.py | 31 ++++++++++++++++++++++++++----- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 0d55c32..75f0f2c 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -34,6 +34,17 @@ TESTIMAGE_AUTO ??= "0" # TEST_QEMUPARAMS can be used to pass extra parameters to qemu, e.g. "-m 1024" for setting the amount of ram to 1 GB. # TEST_RUNQEMUPARAMS can be used to pass extra parameters to runqemu, e.g. "gl" to enable OpenGL acceleration. +# TESTIMAGE_BOOT_PATTERNS can be used to override certain patterns used to communicate with the target when booting, +# if a pattern is not specifically present on this variable a default will be used when booting the target. +# TESTIMAGE_BOOT_PATTERNS[] overrides the pattern used for that specific flag, where flag comes from a list of accepted flags +# e.g. normally the system boots and waits for a login prompt (login:), after that it sends the command: "root\n" to log as the root user +# if we wanted to log in as the hypothetical "webserver" user for example we could set the following: +# TESTIMAGE_BOOT_PATTERNS = "send_login_user search_login_succeeded" +# TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" +# TESTIMAGE_BOOT_PATTERNS[search_login_succeeded] = "webserver@[a-zA-Z0-9\-]+:~#" +# The accepted flags are the following: search_reached_prompt, send_login_user, search_login_succeeded, search_cmd_finished. +# They are prefixed with either search/send, to differentiate if the pattern is meant to be sent or searched to/from the target terminal + TEST_LOG_DIR ?= "${WORKDIR}/testimage" TEST_EXPORT_DIR ?= "${TMPDIR}/testimage/${PN}" @@ -68,6 +79,8 @@ TEST_TARGET ?= "qemu" TEST_QEMUPARAMS ?= "" TEST_RUNQEMUPARAMS ?= "" +TESTIMAGE_BOOT_PATTERNS ?= "" + TESTIMAGEDEPENDS = "" TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}" @@ -150,6 +163,29 @@ def get_testimage_json_result_dir(d): def get_testimage_result_id(configuration): return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['MACHINE'], configuration['STARTTIME']) +def get_testimage_boot_patterns(d): + from collections import defaultdict + boot_patterns = defaultdict(str) + # Only accept certain values + accepted_patterns = ['search_reached_prompt', 'send_login_user', 'search_login_succeeded', 'search_cmd_finished'] + # Not all patterns need to be overriden, e.g. perhaps we only want to change the user + boot_patterns_flags = d.getVarFlags('TESTIMAGE_BOOT_PATTERNS') or {} + if boot_patterns_flags: + patterns_set = [p for p in boot_patterns_flags.items() if p[0] in d.getVar('TESTIMAGE_BOOT_PATTERNS').split()] + for flag, flagval in patterns_set: + if flag not in accepted_patterns: + bb.fatal('Testimage: The only accepted boot patterns are: search_reached_prompt,send_login_user, \ + search_login_succeeded,search_cmd_finished\n Make sure your TESTIMAGE_BOOT_PATTERNS=%s \ + contains an accepted flag.' % d.getVar('TESTIMAGE_BOOT_PATTERNS')) + return + # We know boot prompt is searched through in binary format, others might be expressions + if flag == 'search_reached_prompt': + boot_patterns[flag] = flagval.encode() + else: + boot_patterns[flag] = flagval.encode().decode('unicode-escape') + return boot_patterns + + def testimage_main(d): import os import json @@ -259,6 +295,9 @@ def testimage_main(d): 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), } + if d.getVar("TESTIMAGE_BOOT_PATTERNS"): + target_kwargs['boot_patterns'] = get_testimage_boot_patterns(d) + # TODO: Currently BBPATH is needed for custom loading of targets. # It would be better to find these modules using instrospection. target_kwargs['target_modules_path'] = d.getVar('BBPATH') diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 008a9f0..059106e 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -8,6 +8,7 @@ import os import sys import signal import time +from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner @@ -18,7 +19,8 @@ class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, dump_dir='', dump_host_cmds='', display='', bootlog='', - tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): + tmpdir='', dir_image='', boottime=60, serial_ports=2, + boot_patterns = defaultdict(str), **kwargs): super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) @@ -30,13 +32,14 @@ class OEQemuTarget(OESSHTarget): self.kernel = kernel self.kvm = kvm self.use_slirp = slirp + self.boot_patterns = boot_patterns self.runner = QemuRunner(machine=machine, rootfs=rootfs, tmpdir=tmpdir, deploy_dir_image=dir_image, display=display, logfile=bootlog, boottime=boottime, use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, dump_host_cmds=dump_host_cmds, logger=logger, - serial_ports=serial_ports) + serial_ports=serial_ports, boot_patterns = boot_patterns) def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 4704422..ed74ea8 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -21,6 +21,7 @@ import threading import codecs import logging from oeqa.utils.dump import HostDumper +from collections import defaultdict # Get Unicode non printable control chars control_range = list(range(0,32))+list(range(127,160)) @@ -31,7 +32,7 @@ re_control_char = re.compile('[%s]' % re.escape("".join(control_chars))) class QemuRunner: def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, - use_kvm, logger, use_slirp=False, serial_ports=2): + use_kvm, logger, use_slirp=False, serial_ports=2, boot_patterns = defaultdict(str)): # Popen object for runqemu self.runqemu = None @@ -57,6 +58,7 @@ class QemuRunner: self.use_slirp = use_slirp self.serial_ports = serial_ports self.msg = '' + self.boot_patterns = boot_patterns self.runqemutime = 120 self.qemu_pidfile = 'pidfile_'+str(os.getpid()) @@ -65,6 +67,25 @@ class QemuRunner: self.logger = logger + # Enable testing other OS's + # Set commands for target communication, and default to Linux ALWAYS + # Other OS's or baremetal applications need to provide their + # own implementation passing it through QemuRunner's constructor + # or by passing them through TESTIMAGE_BOOT_PATTERNS[flag] + # provided variables, where is one of the mentioned below. + accepted_patterns = ['search_reached_prompt', 'send_login_user', 'search_login_succeeded', 'search_cmd_finished'] + default_boot_patterns = defaultdict(str) + # Default to the usual paterns used to communicate with the target + default_boot_patterns['search_reached_prompt'] = b' login:' + default_boot_patterns['send_login_user'] = 'root\n' + default_boot_patterns['search_login_succeeded'] = r"root@[a-zA-Z0-9\-]+:~#" + default_boot_patterns['search_cmd_finished'] = r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#" + + # Only override patterns that were set e.g. login user TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" + for pattern in accepted_patterns: + if not self.boot_patterns[pattern]: + self.boot_patterns[pattern] = default_boot_patterns[pattern] + def create_socket(self): try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -321,7 +342,7 @@ class QemuRunner: self.log(data) data = b'' - if b' login:' in bootlog: + if self.boot_patterns['search_reached_prompt'] in bootlog: self.server_socket = qemusock stopread = True reachedlogin = True @@ -353,8 +374,8 @@ class QemuRunner: # If we are not able to login the tests can continue try: - (status, output) = self.run_serial("root\n", raw=True) - if re.search(r"root@[a-zA-Z0-9\-]+:~#", output): + (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True) + if re.search(self.boot_patterns['search_login_succeeded'], output): self.logged = True self.logger.debug("Logged as root in serial console") if netconf: @@ -478,7 +499,7 @@ class QemuRunner: if answer: data += answer.decode('utf-8') # Search the prompt to stop - if re.search(r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#", data): + if re.search(self.boot_patterns['search_cmd_finished'], data): break else: raise Exception("No data on serial console socket") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:53 +0000 Subject: [oe-commits] [openembedded-core] 02/10: testimage: Allow testing on QEMU machines with a single serial port In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.8A5A9232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a50d0163770f0b405a8de8a8a9cccd48c1de4112 Author: Alejandro Hernandez Samaniego AuthorDate: Sat Feb 8 02:30:04 2020 -0800 testimage: Allow testing on QEMU machines with a single serial port commmit 6cde67d0a84 enables the use of qemurunner on machines that only have a single serial port, but still sets the default value as serial_ports=2 if not provided. The testimage class does not call qemurunner with a serial_ports argument, hence always defaulting to two. Pass the serial_ports argument from the testimage class to allow tests to run on QEMU machines with a single serial port. Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 1 + meta/lib/oeqa/core/target/qemu.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 844ed87..0d55c32 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -256,6 +256,7 @@ def testimage_main(d): 'kvm' : kvm, 'slirp' : slirp, 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), + 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), } # TODO: Currently BBPATH is needed for custom loading of targets. diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 758703c..008a9f0 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -18,7 +18,7 @@ class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, dump_dir='', dump_host_cmds='', display='', bootlog='', - tmpdir='', dir_image='', boottime=60, **kwargs): + tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) @@ -35,7 +35,8 @@ class OEQemuTarget(OESSHTarget): deploy_dir_image=dir_image, display=display, logfile=bootlog, boottime=boottime, use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, - dump_host_cmds=dump_host_cmds, logger=logger) + dump_host_cmds=dump_host_cmds, logger=logger, + serial_ports=serial_ports) def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:55 +0000 Subject: [oe-commits] [openembedded-core] 04/10: xserver-nodm-init: Fix the start failure for non-root user In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.A00D0232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cfd71a68a4931c8bda15357ebb1e9ebcf0e302dc Author: Kevin Hao AuthorDate: Sat Feb 8 20:36:42 2020 +0800 xserver-nodm-init: Fix the start failure for non-root user In order to start the xserver, a non-root user should have the cap_sys_admin capability to set the drm master. We try to get the cap_sys_admin capability by setting it in both the thread and file inheritable set. The side effect of this is that we would have to add the "pam" to the distro features if we want use the xserver-nodm-init for a non-root user. [Yocto #11526] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- .../recipes-graphics/x11-common/xserver-nodm-init/capability.conf | 2 ++ meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 8 ++++++++ meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf new file mode 100644 index 0000000..7ab7460 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf @@ -0,0 +1,2 @@ +cap_sys_admin @USER@ +none * diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index 6c54855..116bb27 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -38,6 +38,14 @@ case "$1" in if [ -e /dev/hidraw0 ]; then chmod o+rw /dev/hidraw* fi + # Make sure that the Xorg has the cap_sys_admin capability which is + # needed for setting the drm master + if ! grep -q "^auth.*pam_cap\.so" /etc/pam.d/su; then + echo "auth optional pam_cap.so" >>/etc/pam.d/su + fi + if ! /usr/sbin/getcap $XSERVER | grep -q cap_sys_admin; then + /usr/sbin/setcap cap_sys_admin+eip $XSERVER + fi fi # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 385fea5..c2995f9 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -10,6 +10,7 @@ SRC_URI = "file://xserver-nodm \ file://gplv2-license.patch \ file://xserver-nodm.service.in \ file://xserver-nodm.conf.in \ + file://capability.conf \ " S = "${WORKDIR}" @@ -19,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d systemd features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}" PACKAGECONFIG ??= "blank" # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG @@ -40,6 +41,8 @@ do_install() { if [ "${ROOTLESS_X}" = "1" ] ; then XUSER_HOME="/home/xuser" XUSER="xuser" + install -D capability.conf ${D}${sysconfdir}/security/capability.conf + sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/security/capability.conf else XUSER_HOME=${ROOT_HOME} XUSER="root" @@ -60,7 +63,7 @@ do_install() { fi } -RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:58 +0000 Subject: [oe-commits] [openembedded-core] 07/10: libubootenv: Split binaries to a libubootenv-bin package In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.BB451232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a60bf84b15be85ae0f16b5f85fec98b3365f15de Author: Otavio Salvador AuthorDate: Fri Jan 31 10:33:23 2020 -0300 libubootenv: Split binaries to a libubootenv-bin package The fw_setenv and fw_printenv binaries should be on a specific package as some systems may require just the library. The upgrade path was kept using the RPROVIDES for the -bin package. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index 1020258..f5b6059 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -16,11 +16,11 @@ SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" S = "${WORKDIR}/git" -inherit cmake +inherit cmake lib_package EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" PROVIDES += "u-boot-fw-utils" -RPROVIDES_${PN} += "u-boot-fw-utils" +RPROVIDES_${PN}-bin += "u-boot-fw-utils" BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:59 +0000 Subject: [oe-commits] [openembedded-core] 08/10: meta/recipes-graphics/waffle: Add python3 dependency In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.C5183232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d3032809136707b584e7938c01e77da36abc1b00 Author: An?bal Lim?n AuthorDate: Tue Jan 14 10:20:23 2020 -0600 meta/recipes-graphics/waffle: Add python3 dependency The python3native.bbclass set PYTHON_{LIBRARY, INCLUDE_DIR} pointing to python target build, a patch was add to use target _sysconfigdata too [1] but is not available without python3 dependency. Fixes waffle build when trying to find _sysconfigdata module, ... | Program python3 found: YES (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) | | meson.build:36:0: ERROR: ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools | | A full log can be found at /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt | WARNING: exit code 1 from a shell command. ... [1] http://git.openembedded.org/openembedded-core/commit/?id=02714c105426b0d687620913c1a7401b386428b6 Signed-off-by: An?bal Lim?n Signed-off-by: Richard Purdie --- meta/recipes-graphics/waffle/waffle_1.6.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/waffle/waffle_1.6.0.bb b/meta/recipes-graphics/waffle/waffle_1.6.0.bb index 52cb1df..a620295 100644 --- a/meta/recipes-graphics/waffle/waffle_1.6.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.6.0.bb @@ -11,6 +11,8 @@ UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" inherit meson features_check lib_package bash-completion +DEPENDS_append = " python3" + # This should be overridden per-machine to reflect the capabilities of the GL # stack. PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:57 +0000 Subject: [oe-commits] [openembedded-core] 06/10: populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.B215B232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c7c12efba87c803d94a7c9c2f8c98b66aeba6d43 Author: Mark Hatle AuthorDate: Fri Feb 7 11:43:37 2020 -0600 populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK Since the features are processed by a python fragment, we need to explicitly list the variables that should affect the resulting hash, and thus sstate re-use. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index d03465b..3248bb0 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -21,6 +21,7 @@ def complementary_globs(featurevar, d): SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' +SDKIMAGE_INSTALL_COMPLEMENTARY[vardeps] += "SDKIMAGE_FEATURES" PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target" SDK_PACKAGE_ARCHS += "sdk-provides-dummy-${SDKPKGSUFFIX}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:19:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:19:56 +0000 Subject: [oe-commits] [openembedded-core] 05/10: kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.A88A8232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 169ebd59f11845a3a5a7157719217ccf0844e448 Author: Alex Kiernan AuthorDate: Fri Jan 31 16:24:42 2020 +0000 kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE When using EXTERNAL_KERNEL_DEVICETREE, collect DTB overlays too (*.dtbo) as well as iterating down into sub-directories so using the behaviour for naming which matches KERNEL_DEVICETREE. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index ec18a3d..d1b8cdc 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,11 +391,10 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do - DTB=`basename ${DTBFILE}` + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" - fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE} + fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" done fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:00 +0000 Subject: [oe-commits] [openembedded-core] 09/10: scripts/lib/resulttool/report: Enable report selected test case result In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.CF032232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7161310ce32d6e0c397d0132808d556bdc80d183 Author: Yeoh Ee Peng AuthorDate: Fri Jan 31 13:47:42 2020 +0800 scripts/lib/resulttool/report: Enable report selected test case result Enable reporting selected test case result given the user provided the selected test case id. If both test result id and test case id were provided, report the selected test case result from the selected test result id. Signed-off-by: Yeoh Ee Peng Signed-off-by: Richard Purdie --- scripts/lib/resulttool/report.py | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/scripts/lib/resulttool/report.py b/scripts/lib/resulttool/report.py index 692dd7a..7ceceac 100644 --- a/scripts/lib/resulttool/report.py +++ b/scripts/lib/resulttool/report.py @@ -212,7 +212,21 @@ class ResultsTextReport(object): maxlen=maxlen) print(output) - def view_test_report(self, logger, source_dir, branch, commit, tag, use_regression_map, raw_test): + def view_test_report(self, logger, source_dir, branch, commit, tag, use_regression_map, raw_test, selected_test_case_only): + def print_selected_testcase_result(testresults, selected_test_case_only): + for testsuite in testresults: + for resultid in testresults[testsuite]: + result = testresults[testsuite][resultid]['result'] + test_case_result = result.get(selected_test_case_only, {}) + if test_case_result.get('status'): + print('Found selected test case result for %s from %s' % (selected_test_case_only, + resultid)) + print(test_case_result['status']) + else: + print('Could not find selected test case result for %s from %s' % (selected_test_case_only, + resultid)) + if test_case_result.get('log'): + print(test_case_result['log']) test_count_reports = [] configmap = resultutils.store_map if use_regression_map: @@ -235,12 +249,18 @@ class ResultsTextReport(object): for testsuite in testresults: result = testresults[testsuite].get(raw_test, {}) if result: - raw_results[testsuite] = result + raw_results[testsuite] = {raw_test: result} if raw_results: - print(json.dumps(raw_results, sort_keys=True, indent=4)) + if selected_test_case_only: + print_selected_testcase_result(raw_results, selected_test_case_only) + else: + print(json.dumps(raw_results, sort_keys=True, indent=4)) else: print('Could not find raw test result for %s' % raw_test) return 0 + if selected_test_case_only: + print_selected_testcase_result(testresults, selected_test_case_only) + return 0 for testsuite in testresults: for resultid in testresults[testsuite]: skip = False @@ -268,7 +288,7 @@ class ResultsTextReport(object): def report(args, logger): report = ResultsTextReport() report.view_test_report(logger, args.source_dir, args.branch, args.commit, args.tag, args.use_regression_map, - args.raw_test_only) + args.raw_test_only, args.selected_test_case_only) return 0 def register_commands(subparsers): @@ -287,4 +307,7 @@ def register_commands(subparsers): help='instead of the default "store_map", use the "regression_map" for report') parser_build.add_argument('-r', '--raw_test_only', default='', help='output raw test result only for the user provided test result id') - + parser_build.add_argument('-s', '--selected_test_case_only', default='', + help='output selected test case result for the user provided test case id, if both test ' + 'result id and test case id are provided then output the selected test case result ' + 'from the provided test result id') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:01 +0000 Subject: [oe-commits] [openembedded-core] 10/10: pkgconf: Remove pointless DEFAULT_PREFERENCE In-Reply-To: <158159639122.6676.8846206379968265496@git.openembedded.org> References: <158159639122.6676.8846206379968265496@git.openembedded.org> Message-ID: <20200213121951.D7367232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 837cd3c0ee318ff22065b77c6cc72b4d50abbf27 Author: Richard Purdie AuthorDate: Mon Feb 10 15:58:45 2020 +0000 pkgconf: Remove pointless DEFAULT_PREFERENCE There is no other version of pkgconfig to have a preference against, remove the unneeded variable. Signed-off-by: Richard Purdie --- meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb index 94bc112..732ca2a 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb @@ -8,7 +8,6 @@ BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" RPROVIDES_${PN} += "pkgconfig" -DEFAULT_PREFERENCE = "-1" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:13 +0000 Subject: [oe-commits] [openembedded-core] 01/06: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158159641233.7274.16789321230911541603@git.openembedded.org> References: <158159641233.7274.16789321230911541603@git.openembedded.org> Message-ID: <20200213122012.87783232A53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 979bb639dde469682501ece9daf987228ff0740e Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:12 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b5f8ba5 -> 120de1f) Message-ID: <158159641233.7274.16789321230911541603@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard b5f8ba5 pkgconf: Remove pointless DEFAULT_PREFERENCE discard 651595a scripts/lib/resulttool/report: Enable report selected test case result discard 093c7f6 meta/recipes-graphics/waffle: Add python3 dependency discard 0e670a1 libubootenv: Split binaries to a libubootenv-bin package discard 94b7424 populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK discard 475dd5d rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard ea7836b kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE discard e99310e xserver-nodm-init: Fix the start failure for non-root user discard 4f9edbf testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested discard 413ec61 testimage: Allow testing on QEMU machines with a single serial port discard 3200674 pciutils: upgrade 3.6.2 -> 3.6.4 discard 3df4164 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 40189d4 HACK: signing: Add extra test debug discard fcf3d67 glew/curl: specify exclusive package configs discard 2648c7c base.bbclass: extend PACKAGECONFIG for conflict package configs discard 809f6f5 oescripts.py: use unittest.SkipUnless for class skip add 498e0f8 pciutils: upgrade 3.6.2 -> 3.6.4 add a50d016 testimage: Allow testing on QEMU machines with a single serial port add 3ab2cbf testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested add cfd71a6 xserver-nodm-init: Fix the start failure for non-root user add 169ebd5 kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE add c7c12ef populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK add a60bf84 libubootenv: Split binaries to a libubootenv-bin package add d303280 meta/recipes-graphics/waffle: Add python3 dependency add 7161310 scripts/lib/resulttool/report: Enable report selected test case result add 837cd3c pkgconf: Remove pointless DEFAULT_PREFERENCE new 979bb63 oescripts.py: use unittest.SkipUnless for class skip new e22b2a1 base.bbclass: extend PACKAGECONFIG for conflict package configs new f057929 glew/curl: specify exclusive package configs new d1fe2c4 HACK: signing: Add extra test debug new ecc0585 sstatesig: Log timestamps for hashequiv in reprodubile builds new 120de1f rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b5f8ba5) \ N -- N -- N refs/heads/master-next (120de1f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:14 +0000 Subject: [oe-commits] [openembedded-core] 02/06: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158159641233.7274.16789321230911541603@git.openembedded.org> References: <158159641233.7274.16789321230911541603@git.openembedded.org> Message-ID: <20200213122012.A2438232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e22b2a150a6cb9a26f9cd28811269789baffa799 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:16 +0000 Subject: [oe-commits] [openembedded-core] 04/06: HACK: signing: Add extra test debug In-Reply-To: <158159641233.7274.16789321230911541603@git.openembedded.org> References: <158159641233.7274.16789321230911541603@git.openembedded.org> Message-ID: <20200213122012.E0AAC232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d1fe2c4d0fe52c4ed7f0a7732daa1f0ee41ad8a0 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:15 +0000 Subject: [oe-commits] [openembedded-core] 03/06: glew/curl: specify exclusive package configs In-Reply-To: <158159641233.7274.16789321230911541603@git.openembedded.org> References: <158159641233.7274.16789321230911541603@git.openembedded.org> Message-ID: <20200213122012.C2A89232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f057929149a06c1e91a115c99c1c3523d611d793 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:17 +0000 Subject: [oe-commits] [openembedded-core] 05/06: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158159641233.7274.16789321230911541603@git.openembedded.org> References: <158159641233.7274.16789321230911541603@git.openembedded.org> Message-ID: <20200213122013.0DD33232A53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ecc05851cb5c78208d32afef8f7023f644da98c7 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 12:20:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 12:20:18 +0000 Subject: [oe-commits] [openembedded-core] 06/06: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158159641233.7274.16789321230911541603@git.openembedded.org> References: <158159641233.7274.16789321230911541603@git.openembedded.org> Message-ID: <20200213122013.2C803232A52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 120de1f5970c07b1a233a60902e7caea6f1f83a4 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:11 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: package_ipk: Minor import tweak + ensure packages regenerated Message-ID: <158160301155.19465.5190674840445537273@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. The following commit(s) were added to refs/heads/master by this push: new ef24a54 package_ipk: Minor import tweak + ensure packages regenerated ef24a54 is described below commit ef24a545d11febb96d1c0f02c60d9701295ef592 Author: Richard Purdie AuthorDate: Thu Feb 13 14:06:49 2020 +0000 package_ipk: Minor import tweak + ensure packages regenerated The recent opkg-utils change didn't update all the packages since its marked as ABISAFE (and has to be due to update-alternatives). Fix a minor import issue to avoid multiple imports of glob which also causes packages to re-generate. Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 4f23977..25d1ab7 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -45,6 +45,7 @@ def ipk_write_pkg(pkg, d): import subprocess import textwrap import collections + import glob def cleanupcontrol(root): for p in ['CONTROL', 'DEBIAN']: @@ -101,8 +102,7 @@ def ipk_write_pkg(pkg, d): bb.utils.mkdirhier(pkgoutdir) os.chdir(root) cleanupcontrol(root) - from glob import glob - g = glob('*') + g = glob.glob('*') if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR'))) return -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:17 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (120de1f -> 5d64f35) Message-ID: <158160301709.19701.11822742108617691281@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 120de1f rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard ecc0585 sstatesig: Log timestamps for hashequiv in reprodubile builds discard d1fe2c4 HACK: signing: Add extra test debug discard f057929 glew/curl: specify exclusive package configs discard e22b2a1 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 979bb63 oescripts.py: use unittest.SkipUnless for class skip add ef24a54 package_ipk: Minor import tweak + ensure packages regenerated new 72e4037 oescripts.py: use unittest.SkipUnless for class skip new 021e970 base.bbclass: extend PACKAGECONFIG for conflict package configs new 6fdd975 glew/curl: specify exclusive package configs new 5562a61 HACK: signing: Add extra test debug new 808d4a1 sstatesig: Log timestamps for hashequiv in reprodubile builds new 5d64f35 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (120de1f) \ N -- N -- N refs/heads/master-next (5d64f35) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/package_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:18 +0000 Subject: [oe-commits] [openembedded-core] 01/06: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158160301709.19701.11822742108617691281@git.openembedded.org> References: <158160301709.19701.11822742108617691281@git.openembedded.org> Message-ID: <20200213141017.4DAA2232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72e403734f8e8b7102b55a50745139f89f3c9256 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:19 +0000 Subject: [oe-commits] [openembedded-core] 02/06: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158160301709.19701.11822742108617691281@git.openembedded.org> References: <158160301709.19701.11822742108617691281@git.openembedded.org> Message-ID: <20200213141017.660B0232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 021e9705e691193f60cf169dfc4f73d9856dfa8f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:21 +0000 Subject: [oe-commits] [openembedded-core] 04/06: HACK: signing: Add extra test debug In-Reply-To: <158160301709.19701.11822742108617691281@git.openembedded.org> References: <158160301709.19701.11822742108617691281@git.openembedded.org> Message-ID: <20200213141017.987B2232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5562a61898e6dfc44b78fc82818306c8e9b07e15 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:20 +0000 Subject: [oe-commits] [openembedded-core] 03/06: glew/curl: specify exclusive package configs In-Reply-To: <158160301709.19701.11822742108617691281@git.openembedded.org> References: <158160301709.19701.11822742108617691281@git.openembedded.org> Message-ID: <20200213141017.7D146232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6fdd9755a494b1e5c93ffcc8868930c8662d003b Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:22 +0000 Subject: [oe-commits] [openembedded-core] 05/06: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158160301709.19701.11822742108617691281@git.openembedded.org> References: <158160301709.19701.11822742108617691281@git.openembedded.org> Message-ID: <20200213141017.B0EB5232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 808d4a157f82d64d97d8a9def8d4043f29720945 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:10:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:10:23 +0000 Subject: [oe-commits] [openembedded-core] 06/06: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158160301709.19701.11822742108617691281@git.openembedded.org> References: <158160301709.19701.11822742108617691281@git.openembedded.org> Message-ID: <20200213141017.D03A6232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5d64f35acbf169788aad777896b08c9be56f9fc2 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:14 +0000 Subject: [oe-commits] [openembedded-core] 03/30: musl: Update to latest tip In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142711.EDB35232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0653a8f1850b410448d5e3d411282698067015b6 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:54 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:12 +0000 Subject: [oe-commits] [openembedded-core] 01/30: qemuarm: Disable highmem when QB_MACHINE is virt In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142711.DC4DD232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4ad346e931cc699ab056171cfef0d9a3a23c298f Author: Khem Raj AuthorDate: Thu Feb 13 00:21:50 2020 -0800 qemuarm: Disable highmem when QB_MACHINE is virt running ptests on qemuarm returns fails since it finds errors in kernel logs like below *********************** Central error: [ 4.338465] pci-host-generic 4010000000.pcie: ECAM ioremap failed *********************** Since its a 32bit kernel 4010000000 address is truncated to 10000000 and ends up in conflicts with VIRT_PCIE_MMIO, which ranges from 0x10000000 to 0x3efeffff This is happening because the linux-yocto kernel is not compiled with LPAE support, however, virt machine for qemuarm assumes that by default Should LPAE be enabled by default in kernel config is a separate question Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 26f40b1..367fcef 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MACHINE = "-machine virt" +QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:13 +0000 Subject: [oe-commits] [openembedded-core] 02/30: oeqa: Use --disable-maintainer-mode configure option In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142711.E43B6232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 06576c6f3813aa17317fa357cf57e7b50e3416d0 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:51 2020 -0800 oeqa: Use --disable-maintainer-mode configure option since the versions of autotools might differ on target and build host, plus difference in timestamps for configure and system can result in reconfigure lets avoid that by disabling maintainer mode Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd..d0f9166 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb..902e93f 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:11 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (5d64f35 -> a15562e) Message-ID: <158160403145.32517.2379818940772899599@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 5d64f35 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 4ad346e qemuarm: Disable highmem when QB_MACHINE is virt new 06576c6 oeqa: Use --disable-maintainer-mode configure option new 0653a8f musl: Update to latest tip new 707e913 gdb: Upgrade to 9.1 release new 3ad30a1 busybox: Backport patches to support removal of __NR_clock_gettime new 6e2002b ltp: Fix tescases with 64bit time_t using 32bit arches new ecea045 crosssdk: Set natisdk specific distro features new 5f89fb3 binutils: Bail out if gold is used on 32/64 bit RISC-V new d945caa iputils: Fix systemd and ipv6 detection new f5b7901 icecc.bbclass: replace superfluous "+=" with "=" new 062ed91 ppp: Security fix CVE-2020-8597 new c9bd46d wayland: upgrade 1.17.0 -> 1.18.0 new 7fcfb30 python: Add libarchive-c recipe new 951e562 python: Add magic recipe new 81b7a8e recipes-support: Add diffoscope recipe new 82912c3 oeqa: reproducible: Run diffoscope on saved output new 114ccb2 python3: install _tkinter.*.so to python3-tkinter package new 8af4926 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 new 4a095c4 systemd: upgrade v244.1 -> v244.3 new e483d03 kernel-fitimage: fix devicetree reproducibility new 495efb2 devicetree.bbclass: include symbols in base DT new f8d5c29 mtdev: upgrade 1.1.5 -> 1.1.6 new a9c4220 binutils: additional patch should be added with space. new b3bce98 qemu: Upgrade to 4.2.0 new 2428f5b sudo: upgrade 1.8.30 -> 1.8.31 new 8aeb664 xkeyboard-config: upgrade 2.28 -> 2.29 new e999e96 libtasn1: upgrade 4.15.0 -> 4.16.0 new 0630322 libxcrypt: upgrade 4.4.10 -> 4.4.12 new 1244027 libcheck: upgrade 0.13.0 -> 0.14.0 new a15562e librepo: upgrade 1.11.1 -> 1.11.2 The 30 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/crosssdk.bbclass | 6 + meta/classes/devicetree.bbclass | 2 +- meta/classes/icecc.bbclass | 2 +- meta/classes/kernel-fitimage.bbclass | 2 +- meta/conf/distro/include/maintainers.inc | 3 + meta/conf/distro/include/tcmode-default.inc | 4 +- meta/conf/machine/qemuarm.conf | 2 +- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/reproducible.py | 24 ++- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + ...all-wrappers-around-clock_gettime-closes-.patch | 113 ++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + ...compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 meta/recipes-core/musl/musl_git.bb | 2 +- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 0 ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 5 +- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 7 + meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 --- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 +++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++-- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 +-- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 +++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 ---------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 .../{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- .../python/python3-libarchive-c_2.9.bb | 17 +++ .../python/python3-magic_0.4.15.bb | 19 +++ .../python/python3/python3-manifest.json | 1 + meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 +-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 +- ...fix-regression-in-parsing-vga-cmdline-par.patch | 54 +++++++ ...0011-linux-user-remove-host-stime-syscall.patch | 61 -------- ...2-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 -------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 ...infod-fix-systemd-Documentation-url-error.patch | 28 ++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 ++++++ meta/recipes-extended/iputils/iputils_s20190709.bb | 23 ++- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 81 ++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + meta/recipes-extended/sudo/sudo.inc | 2 +- .../sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 +- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- ...ard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 +- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- meta/recipes-support/diffoscope/diffoscope_136.bb | 15 ++ .../{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 +- .../{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 +- 85 files changed, 779 insertions(+), 836 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} (100%) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) create mode 100644 meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) rename meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} (93%) create mode 100644 meta/recipes-devtools/python/python3-libarchive-c_2.9.bb create mode 100644 meta/recipes-devtools/python/python3-magic_0.4.15.bb rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0012-fix-libcap-header-issue-on-some-distro.patch} (100%) rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) create mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch create mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch rename meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} (92%) delete mode 100644 meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch rename meta/recipes-graphics/wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} (65%) delete mode 100644 meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch rename meta/recipes-graphics/wayland/{wayland_1.17.0.bb => wayland_1.18.0.bb} (84%) rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} (87%) create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb rename meta/recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} (83%) rename meta/recipes-support/libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} (83%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:15 +0000 Subject: [oe-commits] [openembedded-core] 04/30: gdb: Upgrade to 9.1 release In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.05F9E232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 707e9131f1a8f11a468d566c46324425da026730 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:55 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5a..b451f0b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:18 +0000 Subject: [oe-commits] [openembedded-core] 07/30: crosssdk: Set natisdk specific distro features In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.2CC1C232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ecea045359ec7e95731963052decf20c194cc6eb Author: Khem Raj AuthorDate: Thu Feb 13 00:21:58 2020 -0800 crosssdk: Set natisdk specific distro features Currently, normal distro features e.g. ld-is-gold is impacting crosssdk recipes, which actually should not be the case, since that feature is essentially intended for target packages and not nativesdk packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index c718a09..04aecb6 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -5,9 +5,15 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" + python () { # set TUNE_PKGARCH to SDK_ARCH d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # Set features here to prevent appends and distro features backfill + # from modifying nativesdk distro features + features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split()) + filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).split()) + d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered))) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:19 +0000 Subject: [oe-commits] [openembedded-core] 08/30: binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.37C59232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5f89fb3b90a7d92a16b0778943e0ba0b147c78c4 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:59 2020 -0800 binutils: Bail out if gold is used on 32/64 bit RISC-V gold is not supporting risc-v yet and, this will cause subltle errors during build e.g. autoconf not finding certain features like visibility and it could take a while to unwind the problem. Its better to error out early Remove dwp and ld.gold for rv32 as well Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 0fb6cae..a4b9aa5 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -40,6 +40,7 @@ FILES_${PN}-dev = " \ LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS_riscv64 = "" +LDGOLD_ALTS_riscv32 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -83,6 +84,7 @@ LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" @@ -163,3 +165,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:21 +0000 Subject: [oe-commits] [openembedded-core] 10/30: icecc.bbclass: replace superfluous "+=" with "=" In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.4DC45232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f5b79017bc2a81af4b76094a489f2bf481cae48b Author: Robert P. J. Day AuthorDate: Thu Feb 13 08:21:57 2020 -0500 icecc.bbclass: replace superfluous "+=" with "=" Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index bc3d6f4..d095305 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend += "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@icecc_dep_prepend(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:17 +0000 Subject: [oe-commits] [openembedded-core] 06/30: ltp: Fix tescases with 64bit time_t using 32bit arches In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.22240232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e2002b7eb14413e17b6cfe96f908acc27906af0 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:57 2020 -0800 ltp: Fix tescases with 64bit time_t using 32bit arches This helps it compile on musl Fixes | tst_clocks.c:31:17: error: 'SYS_clock_getres' undeclared (first use in this function); did you mean 'tst_clock_getres Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 81 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch new file mode 100644 index 0000000..92e5fdf --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -0,0 +1,81 @@ +From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Feb 2020 22:22:17 -0800 +Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them + +musl is using 64bit time_t now on 32bit architectures and these syscalls +no longer exist, therefore its better to check for them being available +before using them + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Signed-off-by: Khem Raj +--- + lib/tst_clocks.c | 9 +++++++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ + 3 files changed, 17 insertions(+) + +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 35798a4aaf..6a5b05c4ea 100644 +--- a/lib/tst_clocks.c ++++ b/lib/tst_clocks.c +@@ -28,15 +28,24 @@ + + int tst_clock_getres(clockid_t clk_id, struct timespec *res) + { ++#if defined(__NR_clock_getres) + return syscall(SYS_clock_getres, clk_id, res); ++#endif ++ return -1; + } + + int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + return syscall(SYS_clock_gettime, clk_id, ts); ++#endif ++ return -1; + } + + int tst_clock_settime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_settime) + return syscall(SYS_clock_settime, clk_id, ts); ++#endif ++ return -1; + } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9b..b498de5b68 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +@@ -41,7 +41,11 @@ + #include + #include + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + char *TCID = "gettimeofday01"; + int TST_TOTAL = 1; +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e8..218e017df8 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +@@ -23,7 +23,11 @@ + + #include "tst_test.h" + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + static volatile sig_atomic_t done; + static char *str_rtime; +-- +2.25.0 + diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20190930.bb index 2853b1c..19bd7bc 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20190930.bb @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ + file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:16 +0000 Subject: [oe-commits] [openembedded-core] 05/30: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.13C78232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3ad30a116b722bfe72369e06863e6cf17bf3ecd4 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:56 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..f6fbed3 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..bbc5fa1 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:24 +0000 Subject: [oe-commits] [openembedded-core] 13/30: python: Add libarchive-c recipe In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.735C6232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7fcfb30ae24d942df23153ff65131c999060f8c2 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:32 2020 -0600 python: Add libarchive-c recipe The libarchive python module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + .../recipes-devtools/python/python3-libarchive-c_2.9.bb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c68e9ed..abbdb74 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -579,6 +579,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.4136C232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d945caac5066ae78b2e0ec05540bcd43ed4c738a Author: Alex Kiernan AuthorDate: Thu Feb 13 10:00:29 2020 +0000 iputils: Fix systemd and ipv6 detection When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...infod-fix-systemd-Documentation-url-error.patch | 28 +++++++++++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 ++++++++++++++++++++++ meta/recipes-extended/iputils/iputils_s20190709.bb | 23 ++++++++--- 3 files changed, 91 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 0000000..03a3f56 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-off-by: Alex Kiernan +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 0000000..d7367ca --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 13 Feb 2020 06:08:45 +0000 +Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers + +Neither rarpd nor rdisc can gain the necessary capabilities with +PrivateUsers enabled. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + systemd/rarpd.service.in | 1 - + systemd/rdisc.service.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in +index 4e2a1ec9d0e5..a71b87d36b37 100644 +--- a/systemd/rdisc.service.in ++++ b/systemd/rdisc.service.in +@@ -8,9 +8,10 @@ After=network.target + EnvironmentFile=-/etc/sysconfig/rdisc + ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS + ++CapabilityBoundingSet=CAP_NET_RAW + AmbientCapabilities=CAP_NET_RAW + PrivateTmp=yes +-PrivateUsers=yes ++DynamicUser=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae1..2aed6b5 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -12,6 +12,8 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ + file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" @@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:25 +0000 Subject: [oe-commits] [openembedded-core] 14/30: python: Add magic recipe In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.7EBB3232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 951e56269d022978caf1077717124e909a6ebfc3 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:33 2020 -0600 python: Add magic recipe The python-magic module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/python/python3-magic_0.4.15.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index abbdb74..171a436 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -580,6 +580,7 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk 1.18.0 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.67BA6232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c9bd46da0b1095bb708d049e4275bd046cb56c92 Author: Denys Dmytriyenko AuthorDate: Thu Feb 13 01:23:44 2020 -0500 wayland: upgrade 1.17.0 -> 1.18.0 This is the official release for Wayland 1.18. The main new features in this release are: - Add support for the Meson build system (autotools is still supported but will be removed in a future release) - Add API to tag proxy objects to allow applications and toolkits to share the same Wayland connection - Track wayland-server timers in user-space to prevent creating too many FDs - Add wl_global_remove, a new function to mitigate race conditions with globals https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html 2 upstreamed patches are dropped. Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- 3 files changed, 3 insertions(+), 221 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch deleted file mode 100644 index c443587..0000000 --- a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Fri, 25 Oct 2019 21:03:23 -0500 -Subject: [PATCH] scanner: Add configure check for strndup - -Some platforms may not have strndup() (e.g. MinGW), so provide a -equivalent implementation if it's not found. - -Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571] -Signed-off-by: Joshua Watt ---- - configure.ac | 2 +- - src/scanner.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d56f2b..1c99e21 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ fi - AC_SUBST(GCC_CFLAGS) - - AC_CHECK_HEADERS([sys/prctl.h]) --AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) -+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup]) - - AC_ARG_ENABLE([libraries], - [AC_HELP_STRING([--disable-libraries], -diff --git a/src/scanner.c b/src/scanner.c -index a94be5d..27004bc 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx, - - } - -+#ifndef HAVE_STRNDUP -+char * -+strndup(const char *s, size_t size) -+{ -+ char *r = malloc(size + 1); -+ strncpy(r, s, size); -+ r[size] = '\0'; -+ return r; -+} -+#endif -+ - static void - end_element(void *data, const XML_Char *name) - { diff --git a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch b/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch deleted file mode 100644 index b05b875..0000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch +++ /dev/null @@ -1,166 +0,0 @@ -From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Tue, 5 Nov 2019 09:09:50 -0600 -Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h - -Including wayland-server-core.h in wayland-private.h is problematic -because wayland-private.h is included by wayland-scanner which should be -able to build against non-POSIX platforms (e.g. MinGW). The only reason -that wayland-server-core.h was included in wayland-private.h was for the -wl_private_signal definitions, so move those to a -wayland-server-private.h file that can be included by both -wayland-server.c and the tests. - -Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc] -Signed-off-by: Joshua Watt ---- - Makefile.am | 3 +- - src/wayland-private.h | 22 +-------------- - src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++ - src/wayland-server.c | 1 + - tests/newsignal-test.c | 2 +- - 5 files changed, 58 insertions(+), 23 deletions(-) - create mode 100644 src/wayland-server-private.h - -diff --git a/Makefile.am b/Makefile.am -index f47d055..026d981 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \ - src/connection.c \ - src/wayland-os.c \ - src/wayland-os.h \ -- src/wayland-private.h -+ src/wayland-private.h \ -+ src/wayland-server-private.h - - include_HEADERS = \ - src/wayland-util.h \ -diff --git a/src/wayland-private.h b/src/wayland-private.h -index 29516ec..dc7d12f 100644 ---- a/src/wayland-private.h -+++ b/src/wayland-private.h -@@ -31,11 +31,11 @@ - #include - #include - #include -+#include - - #define WL_HIDE_DEPRECATED 1 - - #include "wayland-util.h" --#include "wayland-server-core.h" - - /* Invalid memory address */ - #define WL_ARRAY_POISON_PTR (void *) 4 -@@ -236,26 +236,6 @@ zalloc(size_t s) - return calloc(1, s); - } - --struct wl_priv_signal { -- struct wl_list listener_list; -- struct wl_list emit_list; --}; -- --void --wl_priv_signal_init(struct wl_priv_signal *signal); -- --void --wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -- --struct wl_listener * --wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -- --void --wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -- --void --wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -- - void - wl_connection_close_fds_in(struct wl_connection *connection, int max); - -diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h -new file mode 100644 -index 0000000..23fa458 ---- /dev/null -+++ b/src/wayland-server-private.h -@@ -0,0 +1,53 @@ -+/* -+ * Copyright ? 2008-2011 Kristian H?gsberg -+ * Copyright ? 2011 Intel Corporation -+ * Copyright ? 2013 Jason Ekstrand -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef WAYLAND_SERVER_PRIVATE_H -+#define WAYLAND_SERVER_PRIVATE_H -+ -+#include "wayland-server-core.h" -+ -+struct wl_priv_signal { -+ struct wl_list listener_list; -+ struct wl_list emit_list; -+}; -+ -+void -+wl_priv_signal_init(struct wl_priv_signal *signal); -+ -+void -+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -+ -+struct wl_listener * -+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -+ -+void -+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -+ -+void -+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -+ -+#endif -diff --git a/src/wayland-server.c b/src/wayland-server.c -index 19f6a76..d6f0206 100644 ---- a/src/wayland-server.c -+++ b/src/wayland-server.c -@@ -45,6 +45,7 @@ - - #include "wayland-util.h" - #include "wayland-private.h" -+#include "wayland-server-private.h" - #include "wayland-server.h" - #include "wayland-os.h" - -diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c -index 47c429b..f3a7bd9 100644 ---- a/tests/newsignal-test.c -+++ b/tests/newsignal-test.c -@@ -26,7 +26,7 @@ - #include - - #include "test-runner.h" --#include "wayland-private.h" -+#include "wayland-server-private.h" - - static void - signal_notify(struct wl_listener *listener, void *data) diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb similarity index 84% rename from meta/recipes-graphics/wayland/wayland_1.17.0.bb rename to meta/recipes-graphics/wayland/wayland_1.18.0.bb index 12916a0..7a3f075 100644 --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ - file://0001-scanner-Add-configure-check-for-strndup.patch \ - file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \ + file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" -SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" +SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" +SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:22 +0000 Subject: [oe-commits] [openembedded-core] 11/30: ppp: Security fix CVE-2020-8597 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.59D9B232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 062ed915f1a6c07a89a49cff4693b8b665c1d4ec Author: Yi Zhao AuthorDate: Thu Feb 13 16:55:01 2020 +0800 ppp: Security fix CVE-2020-8597 CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000..b7ba7ba --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4..60c56dd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:26 +0000 Subject: [oe-commits] [openembedded-core] 15/30: recipes-support: Add diffoscope recipe In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.8C4D0232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 81b7a8e4e5672f3dc817f85802c9bc88800fbfaf Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:34 2020 -0600 recipes-support: Add diffoscope recipe Diffoscope is the universal diff tool, capable of comparing many different formats. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 171a436..4a267fa 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi " RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb new file mode 100644 index 0000000..a00f281 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -0,0 +1,15 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:31 +0000 Subject: [oe-commits] [openembedded-core] 20/30: kernel-fitimage: fix devicetree reproducibility In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.C2209232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e483d03b1eb3674f72f2b0007cc3ae291b1ea6fd Author: Alex Kiernan AuthorDate: Wed Feb 12 11:33:36 2020 +0000 kernel-fitimage: fix devicetree reproducibility Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index d1b8cdc..72b05ff 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,7 +391,7 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:32 +0000 Subject: [oe-commits] [openembedded-core] 21/30: devicetree.bbclass: include symbols in base DT In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.CDE50232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 495efb2bd1663b3fc63c08f34581976cb9e06602 Author: Alex Kiernan AuthorDate: Wed Feb 12 10:35:26 2020 +0000 devicetree.bbclass: include symbols in base DT When processing overlays, the base device tree must be compiled with symbols, otherwise attempting to apply overlays in U-Boot will fail with: failed on fdt_overlay_apply(): FDT_ERR_NOTFOUND base fdt does did not have a /__symbols__ node make sure you've compiled with -@ Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/devicetree.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass index d8779c7..c772ab2 100644 --- a/meta/classes/devicetree.bbclass +++ b/meta/classes/devicetree.bbclass @@ -59,7 +59,7 @@ DT_BOOT_CPU ??= "0" DTC_FLAGS ?= "-R ${DT_RESERVED_MAP} -b ${DT_BOOT_CPU}" DTC_PPFLAGS ?= "-nostdinc -undef -D__DTS__ -x assembler-with-cpp" -DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE}" +DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE} -@" DTC_OFLAGS ?= "-p 0 -@ -H epapr" python () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:34 +0000 Subject: [oe-commits] [openembedded-core] 23/30: binutils: additional patch should be added with space. In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.E56F0232A66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a9c42200a4a984a291564e2b19e943ce655811de Author: Jeremy Puhlman AuthorDate: Mon Feb 10 13:29:26 2020 -0800 binutils: additional patch should be added with space. If an append adds a patch or file with SRC_URI += , the spaceless append causes the file listings to concatinate and cause failures in the nativesdk-binutils parse/build. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.33.bb index ecdab96..8bd2bf7 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.33.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = "file://nativesdk-relocation.patch" +SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:37 +0000 Subject: [oe-commits] [openembedded-core] 26/30: xkeyboard-config: upgrade 2.28 -> 2.29 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.1C94E232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8aeb664922b7c0a10ad6092e4851c37b1e66aa5e Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:01 2020 -0800 xkeyboard-config: upgrade 2.28 -> 2.29 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb similarity index 87% rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb index 7a3d694..c8fa98e 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" -SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" +SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" +SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:27 +0000 Subject: [oe-commits] [openembedded-core] 16/30: oeqa: reproducible: Run diffoscope on saved output In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.98CE3232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 82912c3b66433259099678534b77307de44a03c8 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:35 2020 -0600 oeqa: reproducible: Run diffoscope on saved output If there are differing packages and they are being saved for review, automatically run diffoscope on them and include the output in the saved output. The output is currently done in HTML format since these are typically published on a webpage by the autobuilder. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index f6433c9..d3fd8c3 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: MIT # -# Copyright 2019 by Garmin Ltd. or its subsidiaries +# Copyright 2019-2020 by Garmin Ltd. or its subsidiaries from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars @@ -167,10 +167,16 @@ class ReproducibleTests(OESelftestTestCase): return d def test_reproducible_builds(self): + def strip_topdir(s): + if s.startswith(self.topdir): + return s[len(self.topdir):] + return s + # Build native utilities self.write_config('') - bitbake("diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -206,18 +212,22 @@ class ReproducibleTests(OESelftestTestCase): if self.save_results: for d in result.different: - self.copy_file(d.reference, '/'.join([save_dir, d.reference])) - self.copy_file(d.test, '/'.join([save_dir, d.test])) + self.copy_file(d.reference, '/'.join([save_dir, 'packages', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages', strip_topdir(d.test)])) if result.missing or result.different: fails.append("The following %s packages are missing or different: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) - if fails: - self.fail('\n'.join(fails)) - # Clean up empty directories if self.save_results: if not os.listdir(save_dir): os.rmdir(save_dir) + else: + self.logger.info('Running diffoscope') + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + + if fails: + self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:30 +0000 Subject: [oe-commits] [openembedded-core] 19/30: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.B95D6232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4a095c4e981453f5116cd3b9797ad3d4d20cfa0c Author: Alex Kiernan AuthorDate: Wed Feb 12 09:44:34 2020 +0000 systemd: upgrade v244.1 -> v244.3 Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 0 .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 5 +++-- meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96..6861767 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,9 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +# v244.3 failed to push the branch, undo nobranch=1 when next updating +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;nobranch=1" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:33 +0000 Subject: [oe-commits] [openembedded-core] 22/30: mtdev: upgrade 1.1.5 -> 1.1.6 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.D7EDC232A65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f8d5c298ed3a5512003dd2670de691280b4ddb42 Author: Pierre-Jean Texier via Openembedded-core AuthorDate: Mon Feb 10 22:25:59 2020 +0100 mtdev: upgrade 1.1.5 -> 1.1.6 Also remove patch which have been merged upstream Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------------------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +-- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index a0cebe5..0000000 --- a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,77 +0,0 @@ -From af75e8ee3d12a493b758421b2feed0351fdcbbf0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 23 Nov 2019 13:44:32 -0800 -Subject: [PATCH] adjust for 64bit time_t for 32bit architectures - -libc that has support for 32 bit applications to use 64 bit -time_t supplies __USE_TIME_BITS64 define [1] - -[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/core.c | 8 +++++++- - test/mtdev-test.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/core.c b/src/core.c -index 87ef420..0d91c0b 100644 ---- a/src/core.c -+++ b/src/core.c -@@ -31,6 +31,11 @@ - #include "evbuf.h" - #include "match.h" - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - static inline int istouch(const struct mtdev_slot *data, - const struct mtdev *dev) - { -@@ -251,7 +256,8 @@ static void push_slot_changes(struct mtdev_state *state, - count++; - if (!count) - return; -- ev.time = syn->time; -+ ev.input_event_sec = syn->input_event_sec; -+ ev.input_event_usec = syn->input_event_usec; - ev.type = EV_ABS; - ev.code = ABS_MT_SLOT; - ev.value = slot; -diff --git a/test/mtdev-test.c b/test/mtdev-test.c -index 1b3e4f2..773f86a 100644 ---- a/test/mtdev-test.c -+++ b/test/mtdev-test.c -@@ -30,9 +30,15 @@ - #include - #include - #include -+#include -+ -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - /* year-proof millisecond event time */ --typedef __u64 mstime_t; -+typedef uint64_t mstime_t; - - static int use_event(const struct input_event *ev) - { -@@ -47,7 +53,7 @@ static void print_event(const struct input_event *ev) - { - static const mstime_t ms = 1000; - static int slot; -- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; -+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; - if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) - slot = ev->value; - fprintf(stderr, "%012llx %02d %01d %04x %d\n", --- -2.24.0 - diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb similarity index 65% rename from meta/recipes-graphics/wayland/mtdev_1.1.5.bb rename to meta/recipes-graphics/wayland/mtdev_1.1.6.bb index aa8bb69..7c1cb5e 100644 --- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb +++ b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb @@ -11,10 +11,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ -" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" +SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:38 +0000 Subject: [oe-commits] [openembedded-core] 27/30: libtasn1: upgrade 4.15.0 -> 4.16.0 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.28F55232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e999e9684472c201c5895455f9aa63fc2eabc563 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:02 2020 -0800 libtasn1: upgrade 4.15.0 -> 4.16.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb similarity index 83% rename from meta/recipes-support/gnutls/libtasn1_4.15.0.bb rename to meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 115c98a..8337b70 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" -SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:39 +0000 Subject: [oe-commits] [openembedded-core] 28/30: libxcrypt: upgrade 4.4.10 -> 4.4.12 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.315C3232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0630322e50f342790edd9d7f9190dd6064137026 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:03 2020 -0800 libxcrypt: upgrade 4.4.10 -> 4.4.12 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index accbdd6..59744c0 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" +SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:28 +0000 Subject: [oe-commits] [openembedded-core] 17/30: python3: install _tkinter.*.so to python3-tkinter package In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.A3426232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 114ccb27097946a483e2811f5fe75c23f14095b9 Author: Yi Zhao AuthorDate: Wed Feb 12 14:24:40 2020 +0800 python3: install _tkinter.*.so to python3-tkinter package When enable PACKAGECONFIG[tk], we should install _tkinter.*.so to python3-tkinter package rather than python3-misc package. Fixes: ERROR: python3-3.8.1-r0 do_package_qa: QA Issue: /usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so contained in package python3-misc requires libtk8.6.so()(64bit), but no providers found in RDEPENDS_python3-misc? [file-rdeps] Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3/python3-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index cbfa8d5..251271c 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -1127,6 +1127,7 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so", "${libdir}/python${PYTHON_MAJMIN}/tkinter" ], "cached": [] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:29 +0000 Subject: [oe-commits] [openembedded-core] 18/30: linux-yocto-dev: Add paravirt_kvm support for qemux86-64 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142712.AEBEB232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8af4926e0c4376bdf748173007f5c72408bed6fc Author: He Zhe AuthorDate: Wed Feb 12 15:35:57 2020 +0800 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 This feature includes paravirtualized KVM guest support, including KVMCLOCK for enhancing clock accuracy of guest OS. With it we can prevent the following error. "clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large" Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index afda849..c364a97 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -48,7 +48,7 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/ta KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_VERSION_SANITY_SKIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:41 +0000 Subject: [oe-commits] [openembedded-core] 30/30: librepo: upgrade 1.11.1 -> 1.11.2 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.455D9232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a15562e08250c280a9d27ba5a221918f91be1a78 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:05 2020 -0800 librepo: upgrade 1.11.1 -> 1.11.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/librepo/librepo_1.11.1.bb b/meta/recipes-devtools/librepo/librepo_1.11.2.bb similarity index 93% rename from meta/recipes-devtools/librepo/librepo_1.11.1.bb rename to meta/recipes-devtools/librepo/librepo_1.11.2.bb index dbf1016..6a0a59f 100644 --- a/meta/recipes-devtools/librepo/librepo_1.11.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.11.2.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff" +SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:36 +0000 Subject: [oe-commits] [openembedded-core] 25/30: sudo: upgrade 1.8.30 -> 1.8.31 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.0D378232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2428f5bd8a1de87a5b72eaf7ad96574d7ce37a2c Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:00 2020 -0800 sudo: upgrade 1.8.30 -> 1.8.31 -License-Update: Copyright year updated from 1998-2019 to 1998-2020. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 3b314dd..5d27d46 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.31.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.30.bb rename to meta/recipes-extended/sudo/sudo_1.8.31.bb index 9d014d2..39d8817 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.31.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" -SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" +SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de" +SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:35 +0000 Subject: [oe-commits] [openembedded-core] 24/30: qemu: Upgrade to 4.2.0 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.02390232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b3bce9820e5d6b6559dcd50a166daca68c70e5f3 Author: Alistair Francis AuthorDate: Mon Feb 10 13:25:15 2020 -0800 qemu: Upgrade to 4.2.0 While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +-- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 ++- ...fix-regression-in-parsing-vga-cmdline-par.patch | 54 +++++++++++ ...0011-linux-user-remove-host-stime-syscall.patch | 61 ------------ ...2-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 --------------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 21 files changed, 108 insertions(+), 228 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index b451f0b..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43..28cfd2c 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0012-fix-libcap-header-issue-on-some-distro.patch \ + file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060..a557e74 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ + file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102..66ff996 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd5..7f7da51 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68..012d60d 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab4..bc30397 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a736815..ec30337 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a423855..0810ae8 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2..89baad9 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25..30bb4dd 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d94..7e273ee 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7da..34df78b 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch new file mode 100644 index 0000000..2fe0850 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch @@ -0,0 +1,54 @@ +From a88c40f02ace88f09b2a85a64831b277b2ebc88c Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Sat, 21 Dec 2019 17:21:24 +0100 +Subject: [PATCH] hw/i386/pc: fix regression in parsing vga cmdline parameter + +When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0 +would refuse to start with a rather cryptic message: + + $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet' + qemu: can't parse 'vga' parameter: Invalid argument + +It was not clear whether this applied to the '-vga std' parameter or the +'-append' one. Fix the parsing regression and clarify the error. + +Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()") +Cc: Sergio Lopez +Signed-off-by: Peter Wu +Message-Id: <20191221162124.1159291-1-peter at lekensteyn.nl> +Cc: qemu-stable at nongnu.org +Signed-off-by: Paolo Bonzini +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c] +--- + hw/i386/x86.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/i386/x86.c b/hw/i386/x86.c +index d8bb5c2a96..9b9a4d5837 100644 +--- a/hw/i386/x86.c ++++ b/hw/i386/x86.c +@@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, + vmode = strstr(kernel_cmdline, "vga="); + if (vmode) { + unsigned int video_mode; ++ const char *end; + int ret; + /* skip "vga=" */ + vmode += 4; +@@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, + } else if (!strncmp(vmode, "ask", 3)) { + video_mode = 0xfffd; + } else { +- ret = qemu_strtoui(vmode, NULL, 0, &video_mode); +- if (ret != 0) { +- fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", +- strerror(-ret)); ++ ret = qemu_strtoui(vmode, &end, 0, &video_mode); ++ if (ret != 0 || (*end && *end != ' ')) { ++ fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); + exit(1); + } + } +-- +2.25.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be..0000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e4..0000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 14:27:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 14:27:40 +0000 Subject: [oe-commits] [openembedded-core] 29/30: libcheck: upgrade 0.13.0 -> 0.14.0 In-Reply-To: <158160403145.32517.2379818940772899599@git.openembedded.org> References: <158160403145.32517.2379818940772899599@git.openembedded.org> Message-ID: <20200213142713.3BA5B232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1244027dc6eb8a977d7b81632c9b3ca2c181ff9e Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:04 2020 -0800 libcheck: upgrade 0.13.0 -> 0.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcheck/libcheck_0.13.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb similarity index 83% rename from meta/recipes-support/libcheck/libcheck_0.13.0.bb rename to meta/recipes-support/libcheck/libcheck_0.14.0.bb index 226417f..a88f009 100644 --- a/meta/recipes-support/libcheck/libcheck_0.13.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "2c730c40b08482eaeb10132517970593" -SRC_URI[sha256sum] = "c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:12 +0000 Subject: [oe-commits] [openembedded-core] 02/25: crosssdk: Set natisdk specific distro features In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.06891232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 728f6b0188c0dea7768d5993ef9f42254a6899ca Author: Khem Raj AuthorDate: Thu Feb 13 00:21:58 2020 -0800 crosssdk: Set natisdk specific distro features Currently, normal distro features e.g. ld-is-gold is impacting crosssdk recipes, which actually should not be the case, since that feature is essentially intended for target packages and not nativesdk packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index c718a09..04aecb6 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -5,9 +5,15 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" + python () { # set TUNE_PKGARCH to SDK_ARCH d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # Set features here to prevent appends and distro features backfill + # from modifying nativesdk distro features + features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split()) + filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).split()) + d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered))) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:10 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (a15562e -> d58d9e1) Message-ID: <158160673078.24050.16400449056050727780@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard a15562e librepo: upgrade 1.11.1 -> 1.11.2 discard 1244027 libcheck: upgrade 0.13.0 -> 0.14.0 discard 0630322 libxcrypt: upgrade 4.4.10 -> 4.4.12 discard e999e96 libtasn1: upgrade 4.15.0 -> 4.16.0 discard 8aeb664 xkeyboard-config: upgrade 2.28 -> 2.29 discard 2428f5b sudo: upgrade 1.8.30 -> 1.8.31 discard b3bce98 qemu: Upgrade to 4.2.0 discard a9c4220 binutils: additional patch should be added with space. discard f8d5c29 mtdev: upgrade 1.1.5 -> 1.1.6 discard 495efb2 devicetree.bbclass: include symbols in base DT discard e483d03 kernel-fitimage: fix devicetree reproducibility discard 4a095c4 systemd: upgrade v244.1 -> v244.3 discard 8af4926 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 discard 114ccb2 python3: install _tkinter.*.so to python3-tkinter package discard 82912c3 oeqa: reproducible: Run diffoscope on saved output discard 81b7a8e recipes-support: Add diffoscope recipe discard 951e562 python: Add magic recipe discard 7fcfb30 python: Add libarchive-c recipe discard c9bd46d wayland: upgrade 1.17.0 -> 1.18.0 discard 062ed91 ppp: Security fix CVE-2020-8597 discard f5b7901 icecc.bbclass: replace superfluous "+=" with "=" discard d945caa iputils: Fix systemd and ipv6 detection discard 5f89fb3 binutils: Bail out if gold is used on 32/64 bit RISC-V discard ecea045 crosssdk: Set natisdk specific distro features discard 6e2002b ltp: Fix tescases with 64bit time_t using 32bit arches discard 3ad30a1 busybox: Backport patches to support removal of __NR_clock_gettime new b0d8d6a ltp: Fix tescases with 64bit time_t using 32bit arches new 728f6b0 crosssdk: Set natisdk specific distro features new 8d60560 binutils: Bail out if gold is used on 32/64 bit RISC-V new 157912f iputils: Fix systemd and ipv6 detection new 406878e icecc.bbclass: replace superfluous "+=" with "=" new 969faeb ppp: Security fix CVE-2020-8597 new 0cb73d3 wayland: upgrade 1.17.0 -> 1.18.0 new 7ba19d7 python: Add libarchive-c recipe new 61774ff python: Add magic recipe new c7c168f recipes-support: Add diffoscope recipe new 6384b11 oeqa: reproducible: Run diffoscope on saved output new 461cbb5 python3: install _tkinter.*.so to python3-tkinter package new e8b985e linux-yocto-dev: Add paravirt_kvm support for qemux86-64 new f97c205 systemd: upgrade v244.1 -> v244.3 new 26e6081 kernel-fitimage: fix devicetree reproducibility new ccb92d3 devicetree.bbclass: include symbols in base DT new a7aea2d mtdev: upgrade 1.1.5 -> 1.1.6 new d2eca02 binutils: additional patch should be added with space. new bc4b3a5 qemu: Upgrade to 4.2.0 new 1375fbb sudo: upgrade 1.8.30 -> 1.8.31 new 4a13cd7 xkeyboard-config: upgrade 2.28 -> 2.29 new 6bd9f22 libtasn1: upgrade 4.15.0 -> 4.16.0 new 6cb5c40 libxcrypt: upgrade 4.4.10 -> 4.4.12 new 64f86a7 libcheck: upgrade 0.13.0 -> 0.14.0 new d58d9e1 librepo: upgrade 1.11.1 -> 1.11.2 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a15562e) \ N -- N -- N refs/heads/master-next (d58d9e1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 25 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...all-wrappers-around-clock_gettime-closes-.patch | 113 --------------------- ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ---------- ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 -------- meta/recipes-core/busybox/busybox_1.31.1.bb | 3 - 4 files changed, 212 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch delete mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch delete mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:11 +0000 Subject: [oe-commits] [openembedded-core] 01/25: ltp: Fix tescases with 64bit time_t using 32bit arches In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151210.F2033232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b0d8d6a6d5907f271e187b29a750722b508bf1ce Author: Khem Raj AuthorDate: Thu Feb 13 00:21:57 2020 -0800 ltp: Fix tescases with 64bit time_t using 32bit arches This helps it compile on musl Fixes | tst_clocks.c:31:17: error: 'SYS_clock_getres' undeclared (first use in this function); did you mean 'tst_clock_getres Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 81 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch new file mode 100644 index 0000000..92e5fdf --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -0,0 +1,81 @@ +From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Feb 2020 22:22:17 -0800 +Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them + +musl is using 64bit time_t now on 32bit architectures and these syscalls +no longer exist, therefore its better to check for them being available +before using them + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Signed-off-by: Khem Raj +--- + lib/tst_clocks.c | 9 +++++++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ + 3 files changed, 17 insertions(+) + +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 35798a4aaf..6a5b05c4ea 100644 +--- a/lib/tst_clocks.c ++++ b/lib/tst_clocks.c +@@ -28,15 +28,24 @@ + + int tst_clock_getres(clockid_t clk_id, struct timespec *res) + { ++#if defined(__NR_clock_getres) + return syscall(SYS_clock_getres, clk_id, res); ++#endif ++ return -1; + } + + int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + return syscall(SYS_clock_gettime, clk_id, ts); ++#endif ++ return -1; + } + + int tst_clock_settime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_settime) + return syscall(SYS_clock_settime, clk_id, ts); ++#endif ++ return -1; + } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9b..b498de5b68 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +@@ -41,7 +41,11 @@ + #include + #include + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + char *TCID = "gettimeofday01"; + int TST_TOTAL = 1; +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e8..218e017df8 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +@@ -23,7 +23,11 @@ + + #include "tst_test.h" + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + static volatile sig_atomic_t done; + static char *str_rtime; +-- +2.25.0 + diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20190930.bb index 2853b1c..19bd7bc 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20190930.bb @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ + file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:13 +0000 Subject: [oe-commits] [openembedded-core] 03/25: binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.12F5A232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8d6056006c1e1abf8029b13879a9587f92e2277d Author: Khem Raj AuthorDate: Thu Feb 13 00:21:59 2020 -0800 binutils: Bail out if gold is used on 32/64 bit RISC-V gold is not supporting risc-v yet and, this will cause subltle errors during build e.g. autoconf not finding certain features like visibility and it could take a while to unwind the problem. Its better to error out early Remove dwp and ld.gold for rv32 as well Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 0fb6cae..a4b9aa5 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -40,6 +40,7 @@ FILES_${PN}-dev = " \ LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS_riscv64 = "" +LDGOLD_ALTS_riscv32 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -83,6 +84,7 @@ LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" @@ -163,3 +165,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:14 +0000 Subject: [oe-commits] [openembedded-core] 04/25: iputils: Fix systemd and ipv6 detection In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.1FE0B232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 157912fd14ffa9dcd49fc3db31c0e531ece5ca44 Author: Alex Kiernan AuthorDate: Thu Feb 13 10:00:29 2020 +0000 iputils: Fix systemd and ipv6 detection When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...infod-fix-systemd-Documentation-url-error.patch | 28 +++++++++++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 ++++++++++++++++++++++ meta/recipes-extended/iputils/iputils_s20190709.bb | 23 ++++++++--- 3 files changed, 91 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 0000000..03a3f56 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-off-by: Alex Kiernan +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 0000000..d7367ca --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 13 Feb 2020 06:08:45 +0000 +Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers + +Neither rarpd nor rdisc can gain the necessary capabilities with +PrivateUsers enabled. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + systemd/rarpd.service.in | 1 - + systemd/rdisc.service.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in +index 4e2a1ec9d0e5..a71b87d36b37 100644 +--- a/systemd/rdisc.service.in ++++ b/systemd/rdisc.service.in +@@ -8,9 +8,10 @@ After=network.target + EnvironmentFile=-/etc/sysconfig/rdisc + ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS + ++CapabilityBoundingSet=CAP_NET_RAW + AmbientCapabilities=CAP_NET_RAW + PrivateTmp=yes +-PrivateUsers=yes ++DynamicUser=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae1..2aed6b5 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -12,6 +12,8 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ + file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" @@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:15 +0000 Subject: [oe-commits] [openembedded-core] 05/25: icecc.bbclass: replace superfluous "+=" with "=" In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.303BC232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 406878efe423b1e400e05a61d610266069b42206 Author: Robert P. J. Day AuthorDate: Thu Feb 13 08:21:57 2020 -0500 icecc.bbclass: replace superfluous "+=" with "=" Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index bc3d6f4..d095305 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend += "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@icecc_dep_prepend(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:19 +0000 Subject: [oe-commits] [openembedded-core] 09/25: python: Add magic recipe In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.682A0232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 61774ff39c2f04eb8d83f0aabdf563c5c894c66d Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:33 2020 -0600 python: Add magic recipe The python-magic module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/python/python3-magic_0.4.15.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index abbdb74..171a436 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -580,6 +580,7 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.58BCF232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7ba19d784e39d89775112986cd1b90ed0cbb1fbd Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:32 2020 -0600 python: Add libarchive-c recipe The libarchive python module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + .../recipes-devtools/python/python3-libarchive-c_2.9.bb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c68e9ed..abbdb74 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -579,6 +579,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.766CB232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c7c168fd34281b7944748e80ff1d072d6ccef95c Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:34 2020 -0600 recipes-support: Add diffoscope recipe Diffoscope is the universal diff tool, capable of comparing many different formats. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 171a436..4a267fa 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi " RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb new file mode 100644 index 0000000..a00f281 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -0,0 +1,15 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:16 +0000 Subject: [oe-commits] [openembedded-core] 06/25: ppp: Security fix CVE-2020-8597 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.3DACA232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 969faebd16229a08a4687509f8fd8c3b86dd8524 Author: Yi Zhao AuthorDate: Thu Feb 13 16:55:01 2020 +0800 ppp: Security fix CVE-2020-8597 CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000..b7ba7ba --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4..60c56dd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:17 +0000 Subject: [oe-commits] [openembedded-core] 07/25: wayland: upgrade 1.17.0 -> 1.18.0 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.4D02F232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0cb73d37ff2e51ab2e3114a99ef569ec2b65cbd0 Author: Denys Dmytriyenko AuthorDate: Thu Feb 13 01:23:44 2020 -0500 wayland: upgrade 1.17.0 -> 1.18.0 This is the official release for Wayland 1.18. The main new features in this release are: - Add support for the Meson build system (autotools is still supported but will be removed in a future release) - Add API to tag proxy objects to allow applications and toolkits to share the same Wayland connection - Track wayland-server timers in user-space to prevent creating too many FDs - Add wl_global_remove, a new function to mitigate race conditions with globals https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html 2 upstreamed patches are dropped. Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- 3 files changed, 3 insertions(+), 221 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch deleted file mode 100644 index c443587..0000000 --- a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Fri, 25 Oct 2019 21:03:23 -0500 -Subject: [PATCH] scanner: Add configure check for strndup - -Some platforms may not have strndup() (e.g. MinGW), so provide a -equivalent implementation if it's not found. - -Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571] -Signed-off-by: Joshua Watt ---- - configure.ac | 2 +- - src/scanner.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d56f2b..1c99e21 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ fi - AC_SUBST(GCC_CFLAGS) - - AC_CHECK_HEADERS([sys/prctl.h]) --AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) -+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup]) - - AC_ARG_ENABLE([libraries], - [AC_HELP_STRING([--disable-libraries], -diff --git a/src/scanner.c b/src/scanner.c -index a94be5d..27004bc 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx, - - } - -+#ifndef HAVE_STRNDUP -+char * -+strndup(const char *s, size_t size) -+{ -+ char *r = malloc(size + 1); -+ strncpy(r, s, size); -+ r[size] = '\0'; -+ return r; -+} -+#endif -+ - static void - end_element(void *data, const XML_Char *name) - { diff --git a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch b/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch deleted file mode 100644 index b05b875..0000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch +++ /dev/null @@ -1,166 +0,0 @@ -From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Tue, 5 Nov 2019 09:09:50 -0600 -Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h - -Including wayland-server-core.h in wayland-private.h is problematic -because wayland-private.h is included by wayland-scanner which should be -able to build against non-POSIX platforms (e.g. MinGW). The only reason -that wayland-server-core.h was included in wayland-private.h was for the -wl_private_signal definitions, so move those to a -wayland-server-private.h file that can be included by both -wayland-server.c and the tests. - -Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc] -Signed-off-by: Joshua Watt ---- - Makefile.am | 3 +- - src/wayland-private.h | 22 +-------------- - src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++ - src/wayland-server.c | 1 + - tests/newsignal-test.c | 2 +- - 5 files changed, 58 insertions(+), 23 deletions(-) - create mode 100644 src/wayland-server-private.h - -diff --git a/Makefile.am b/Makefile.am -index f47d055..026d981 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \ - src/connection.c \ - src/wayland-os.c \ - src/wayland-os.h \ -- src/wayland-private.h -+ src/wayland-private.h \ -+ src/wayland-server-private.h - - include_HEADERS = \ - src/wayland-util.h \ -diff --git a/src/wayland-private.h b/src/wayland-private.h -index 29516ec..dc7d12f 100644 ---- a/src/wayland-private.h -+++ b/src/wayland-private.h -@@ -31,11 +31,11 @@ - #include - #include - #include -+#include - - #define WL_HIDE_DEPRECATED 1 - - #include "wayland-util.h" --#include "wayland-server-core.h" - - /* Invalid memory address */ - #define WL_ARRAY_POISON_PTR (void *) 4 -@@ -236,26 +236,6 @@ zalloc(size_t s) - return calloc(1, s); - } - --struct wl_priv_signal { -- struct wl_list listener_list; -- struct wl_list emit_list; --}; -- --void --wl_priv_signal_init(struct wl_priv_signal *signal); -- --void --wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -- --struct wl_listener * --wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -- --void --wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -- --void --wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -- - void - wl_connection_close_fds_in(struct wl_connection *connection, int max); - -diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h -new file mode 100644 -index 0000000..23fa458 ---- /dev/null -+++ b/src/wayland-server-private.h -@@ -0,0 +1,53 @@ -+/* -+ * Copyright ? 2008-2011 Kristian H?gsberg -+ * Copyright ? 2011 Intel Corporation -+ * Copyright ? 2013 Jason Ekstrand -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef WAYLAND_SERVER_PRIVATE_H -+#define WAYLAND_SERVER_PRIVATE_H -+ -+#include "wayland-server-core.h" -+ -+struct wl_priv_signal { -+ struct wl_list listener_list; -+ struct wl_list emit_list; -+}; -+ -+void -+wl_priv_signal_init(struct wl_priv_signal *signal); -+ -+void -+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -+ -+struct wl_listener * -+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -+ -+void -+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -+ -+void -+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -+ -+#endif -diff --git a/src/wayland-server.c b/src/wayland-server.c -index 19f6a76..d6f0206 100644 ---- a/src/wayland-server.c -+++ b/src/wayland-server.c -@@ -45,6 +45,7 @@ - - #include "wayland-util.h" - #include "wayland-private.h" -+#include "wayland-server-private.h" - #include "wayland-server.h" - #include "wayland-os.h" - -diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c -index 47c429b..f3a7bd9 100644 ---- a/tests/newsignal-test.c -+++ b/tests/newsignal-test.c -@@ -26,7 +26,7 @@ - #include - - #include "test-runner.h" --#include "wayland-private.h" -+#include "wayland-server-private.h" - - static void - signal_notify(struct wl_listener *listener, void *data) diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb similarity index 84% rename from meta/recipes-graphics/wayland/wayland_1.17.0.bb rename to meta/recipes-graphics/wayland/wayland_1.18.0.bb index 12916a0..7a3f075 100644 --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ - file://0001-scanner-Add-configure-check-for-strndup.patch \ - file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \ + file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" -SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" +SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" +SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:22 +0000 Subject: [oe-commits] [openembedded-core] 12/25: python3: install _tkinter.*.so to python3-tkinter package In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.9402B232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 461cbb59927298d8fb07cbe0e1e89a6f46c8926b Author: Yi Zhao AuthorDate: Wed Feb 12 14:24:40 2020 +0800 python3: install _tkinter.*.so to python3-tkinter package When enable PACKAGECONFIG[tk], we should install _tkinter.*.so to python3-tkinter package rather than python3-misc package. Fixes: ERROR: python3-3.8.1-r0 do_package_qa: QA Issue: /usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so contained in package python3-misc requires libtk8.6.so()(64bit), but no providers found in RDEPENDS_python3-misc? [file-rdeps] Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3/python3-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index cbfa8d5..251271c 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -1127,6 +1127,7 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so", "${libdir}/python${PYTHON_MAJMIN}/tkinter" ], "cached": [] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:21 +0000 Subject: [oe-commits] [openembedded-core] 11/25: oeqa: reproducible: Run diffoscope on saved output In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.835E3232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6384b114f5d51b4ec9891254b1d24fbd90cdf829 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:35 2020 -0600 oeqa: reproducible: Run diffoscope on saved output If there are differing packages and they are being saved for review, automatically run diffoscope on them and include the output in the saved output. The output is currently done in HTML format since these are typically published on a webpage by the autobuilder. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index f6433c9..d3fd8c3 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: MIT # -# Copyright 2019 by Garmin Ltd. or its subsidiaries +# Copyright 2019-2020 by Garmin Ltd. or its subsidiaries from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars @@ -167,10 +167,16 @@ class ReproducibleTests(OESelftestTestCase): return d def test_reproducible_builds(self): + def strip_topdir(s): + if s.startswith(self.topdir): + return s[len(self.topdir):] + return s + # Build native utilities self.write_config('') - bitbake("diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -206,18 +212,22 @@ class ReproducibleTests(OESelftestTestCase): if self.save_results: for d in result.different: - self.copy_file(d.reference, '/'.join([save_dir, d.reference])) - self.copy_file(d.test, '/'.join([save_dir, d.test])) + self.copy_file(d.reference, '/'.join([save_dir, 'packages', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages', strip_topdir(d.test)])) if result.missing or result.different: fails.append("The following %s packages are missing or different: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) - if fails: - self.fail('\n'.join(fails)) - # Clean up empty directories if self.save_results: if not os.listdir(save_dir): os.rmdir(save_dir) + else: + self.logger.info('Running diffoscope') + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + + if fails: + self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:23 +0000 Subject: [oe-commits] [openembedded-core] 13/25: linux-yocto-dev: Add paravirt_kvm support for qemux86-64 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.A494E232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e8b985ef7a990155b2955356cd85c937195b1166 Author: He Zhe AuthorDate: Wed Feb 12 15:35:57 2020 +0800 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 This feature includes paravirtualized KVM guest support, including KVMCLOCK for enhancing clock accuracy of guest OS. With it we can prevent the following error. "clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large" Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index afda849..c364a97 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -48,7 +48,7 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/ta KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_VERSION_SANITY_SKIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:25 +0000 Subject: [oe-commits] [openembedded-core] 15/25: kernel-fitimage: fix devicetree reproducibility In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.C2AF6232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 26e608116e2490ec5d2275bc3ee81cb71e62a629 Author: Alex Kiernan AuthorDate: Wed Feb 12 11:33:36 2020 +0000 kernel-fitimage: fix devicetree reproducibility Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index d1b8cdc..72b05ff 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,7 +391,7 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:24 +0000 Subject: [oe-commits] [openembedded-core] 14/25: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.B3FBF232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f97c205935893875d6dadbb041ebf2fb8d5020ed Author: Alex Kiernan AuthorDate: Wed Feb 12 09:44:34 2020 +0000 systemd: upgrade v244.1 -> v244.3 Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 0 .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 5 +++-- meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96..6861767 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,9 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +# v244.3 failed to push the branch, undo nobranch=1 when next updating +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;nobranch=1" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:30 +0000 Subject: [oe-commits] [openembedded-core] 20/25: sudo: upgrade 1.8.30 -> 1.8.31 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.1B6D6232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1375fbbe8cb5d6db64b1f3ec88a3218e53f9557d Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:00 2020 -0800 sudo: upgrade 1.8.30 -> 1.8.31 -License-Update: Copyright year updated from 1998-2019 to 1998-2020. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 3b314dd..5d27d46 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.31.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.30.bb rename to meta/recipes-extended/sudo/sudo_1.8.31.bb index 9d014d2..39d8817 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.31.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" -SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" +SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de" +SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:28 +0000 Subject: [oe-commits] [openembedded-core] 18/25: binutils: additional patch should be added with space. In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.EFF23232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d2eca02d7c1504465b71a6be9bcc1de9164c90e3 Author: Jeremy Puhlman AuthorDate: Mon Feb 10 13:29:26 2020 -0800 binutils: additional patch should be added with space. If an append adds a patch or file with SRC_URI += , the spaceless append causes the file listings to concatinate and cause failures in the nativesdk-binutils parse/build. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.33.bb index ecdab96..8bd2bf7 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.33.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = "file://nativesdk-relocation.patch" +SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:31 +0000 Subject: [oe-commits] [openembedded-core] 21/25: xkeyboard-config: upgrade 2.28 -> 2.29 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.2B27B232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4a13cd719f310e051566fc1a18ce46e1acc16450 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:01 2020 -0800 xkeyboard-config: upgrade 2.28 -> 2.29 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb similarity index 87% rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb index 7a3d694..c8fa98e 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" -SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" +SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" +SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:27 +0000 Subject: [oe-commits] [openembedded-core] 17/25: mtdev: upgrade 1.1.5 -> 1.1.6 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.E3F48232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a7aea2d1193e18f94fa1992141078577a857e9b1 Author: Pierre-Jean Texier via Openembedded-core AuthorDate: Mon Feb 10 22:25:59 2020 +0100 mtdev: upgrade 1.1.5 -> 1.1.6 Also remove patch which have been merged upstream Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------------------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +-- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index a0cebe5..0000000 --- a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,77 +0,0 @@ -From af75e8ee3d12a493b758421b2feed0351fdcbbf0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 23 Nov 2019 13:44:32 -0800 -Subject: [PATCH] adjust for 64bit time_t for 32bit architectures - -libc that has support for 32 bit applications to use 64 bit -time_t supplies __USE_TIME_BITS64 define [1] - -[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/core.c | 8 +++++++- - test/mtdev-test.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/core.c b/src/core.c -index 87ef420..0d91c0b 100644 ---- a/src/core.c -+++ b/src/core.c -@@ -31,6 +31,11 @@ - #include "evbuf.h" - #include "match.h" - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - static inline int istouch(const struct mtdev_slot *data, - const struct mtdev *dev) - { -@@ -251,7 +256,8 @@ static void push_slot_changes(struct mtdev_state *state, - count++; - if (!count) - return; -- ev.time = syn->time; -+ ev.input_event_sec = syn->input_event_sec; -+ ev.input_event_usec = syn->input_event_usec; - ev.type = EV_ABS; - ev.code = ABS_MT_SLOT; - ev.value = slot; -diff --git a/test/mtdev-test.c b/test/mtdev-test.c -index 1b3e4f2..773f86a 100644 ---- a/test/mtdev-test.c -+++ b/test/mtdev-test.c -@@ -30,9 +30,15 @@ - #include - #include - #include -+#include -+ -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - /* year-proof millisecond event time */ --typedef __u64 mstime_t; -+typedef uint64_t mstime_t; - - static int use_event(const struct input_event *ev) - { -@@ -47,7 +53,7 @@ static void print_event(const struct input_event *ev) - { - static const mstime_t ms = 1000; - static int slot; -- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; -+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; - if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) - slot = ev->value; - fprintf(stderr, "%012llx %02d %01d %04x %d\n", --- -2.24.0 - diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb similarity index 65% rename from meta/recipes-graphics/wayland/mtdev_1.1.5.bb rename to meta/recipes-graphics/wayland/mtdev_1.1.6.bb index aa8bb69..7c1cb5e 100644 --- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb +++ b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb @@ -11,10 +11,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ -" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" +SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:32 +0000 Subject: [oe-commits] [openembedded-core] 22/25: libtasn1: upgrade 4.15.0 -> 4.16.0 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.35DF1232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6bd9f2287ad12480f5951f54c8a085940018811b Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:02 2020 -0800 libtasn1: upgrade 4.15.0 -> 4.16.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb similarity index 83% rename from meta/recipes-support/gnutls/libtasn1_4.15.0.bb rename to meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 115c98a..8337b70 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" -SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:26 +0000 Subject: [oe-commits] [openembedded-core] 16/25: devicetree.bbclass: include symbols in base DT In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151211.D2945232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ccb92d3947e65d00546394d6663a0770b53edbad Author: Alex Kiernan AuthorDate: Wed Feb 12 10:35:26 2020 +0000 devicetree.bbclass: include symbols in base DT When processing overlays, the base device tree must be compiled with symbols, otherwise attempting to apply overlays in U-Boot will fail with: failed on fdt_overlay_apply(): FDT_ERR_NOTFOUND base fdt does did not have a /__symbols__ node make sure you've compiled with -@ Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/devicetree.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass index d8779c7..c772ab2 100644 --- a/meta/classes/devicetree.bbclass +++ b/meta/classes/devicetree.bbclass @@ -59,7 +59,7 @@ DT_BOOT_CPU ??= "0" DTC_FLAGS ?= "-R ${DT_RESERVED_MAP} -b ${DT_BOOT_CPU}" DTC_PPFLAGS ?= "-nostdinc -undef -D__DTS__ -x assembler-with-cpp" -DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE}" +DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE} -@" DTC_OFLAGS ?= "-p 0 -@ -H epapr" python () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:34 +0000 Subject: [oe-commits] [openembedded-core] 24/25: libcheck: upgrade 0.13.0 -> 0.14.0 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.4F8FE232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 64f86a733220df6ffbdbdc28706c49876e1c308e Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:04 2020 -0800 libcheck: upgrade 0.13.0 -> 0.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcheck/libcheck_0.13.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb similarity index 83% rename from meta/recipes-support/libcheck/libcheck_0.13.0.bb rename to meta/recipes-support/libcheck/libcheck_0.14.0.bb index 226417f..a88f009 100644 --- a/meta/recipes-support/libcheck/libcheck_0.13.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "2c730c40b08482eaeb10132517970593" -SRC_URI[sha256sum] = "c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:33 +0000 Subject: [oe-commits] [openembedded-core] 23/25: libxcrypt: upgrade 4.4.10 -> 4.4.12 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.4121B232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6cb5c407bfb21970c2f219c20bb021b5a63c0383 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:03 2020 -0800 libxcrypt: upgrade 4.4.10 -> 4.4.12 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index accbdd6..59744c0 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" +SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:35 +0000 Subject: [oe-commits] [openembedded-core] 25/25: librepo: upgrade 1.11.1 -> 1.11.2 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.5BF8E232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d58d9e1f82b4038707b006f7e45094c8020df781 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:05 2020 -0800 librepo: upgrade 1.11.1 -> 1.11.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/librepo/librepo_1.11.1.bb b/meta/recipes-devtools/librepo/librepo_1.11.2.bb similarity index 93% rename from meta/recipes-devtools/librepo/librepo_1.11.1.bb rename to meta/recipes-devtools/librepo/librepo_1.11.2.bb index dbf1016..6a0a59f 100644 --- a/meta/recipes-devtools/librepo/librepo_1.11.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.11.2.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff" +SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 15:12:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 15:12:29 +0000 Subject: [oe-commits] [openembedded-core] 19/25: qemu: Upgrade to 4.2.0 In-Reply-To: <158160673078.24050.16400449056050727780@git.openembedded.org> References: <158160673078.24050.16400449056050727780@git.openembedded.org> Message-ID: <20200213151212.0CE7A232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bc4b3a5196ffaccca39e65636a30d3d914ef3fc4 Author: Alistair Francis AuthorDate: Mon Feb 10 13:25:15 2020 -0800 qemu: Upgrade to 4.2.0 While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +-- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 ++- ...fix-regression-in-parsing-vga-cmdline-par.patch | 54 +++++++++++ ...0011-linux-user-remove-host-stime-syscall.patch | 61 ------------ ...2-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 --------------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 21 files changed, 108 insertions(+), 228 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index b451f0b..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43..28cfd2c 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0012-fix-libcap-header-issue-on-some-distro.patch \ + file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060..a557e74 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ + file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102..66ff996 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd5..7f7da51 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68..012d60d 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab4..bc30397 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a736815..ec30337 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a423855..0810ae8 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2..89baad9 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25..30bb4dd 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d94..7e273ee 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7da..34df78b 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch new file mode 100644 index 0000000..2fe0850 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch @@ -0,0 +1,54 @@ +From a88c40f02ace88f09b2a85a64831b277b2ebc88c Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Sat, 21 Dec 2019 17:21:24 +0100 +Subject: [PATCH] hw/i386/pc: fix regression in parsing vga cmdline parameter + +When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0 +would refuse to start with a rather cryptic message: + + $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet' + qemu: can't parse 'vga' parameter: Invalid argument + +It was not clear whether this applied to the '-vga std' parameter or the +'-append' one. Fix the parsing regression and clarify the error. + +Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()") +Cc: Sergio Lopez +Signed-off-by: Peter Wu +Message-Id: <20191221162124.1159291-1-peter at lekensteyn.nl> +Cc: qemu-stable at nongnu.org +Signed-off-by: Paolo Bonzini +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c] +--- + hw/i386/x86.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/i386/x86.c b/hw/i386/x86.c +index d8bb5c2a96..9b9a4d5837 100644 +--- a/hw/i386/x86.c ++++ b/hw/i386/x86.c +@@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, + vmode = strstr(kernel_cmdline, "vga="); + if (vmode) { + unsigned int video_mode; ++ const char *end; + int ret; + /* skip "vga=" */ + vmode += 4; +@@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, + } else if (!strncmp(vmode, "ask", 3)) { + video_mode = 0xfffd; + } else { +- ret = qemu_strtoui(vmode, NULL, 0, &video_mode); +- if (ret != 0) { +- fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", +- strerror(-ret)); ++ ret = qemu_strtoui(vmode, &end, 0, &video_mode); ++ if (ret != 0 || (*end && *end != ' ')) { ++ fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); + exit(1); + } + } +-- +2.25.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be..0000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e4..0000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:01 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c13246e -> fe35221) Message-ID: <158163168194.15661.8754301064249072868@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from c13246e zabbix: upgrade 4.4.1 -> 4.4.5 new 650cbab libconfig,libfile,libtest: Do not inherit allarch new 41f5abd meta-oe: Remove dnf dependent package for non-rpm package backend new dd7b78c libteam: Upgrade to 1.30 new addc04e mcelog: Upgrade to 168 new 4f61c89 python3-cffi: upgrade 1.13.2 -> 1.14.0 new 1f27638 python3-configparser: upgrade 3.8.1 -> 4.0.2 new 662f7b7 python3-pytest: upgrade 5.3.2 -> 5.3.5 new ec2c3d3 abseil-cpp: add recipe for git version new 0b7e50f iozone3: Upgrade to 489 new 115144f python3-grpcio: Upgrade to 1.27.1 new fe35221 samba: upgrade 4.10.11 -> 4.10.13 The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../samba/{samba_4.10.11.bb => samba_4.10.13.bb} | 4 +- .../iozone3/{iozone3_488.bb => iozone3_489.bb} | 4 +- .../packagegroups/packagegroup-meta-oe.bb | 5 +- ...Remove-maes-option-from-cross-compilation.patch | 53 ++++++++++++++++++ ...gotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch | 35 ++++++++++++ .../abseil-cpp/0003-Add-fPIC-option.patch | 27 +++++++++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 52 ++++++++++++++++++ .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 1 + .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 3 + .../libteam/{libteam_1.29.bb => libteam_1.30.bb} | 2 +- .../mcelog/{mcelog_166.bb => mcelog_168.bb} | 2 +- .../libconfig/libconfig-autoconf-perl_0.318.bb | 2 +- .../libfile/libfile-slurper-perl_0.012.bb | 2 +- .../libtest/libtest-warnings-perl_0.028.bb | 2 +- .../recipes-devtools/python/python-cffi.inc | 4 +- .../python/python-configparser.inc | 7 ++- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 40 -------------- .../python/python-grpcio/gettid.patch | 26 --------- .../recipes-devtools/python/python-pytest.inc | 6 +- ...thon3-cffi_1.13.2.bb => python3-cffi_1.14.0.bb} | 0 ...rser_3.8.1.bb => python3-configparser_4.0.2.bb} | 0 ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 64 ++++++++++++++++++++++ .../ppc-boringssl-support.patch | 2 +- .../riscv64_support.patch | 2 +- .../python/python3-grpcio_1.19.0.bb | 2 - ...{python-grpcio.inc => python3-grpcio_1.27.1.bb} | 16 +++--- ...on3-pytest_5.3.2.bb => python3-pytest_5.3.5.bb} | 0 27 files changed, 266 insertions(+), 97 deletions(-) rename meta-networking/recipes-connectivity/samba/{samba_4.10.11.bb => samba_4.10.13.bb} (98%) rename meta-oe/recipes-benchmark/iozone3/{iozone3_488.bb => iozone3_489.bb} (97%) create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb rename meta-oe/recipes-support/libteam/{libteam_1.29.bb => libteam_1.30.bb} (95%) rename meta-oe/recipes-support/mcelog/{mcelog_166.bb => mcelog_168.bb} (95%) delete mode 100644 meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch delete mode 100644 meta-python/recipes-devtools/python/python-grpcio/gettid.patch rename meta-python/recipes-devtools/python/{python3-cffi_1.13.2.bb => python3-cffi_1.14.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-configparser_3.8.1.bb => python3-configparser_4.0.2.bb} (100%) create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch rename meta-python/recipes-devtools/python/{python-grpcio => python3-grpcio}/ppc-boringssl-support.patch (94%) rename meta-python/recipes-devtools/python/{python-grpcio => python3-grpcio}/riscv64_support.patch (93%) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb rename meta-python/recipes-devtools/python/{python-grpcio.inc => python3-grpcio_1.27.1.bb} (67%) rename meta-python/recipes-devtools/python/{python3-pytest_5.3.2.bb => python3-pytest_5.3.5.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:02 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: libconfig, libfile, libtest: Do not inherit allarch In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.8BF38232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 650cbab790109a8bfb1dcd5878024cf56564116a Author: Khem Raj AuthorDate: Tue Feb 11 17:26:54 2020 -0800 libconfig,libfile,libtest: Do not inherit allarch These perl modules use cpan class, which adds build time dependency on perl, and since perl is arch specific this ends up with sstate signature differences for do_configure when arch is changed, therefore these packages needs to be made part of arch package-arch Fixes ERROR: libconfig-autoconf-perl different signature for task do_configure.sigdata between qemux86copy and qemuarm NOTE: Starting bitbake server... NOTE: Started PRServer with DBfile: /home/jenkins/oe/world/yoe/cache/prserv.sqlite3, IP: 127.0.0.1, PORT: 43053, PID: 16399 Hash for dependent task libconfig/libconfig-autoconf-perl_0.318.bb:do_prepare_recipe_sysroot changed from 66cd7f8d93afb36b314a0604e94f72151cb18410f395bc949156188a764ad68c to d9752dd39f67802473ebfe048ca1a688d684c7c31483e648c4e43bde9b16e3b5 Unable to find matching sigdata for /home/jenkins/oe/world/yoe/sources/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.318.bb:do_prepare_recipe_sysroot with hashes 66cd7f8d93afb36b314a0604e94f72151cb18410f395bc949156188a764ad68c or d9752dd39f67802473ebfe048ca1a688d684c7c31483e648c4e43bde9b16e3b5 ERROR: libfile-slurper-perl different signature for task do_configure.sigdata between qemux86copy and qemuarm NOTE: Starting bitbake server... NOTE: Started PRServer with DBfile: /home/jenkins/oe/world/yoe/cache/prserv.sqlite3, IP: 127.0.0.1, PORT: 39201, PID: 16448 Hash for dependent task libfile/libfile-slurper-perl_0.012.bb:do_prepare_recipe_sysroot changed from d6fd4eb704e706ed44daf37099d47fd188f6ac8c212c779dbfa7e40cff7bf449 to 9f0c17d2bf8389c634c143cc908e81f85b4d4bdab245199c86d4ae4480856d0d Unable to find matching sigdata for /home/jenkins/oe/world/yoe/sources/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb:do_prepare_recipe_sysroot with hashes d6fd4eb704e706ed44daf37099d47fd188f6ac8c212c779dbfa7e40cff7bf449 or 9f0c17d2bf8389c634c143cc908e81f85b4d4bdab245199c86d4ae4480856d0d ERROR: libtest-warnings-perl different signature for task do_configure.sigdata between qemux86copy and qemuarm NOTE: Starting bitbake server... NOTE: Started PRServer with DBfile: /home/jenkins/oe/world/yoe/cache/prserv.sqlite3, IP: 127.0.0.1, PORT: 43651, PID: 16479 Hash for dependent task libtest/libtest-warnings-perl_0.028.bb:do_prepare_recipe_sysroot changed from 77d070ada82799a51cce33ae63f70dafb2c20111e0dca15afc041efea22f1cd4 to 3d0bd29b23c66f14d4041153683eaa3d4ee0098e2b023747801748eb49da6300 Unable to find matching sigdata for /home/jenkins/oe/world/yoe/sources/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb:do_prepare_recipe_sysroot with hashes 77d070ada82799a51cce33ae63f70dafb2c20111e0dca15afc041efea22f1cd4 or 3d0bd29b23c66f14d4041153683eaa3d4ee0098e2b023747801748eb49da6300 Signed-off-by: Khem Raj Cc: Jens Rehsack --- meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.318.bb | 2 +- meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb | 2 +- meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.318.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.318.bb index e4f8fe7..afd26fa 100644 --- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.318.bb +++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.318.bb @@ -36,6 +36,6 @@ RRECOMMENDS_${PN} += "libfile-slurper-perl" S = "${WORKDIR}/Config-AutoConf-${PV}" -inherit cpan ptest-perl allarch +inherit cpan ptest-perl BBCLASSEXTEND = "native nativesdk" diff --git a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb index b684abd..3678ad7 100644 --- a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb +++ b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb @@ -31,6 +31,6 @@ RDEPENDS_${PN}-ptest += "libtest-warnings-perl \ S = "${WORKDIR}/File-Slurper-${PV}" -inherit cpan allarch ptest-perl +inherit cpan ptest-perl BBCLASSEXTEND = "native" diff --git a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb index b40a545..f2dda19 100644 --- a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb +++ b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb @@ -24,6 +24,6 @@ SRC_URI[sha256sum] = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc66022 S = "${WORKDIR}/Test-Warnings-${PV}" -inherit cpan allarch ptest-perl +inherit cpan ptest-perl BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:04 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: libteam: Upgrade to 1.30 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.AADA1232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dd7b78c6f5dac1e5228724b70c063f690cfef1b0 Author: Mingli Yu AuthorDate: Wed Feb 12 10:28:57 2020 +0800 libteam: Upgrade to 1.30 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-support/libteam/{libteam_1.29.bb => libteam_1.30.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libteam/libteam_1.29.bb b/meta-oe/recipes-support/libteam/libteam_1.30.bb similarity index 95% rename from meta-oe/recipes-support/libteam/libteam_1.29.bb rename to meta-oe/recipes-support/libteam/libteam_1.30.bb index 4ccc280..9cd02b0 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.29.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.30.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/jpirko/libteam \ file://0001-team_basic_test.py-use-python3-interpreter.patch \ file://run-ptest \ " -SRCREV = "e897f02bf2403d4859a99e090e34ea768b4c0540" +SRCREV = "471fb50d206e5a3f2eef9e4247329b51edc5c493" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:05 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: mcelog: Upgrade to 168 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.B53C3232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit addc04e7c1018642c64690f07a3fc49b118ff1cf Author: Mingli Yu AuthorDate: Wed Feb 12 14:13:20 2020 +0800 mcelog: Upgrade to 168 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-support/mcelog/{mcelog_166.bb => mcelog_168.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/mcelog/mcelog_166.bb b/meta-oe/recipes-support/mcelog/mcelog_168.bb similarity index 95% rename from meta-oe/recipes-support/mcelog/mcelog_166.bb rename to meta-oe/recipes-support/mcelog/mcelog_168.bb index 3b4ea1f..e2ef6ea 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_166.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_168.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4" +SRCREV = "078d593b8b0c7d44afdd439aacfad6682913038f" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:03 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: meta-oe: Remove dnf dependent package for non-rpm package backend In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.9DC85232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 41f5abd221807e663754daef3fdf1852ea4ec8c1 Author: Khem Raj AuthorDate: Tue Feb 11 21:18:06 2020 -0800 meta-oe: Remove dnf dependent package for non-rpm package backend dnf is not built when rpm is not in chosen backends Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 5 ++++- meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 1 + meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 929e7d5..777623b 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -172,7 +172,8 @@ RDEPENDS_packagegroup-meta-oe-gnome ="\ " RDEPENDS_packagegroup-meta-oe-graphics ="\ - cairomm dietsplash directfb directfb-examples dnfdragora \ + cairomm dietsplash directfb directfb-examples \ + ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora dnf-plugin-tui", "", d)} \ fbgrab fbida fontforge fvwm glm gphoto2 libgphoto2 \ gtkperf jasper leptonica libmng libsdl2-image libsdl2-mixer libsdl2-net \ libsdl-gfx libsdl-image libsdl-mixer libsdl-net libsdl-ttf \ @@ -190,6 +191,8 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut libsdl2-ttf", "", d)} \ " + + RDEPENDS_packagegroup-meta-oe-kernel ="\ agent-proxy broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index a8367b5..5ecf649 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -37,3 +37,4 @@ RDEPENDS_${PN} += " \ " BBCLASSEXTEND = "nativesdk" +PNBLACKLIST[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb index 9cd1efb..3f2dc30 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -28,3 +28,6 @@ EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} BBCLASSEXTEND = "nativesdk" FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora " + +PNBLACKLIST[dnfdragora] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:08 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: python3-pytest: upgrade 5.3.2 -> 5.3.5 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.CEF1C232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 662f7b7789d7e96464443bcd120ac7b8ba46804b Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:58 2020 -0800 python3-pytest: upgrade 5.3.2 -> 5.3.5 Copyright updated: 2004-2019 -> 2004-2020 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pytest.inc | 6 +++--- .../python/{python3-pytest_5.3.2.bb => python3-pytest_5.3.5.bb} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pytest.inc b/meta-python/recipes-devtools/python/python-pytest.inc index 752d67e..4021263 100644 --- a/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-python/recipes-devtools/python/python-pytest.inc @@ -1,10 +1,10 @@ SUMMARY = "Simple powerful teting with python" HOMEPAGE = "http://pytest.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" -SRC_URI[md5sum] = "71a8eb2ab5efb76512d9a69bd6477034" -SRC_URI[sha256sum] = "6b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa" +SRC_URI[md5sum] = "d5ef453f723be46d93e0795f3be86c88" +SRC_URI[sha256sum] = "0d5fe9189a148acc3c3eb2ac8e1ac0742cb7618c084f3d228baaec0c254b318d" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-python/recipes-devtools/python/python3-pytest_5.3.2.bb b/meta-python/recipes-devtools/python/python3-pytest_5.3.5.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pytest_5.3.2.bb rename to meta-python/recipes-devtools/python/python3-pytest_5.3.5.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:07 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: python3-configparser: upgrade 3.8.1 -> 4.0.2 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.C6AA8232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1f27638c7d93d930dcb3594e0e8a262267f65d77 Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:57 2020 -0800 python3-configparser: upgrade 3.8.1 -> 4.0.2 Add build dependency of setuptools-scm-native for python3-configparser. Error message: ERROR: Do not try to fetch `setuptools_scm>=1.15.0' for building. Please add its native recipe to DEPENDS. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-configparser.inc | 7 ++++--- ...python3-configparser_3.8.1.bb => python3-configparser_4.0.2.bb} | 0 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-configparser.inc b/meta-python/recipes-devtools/python/python-configparser.inc index 8ecfe22..bce7cee 100644 --- a/meta-python/recipes-devtools/python/python-configparser.inc +++ b/meta-python/recipes-devtools/python/python-configparser.inc @@ -5,9 +5,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=23f9ad5cad3d8cc0336e2a5d8a87e1fa" -SRC_URI[md5sum] = "bc1558ed941cb1acb80ff650726d5af8" -SRC_URI[sha256sum] = "bc37850f0cc42a1725a796ef7d92690651bf1af37d744cc63161dac62cabee17" +SRC_URI[md5sum] = "35926cc4b9133f1f9ca70a1fd2fdf237" +SRC_URI[sha256sum] = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" inherit pypi -BBCLASSEXTEND = "native nativesdk" \ No newline at end of file +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-configparser_3.8.1.bb b/meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-configparser_3.8.1.bb rename to meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:06 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: python3-cffi: upgrade 1.13.2 -> 1.14.0 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.BE533232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4f61c8986bdbd60d40035745e5e887f47624023b Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:56 2020 -0800 python3-cffi: upgrade 1.13.2 -> 1.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cffi.inc | 4 ++-- .../python/{python3-cffi_1.13.2.bb => python3-cffi_1.14.0.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cffi.inc b/meta-python/recipes-devtools/python/python-cffi.inc index a2b0c3b..af10c5f 100644 --- a/meta-python/recipes-devtools/python/python-cffi.inc +++ b/meta-python/recipes-devtools/python/python-cffi.inc @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[md5sum] = "652203cf99faa254efff7fab23c2f3a2" -SRC_URI[sha256sum] = "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346" +SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" +SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" RDEPENDS_${PN}_class-target = " \ ${PYTHON_PN}-ctypes \ diff --git a/meta-python/recipes-devtools/python/python3-cffi_1.13.2.bb b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-cffi_1.13.2.bb rename to meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:10 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: iozone3: Upgrade to 489 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.E012B232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0b7e50f7be5d639250f05a694272977216e7f7dd Author: Mingli Yu AuthorDate: Thu Feb 13 10:05:06 2020 +0800 iozone3: Upgrade to 489 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/iozone3/{iozone3_488.bb => iozone3_489.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb similarity index 97% rename from meta-oe/recipes-benchmark/iozone3/iozone3_488.bb rename to meta-oe/recipes-benchmark/iozone3/iozone3_489.bb index 222a956..e4b7e4f 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "d60a69e44cda8436f4f94d860958efc2" -SRC_URI[sha256sum] = "960265163d93f15f7ad352f726d4837c5dd794fff357c743fdb56cbcf4abca04" +SRC_URI[md5sum] = "e863281987689cd6d9729e535637b77d" +SRC_URI[sha256sum] = "6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584" UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:12 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: samba: upgrade 4.10.11 -> 4.10.13 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.F1B6E232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fe35221dbe3bddcea0e6d745f34bf0145ee5e19d Author: Yi Zhao AuthorDate: Thu Feb 13 16:58:28 2020 +0800 samba: upgrade 4.10.11 -> 4.10.13 Changelog: https://www.samba.org/samba/history/samba-4.10.13.html Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../recipes-connectivity/samba/{samba_4.10.11.bb => samba_4.10.13.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.11.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb similarity index 98% rename from meta-networking/recipes-connectivity/samba/samba_4.10.11.bb rename to meta-networking/recipes-connectivity/samba/samba_4.10.13.bb index ffdc15a..71d8fa2 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.10.11.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb @@ -34,8 +34,8 @@ SRC_URI_append_libc-musl = " \ file://0001-samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "eebd021de840312d7e08959e8a3d0ba1" -SRC_URI[sha256sum] = "609f4232e04c6eaad0e3b8e00cd837683a960ebb95c1fe3349e968d1d1dff894" +SRC_URI[md5sum] = "e7906580bf06dae087e99ef8254f327d" +SRC_URI[sha256sum] = "49eb6426e97cbf538e416e51ed8535930382512ad2d13d5ffd7f4336aa7faf63" UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:09 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: abseil-cpp: add recipe for git version In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.D7E4B232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ec2c3d3ef40f0553b4a1ca8d558349052ba46746 Author: Sinan Kaya AuthorDate: Wed Feb 12 20:18:25 2020 +0000 abseil-cpp: add recipe for git version The repository contains the Abseil C++ library code. Abseil is an open-source collection of C++ code (compliant to C++11) designed to augment the C++ standard library. https://github.com/abseil/abseil-cpp Signed-off-by: Changyu Li Signed-off-by: Sinan Kaya Signed-off-by: Khem Raj --- ...Remove-maes-option-from-cross-compilation.patch | 53 ++++++++++++++++++++++ ...gotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch | 35 ++++++++++++++ .../abseil-cpp/0003-Add-fPIC-option.patch | 27 +++++++++++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 52 +++++++++++++++++++++ 4 files changed, 167 insertions(+) diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch new file mode 100644 index 0000000..4c41cd8 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch @@ -0,0 +1,53 @@ +From 70926666f7c5c35add363e3bcade6eaabace7206 Mon Sep 17 00:00:00 2001 +From: Sinan Kaya +Date: Mon, 3 Feb 2020 03:25:57 +0000 +Subject: [PATCH] Remove maes option from cross-compilation + +--- + absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- + absl/copts/GENERATED_copts.bzl | 4 ---- + absl/copts/copts.py | 4 ---- + 3 files changed, 12 deletions(-) + +diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake +index 01bd40b..af99694 100644 +--- a/absl/copts/GENERATED_AbseilCopts.cmake ++++ b/absl/copts/GENERATED_AbseilCopts.cmake +@@ -230,7 +230,3 @@ list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS + "/Ob2" + ) + +-list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS +- "-maes" +- "-msse4.1" +-) +diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl +index 82f332f..9a548d1 100644 +--- a/absl/copts/GENERATED_copts.bzl ++++ b/absl/copts/GENERATED_copts.bzl +@@ -231,7 +231,3 @@ ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ + "/Ob2", + ] + +-ABSL_RANDOM_HWAES_X64_FLAGS = [ +- "-maes", +- "-msse4.1", +-] +diff --git a/absl/copts/copts.py b/absl/copts/copts.py +index 068abce..c2f70fb 100644 +--- a/absl/copts/copts.py ++++ b/absl/copts/copts.py +@@ -203,10 +203,6 @@ COPT_VARS = { + # to improve performance of some random bit generators. + "ABSL_RANDOM_HWAES_ARM64_FLAGS": ["-march=armv8-a+crypto"], + "ABSL_RANDOM_HWAES_ARM32_FLAGS": ["-mfpu=neon"], +- "ABSL_RANDOM_HWAES_X64_FLAGS": [ +- "-maes", +- "-msse4.1", +- ], + "ABSL_RANDOM_HWAES_MSVC_X64_FLAGS": [ + "/O2", # Maximize speed + "/Ob2", # Aggressive inlining +-- +2.23.0 + diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch new file mode 100644 index 0000000..fab4a73 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch @@ -0,0 +1,35 @@ +From 9384735383a0b8688e3f05ed23a53f18863eae20 Mon Sep 17 00:00:00 2001 +From: Sinan Kaya +Date: Tue, 11 Feb 2020 11:36:00 -0500 +Subject: [PATCH] Add forgotten ABSL_HAVE_VDSO_SUPPORT conditional + +Signed-off-by: Sinan Kaya +--- + absl/debugging/internal/stacktrace_x86-inl.inc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc +index ff0fd31..28607c3 100644 +--- a/absl/debugging/internal/stacktrace_x86-inl.inc ++++ b/absl/debugging/internal/stacktrace_x86-inl.inc +@@ -171,6 +171,7 @@ static void **NextStackFrame(void **old_fp, const void *uc) { + static const unsigned char *kernel_rt_sigreturn_address = nullptr; + static const unsigned char *kernel_vsyscall_address = nullptr; + if (num_push_instructions == -1) { ++#ifdef ABSL_HAVE_VDSO_SUPPORT + absl::debugging_internal::VDSOSupport vdso; + if (vdso.IsPresent()) { + absl::debugging_internal::VDSOSupport::SymbolInfo +@@ -199,6 +200,9 @@ static void **NextStackFrame(void **old_fp, const void *uc) { + } else { + num_push_instructions = 0; + } ++#else ++ num_push_instructions = 0; ++#endif + } + if (num_push_instructions != 0 && kernel_rt_sigreturn_address != nullptr && + old_fp[1] == kernel_rt_sigreturn_address) { +-- +2.20.1.windows.1 + diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch new file mode 100644 index 0000000..bb78813 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch @@ -0,0 +1,27 @@ +From d7160d647c8f8847f3ea8d7b0eb222936962c1af Mon Sep 17 00:00:00 2001 +From: Sinan Kaya +Date: Tue, 11 Feb 2020 11:58:02 -0500 +Subject: [PATCH] Add fPIC option + +Signed-off-by: Sinan Kaya +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74a3a4c..4f837b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,6 +79,9 @@ option(ABSL_USE_GOOGLETEST_HEAD + + option(ABSL_RUN_TESTS "If ON, Abseil tests will be run." OFF) + ++# link fails on arm64 and x86-64 without this ++add_compile_options(-fPIC) ++ + if(${ABSL_RUN_TESTS}) + # enable CTest. This will set BUILD_TESTING to ON unless otherwise specified + # on the command line +-- +2.20.1.windows.1 + diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb new file mode 100644 index 0000000..77afba8 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -0,0 +1,52 @@ +SUMMARY = "Abseil is a cpp library like STL" +DESCRIPTION = "Abseil provides pieces missing from the C++ standard. Contains \ +additional useful libraries like algorithm, container, debugging, hash, memory, \ +meta, numeric, strings, synchronization, time, types and utility" +HOMEPAGE = "https://abseil.io/" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" + +SRCREV = "aa844899c937bde5d2b24f276b59997e5b668bde" +BRANCH = "lts_2019_08_08" +SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ + file://0001-Remove-maes-option-from-cross-compilation.patch \ + file://0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch \ + file://0003-Add-fPIC-option.patch \ + " + +S = "${WORKDIR}/git" + +ASNEEDED_class-native = "" +ASNEEDED_class-nativesdk = "" + +inherit cmake + +BBCLASSEXTEND = "native nativesdk" +ALLOW_EMPTY_${PN} = "1" + +python () { + arch = d.getVar("TARGET_ARCH") + + if arch == "aarch64": + tunes = d.getVar("TUNE_FEATURES") + if not tunes: + raise bb.parse.SkipPackage("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) + return + pkgn = d.getVar("PN") + pkgv = d.getVar("PV") + if "crypto" not in tunes: + raise bb.parse.SkipPackage("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) + + if arch == "x86_64": + tunes = d.getVar("TUNE_FEATURES") + if not tunes: + raise bb.parse.SkipPackage("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) + return + pkgn = d.getVar("PN") + pkgv = d.getVar("PV") + if "corei7" not in tunes: + raise bb.parse.SkipPackage("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) + +} + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 22:08:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 22:08:11 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: python3-grpcio: Upgrade to 1.27.1 In-Reply-To: <158163168194.15661.8754301064249072868@git.openembedded.org> References: <158163168194.15661.8754301064249072868@git.openembedded.org> Message-ID: <20200213220802.EA0E7232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 115144fce9d97143bcb77ee4bdab5b19e61f6f82 Author: Khem Raj AuthorDate: Wed Feb 12 18:12:28 2020 -0800 python3-grpcio: Upgrade to 1.27.1 Merge inc file into bb, there are no other users of it Delete gettid patch, fixed differenty upstream Add code to use cross compiler in setup.py Define GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY so it does not use SYS_clock_gettime syscalls since it does not work when 64bit time_t is used on 32bit arches Signed-off-by: Khem Raj --- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 40 -------------- .../python/python-grpcio/gettid.patch | 26 --------- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 64 ++++++++++++++++++++++ .../ppc-boringssl-support.patch | 2 +- .../riscv64_support.patch | 2 +- .../python/python3-grpcio_1.19.0.bb | 2 - ...{python-grpcio.inc => python3-grpcio_1.27.1.bb} | 16 +++--- 7 files changed, 73 insertions(+), 79 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch deleted file mode 100644 index f17f048..0000000 --- a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Aug 2017 09:04:07 -0700 -Subject: [PATCH] setup.py: Do not mix C and C++ compiler options - -EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX -so using -std=c++11 or -std=gnu99 together will cause -build time errors espcially with clang - -error: invalid argument '-std=gnu99' not allowed with 'C++' - -gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) - as well clang default to these standards mode or newer -anyway - -Signed-off-by: Khem Raj ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/setup.py -+++ b/setup.py -@@ -145,7 +145,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ. - EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None) - EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None) - if EXTRA_ENV_COMPILE_ARGS is None: -- EXTRA_ENV_COMPILE_ARGS = ' -std=c++11' -+ EXTRA_ENV_COMPILE_ARGS = "" - if 'win32' in sys.platform and sys.version_info < (3, 5): - EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot' - # We use define flags here and don't directly add to DEFINE_MACROS below to -@@ -157,7 +157,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: - else: - EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64' - elif "linux" in sys.platform: -- EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions' -+ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' - elif "darwin" in sys.platform: - EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' - EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT' diff --git a/meta-python/recipes-devtools/python/python-grpcio/gettid.patch b/meta-python/recipes-devtools/python/python-grpcio/gettid.patch deleted file mode 100644 index fb15cf7..0000000 --- a/meta-python/recipes-devtools/python/python-grpcio/gettid.patch +++ /dev/null @@ -1,26 +0,0 @@ -use glibc provided gettid API for glibc 2.30+ - -glibc 2.30 introduced this function see [1] -so it's best to detect it -and provide fallback only if it's not present - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/src/core/lib/gpr/log_linux.cc -+++ b/src/core/lib/gpr/log_linux.cc -@@ -40,7 +40,13 @@ - #include - #include - -+#if defined(__GLIBC__) -+#if !__GLIBC_PREREQ(2,29) - static long gettid(void) { return syscall(__NR_gettid); } -+#endif -+#else -+static long gettid(void) { return syscall(__NR_gettid); } -+#endif - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch new file mode 100644 index 0000000..131daac --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -0,0 +1,64 @@ +From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 4 Aug 2017 09:04:07 -0700 +Subject: [PATCH] setup.py: Do not mix C and C++ compiler options + +EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX +so using -std=c++11 or -std=gnu99 together will cause +build time errors espcially with clang + +error: invalid argument '-std=gnu99' not allowed with 'C++' + +gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) + as well clang default to these standards mode or newer +anyway + +Signed-off-by: Khem Raj +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/setup.py ++++ b/setup.py +@@ -144,9 +144,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ. + + def check_linker_need_libatomic(): + """Test if linker on system needs libatomic.""" ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' + code_test = (b'#include \n' + + b'int main() { return std::atomic{}; }') +- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], ++ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) +@@ -163,7 +164,7 @@ def check_linker_need_libatomic(): + EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None) + EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None) + if EXTRA_ENV_COMPILE_ARGS is None: +- EXTRA_ENV_COMPILE_ARGS = ' -std=c++11' ++ EXTRA_ENV_COMPILE_ARGS = ' ' + if 'win32' in sys.platform: + if sys.version_info < (3, 5): + EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot' +@@ -180,7 +181,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: + # available dynamically + EXTRA_ENV_COMPILE_ARGS += ' /MT' + elif "linux" in sys.platform: +- EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions' ++ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' + elif "darwin" in sys.platform: + EXTRA_ENV_COMPILE_ARGS += ' -stdlib=libc++ -fvisibility=hidden -fno-wrapv -fno-exceptions' + +--- a/src/python/grpcio/commands.py ++++ b/src/python/grpcio/commands.py +@@ -216,7 +216,8 @@ class BuildExt(build_ext.build_ext): + when invoked in C mode. GCC is okay with this, while clang is not. + """ + # TODO(lidiz) Remove the generated a.out for success tests. +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' ++ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) diff --git a/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch similarity index 94% rename from meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch rename to meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch index 6435abb..8ac2aef 100644 --- a/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch @@ -5,7 +5,7 @@ Signed-off-by: Khem Raj --- a/third_party/boringssl/include/openssl/base.h +++ b/third_party/boringssl/include/openssl/base.h -@@ -95,6 +95,9 @@ extern "C" { +@@ -99,6 +99,9 @@ extern "C" { #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN) #define OPENSSL_64_BIT #define OPENSSL_PPC64LE diff --git a/meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch similarity index 93% rename from meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch rename to meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch index fef7d9e..b55d50b 100644 --- a/meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch @@ -4,7 +4,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- a/third_party/boringssl/include/openssl/base.h +++ b/third_party/boringssl/include/openssl/base.h -@@ -104,6 +104,9 @@ extern "C" { +@@ -108,6 +108,9 @@ extern "C" { #elif defined(__mips__) && defined(__LP64__) #define OPENSSL_64_BIT #define OPENSSL_MIPS64 diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb deleted file mode 100644 index d4720b4..0000000 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-grpcio.inc diff --git a/meta-python/recipes-devtools/python/python-grpcio.inc b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb similarity index 67% rename from meta-python/recipes-devtools/python/python-grpcio.inc rename to meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb index c5762b2..bc2b70c 100644 --- a/meta-python/recipes-devtools/python/python-grpcio.inc +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb @@ -1,29 +1,27 @@ DESCRIPTION = "Google gRPC" HOMEPAGE = "http://www.grpc.io/" SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS_append = "${PYTHON_PN}-protobuf" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-grpcio:" +DEPENDS += "${PYTHON_PN}-protobuf" SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ file://ppc-boringssl-support.patch \ file://riscv64_support.patch \ - file://gettid.patch \ " +SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" +SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ " -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - +inherit setuptools3 inherit pypi -SRC_URI[md5sum] = "188565f150f34d1927b87e014f0f4b73" -SRC_URI[sha256sum] = "2ddbca16c2e7b3f2ffc6e34c7cfa6886fb01de9f156ad3f77b72ad652d632097" +export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" CLEANBROKEN = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:36 +0000 Subject: [oe-commits] [openembedded-core] 02/24: crosssdk: Set natisdk specific distro features In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234234.CF1E7232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8192f437ce7d16929ecea286af1d3c6aa7b1c1b4 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:58 2020 -0800 crosssdk: Set natisdk specific distro features Currently, normal distro features e.g. ld-is-gold is impacting crosssdk recipes, which actually should not be the case, since that feature is essentially intended for target packages and not nativesdk packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index c718a09..04aecb6 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -5,9 +5,15 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" + python () { # set TUNE_PKGARCH to SDK_ARCH d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # Set features here to prevent appends and distro features backfill + # from modifying nativesdk distro features + features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split()) + filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).split()) + d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered))) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:34 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d58d9e1 -> a47bcdf) Message-ID: <158163735409.11302.13146267630062385739@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard d58d9e1 librepo: upgrade 1.11.1 -> 1.11.2 discard 64f86a7 libcheck: upgrade 0.13.0 -> 0.14.0 discard 6cb5c40 libxcrypt: upgrade 4.4.10 -> 4.4.12 discard 6bd9f22 libtasn1: upgrade 4.15.0 -> 4.16.0 discard 4a13cd7 xkeyboard-config: upgrade 2.28 -> 2.29 discard 1375fbb sudo: upgrade 1.8.30 -> 1.8.31 discard bc4b3a5 qemu: Upgrade to 4.2.0 discard d2eca02 binutils: additional patch should be added with space. discard a7aea2d mtdev: upgrade 1.1.5 -> 1.1.6 discard ccb92d3 devicetree.bbclass: include symbols in base DT discard 26e6081 kernel-fitimage: fix devicetree reproducibility discard f97c205 systemd: upgrade v244.1 -> v244.3 discard e8b985e linux-yocto-dev: Add paravirt_kvm support for qemux86-64 discard 461cbb5 python3: install _tkinter.*.so to python3-tkinter package discard 6384b11 oeqa: reproducible: Run diffoscope on saved output discard c7c168f recipes-support: Add diffoscope recipe discard 61774ff python: Add magic recipe discard 7ba19d7 python: Add libarchive-c recipe discard 0cb73d3 wayland: upgrade 1.17.0 -> 1.18.0 discard 969faeb ppp: Security fix CVE-2020-8597 discard 406878e icecc.bbclass: replace superfluous "+=" with "=" discard 157912f iputils: Fix systemd and ipv6 detection discard 8d60560 binutils: Bail out if gold is used on 32/64 bit RISC-V discard 728f6b0 crosssdk: Set natisdk specific distro features discard b0d8d6a ltp: Fix tescases with 64bit time_t using 32bit arches discard 707e913 gdb: Upgrade to 9.1 release discard 0653a8f musl: Update to latest tip new d5958bc ltp: Fix tescases with 64bit time_t using 32bit arches new 8192f43 crosssdk: Set natisdk specific distro features new bbac678 binutils: Bail out if gold is used on 32/64 bit RISC-V new 61edcad iputils: Fix systemd and ipv6 detection new f5d30f7 icecc.bbclass: replace superfluous "+=" with "=" new e3eb5dc ppp: Security fix CVE-2020-8597 new d042a9c wayland: upgrade 1.17.0 -> 1.18.0 new b2f2fdf python: Add libarchive-c recipe new 6547176 python: Add magic recipe new fa9be46 recipes-support: Add diffoscope recipe new 3d2597d oeqa: reproducible: Run diffoscope on saved output new 559c695 python3: install _tkinter.*.so to python3-tkinter package new f101850 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 new b513185 kernel-fitimage: fix devicetree reproducibility new 0c73603 devicetree.bbclass: include symbols in base DT new 941d066 mtdev: upgrade 1.1.5 -> 1.1.6 new 878a649 binutils: additional patch should be added with space. new 0f65036 qemu: Upgrade to 4.2.0 new 230b33b sudo: upgrade 1.8.30 -> 1.8.31 new dd9048d xkeyboard-config: upgrade 2.28 -> 2.29 new 82fca74 libtasn1: upgrade 4.15.0 -> 4.16.0 new e977782 libxcrypt: upgrade 4.4.10 -> 4.4.12 new 8bd59f7 libcheck: upgrade 0.13.0 -> 0.14.0 new a47bcdf librepo: upgrade 1.11.1 -> 1.11.2 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d58d9e1) \ N -- N -- N refs/heads/master-next (a47bcdf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 24 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/musl/musl_git.bb | 2 +- ...systemd-boot_244.3.bb => systemd-boot_244.1.bb} | 0 ...systemd-conf_244.3.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 5 +- .../systemd/{systemd_244.3.bb => systemd_244.1.bb} | 0 meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ++++ meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ---- ...canadian_9.1.bb => gdb-cross-canadian_8.3.1.bb} | 0 .../gdb/{gdb-cross_9.1.bb => gdb-cross_8.3.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ++++ ...002-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 ++++--- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0007-use-asm-sgidefs.h.patch} | 9 +- ...0008-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0009-Change-order-of-CFLAGS.patch} | 13 +- ...> 0010-resolve-restrict-keyword-conflict.patch} | 17 +-- ...tch => 0011-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ------ .../gdb/gdb/CVE-2019-1010180.patch | 132 +++++++++++++++++++++ .../gdb/{gdb_9.1.bb => gdb_8.3.1.bb} | 0 24 files changed, 273 insertions(+), 128 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_244.3.bb => systemd-boot_244.1.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_244.3.bb => systemd-conf_244.1.bb} (100%) rename meta/recipes-core/systemd/{systemd_244.3.bb => systemd_244.1.bb} (100%) create mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc delete mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_9.1.bb => gdb-cross-canadian_8.3.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_9.1.bb => gdb-cross_8.3.1.bb} (100%) create mode 100644 meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename meta/recipes-devtools/gdb/gdb/{0001-make-man-install-relative-to-DESTDIR.patch => 0002-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0004-Add-support-for-Renesas-SH-sh4-architecture.patch => 0005-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0005-Dont-disable-libreadline.a-when-using-disable-static.patch => 0006-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0006-use-asm-sgidefs.h.patch => 0007-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0007-Use-exorted-definitions-of-SIGRTMIN.patch => 0008-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0008-Change-order-of-CFLAGS.patch => 0009-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0009-resolve-restrict-keyword-conflict.patch => 0010-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0010-Fix-invalid-sigprocmask-call.patch => 0011-Fix-invalid-sigprocmask-call.patch} (65%) delete mode 100644 meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch create mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_9.1.bb => gdb_8.3.1.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:37 +0000 Subject: [oe-commits] [openembedded-core] 03/24: binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234234.E46C2232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bbac678052cdc8313e2bf9214e8547b95e04a0ff Author: Khem Raj AuthorDate: Thu Feb 13 00:21:59 2020 -0800 binutils: Bail out if gold is used on 32/64 bit RISC-V gold is not supporting risc-v yet and, this will cause subltle errors during build e.g. autoconf not finding certain features like visibility and it could take a while to unwind the problem. Its better to error out early Remove dwp and ld.gold for rv32 as well Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 0fb6cae..a4b9aa5 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -40,6 +40,7 @@ FILES_${PN}-dev = " \ LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS_riscv64 = "" +LDGOLD_ALTS_riscv32 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -83,6 +84,7 @@ LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" @@ -163,3 +165,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:35 +0000 Subject: [oe-commits] [openembedded-core] 01/24: ltp: Fix tescases with 64bit time_t using 32bit arches In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234234.BF563232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d5958bcfbf9a6c8b74a6398e99d54fa2f548b13b Author: Khem Raj AuthorDate: Thu Feb 13 00:21:57 2020 -0800 ltp: Fix tescases with 64bit time_t using 32bit arches This helps it compile on musl Fixes | tst_clocks.c:31:17: error: 'SYS_clock_getres' undeclared (first use in this function); did you mean 'tst_clock_getres Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 81 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch new file mode 100644 index 0000000..92e5fdf --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -0,0 +1,81 @@ +From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Feb 2020 22:22:17 -0800 +Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them + +musl is using 64bit time_t now on 32bit architectures and these syscalls +no longer exist, therefore its better to check for them being available +before using them + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Signed-off-by: Khem Raj +--- + lib/tst_clocks.c | 9 +++++++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ + 3 files changed, 17 insertions(+) + +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 35798a4aaf..6a5b05c4ea 100644 +--- a/lib/tst_clocks.c ++++ b/lib/tst_clocks.c +@@ -28,15 +28,24 @@ + + int tst_clock_getres(clockid_t clk_id, struct timespec *res) + { ++#if defined(__NR_clock_getres) + return syscall(SYS_clock_getres, clk_id, res); ++#endif ++ return -1; + } + + int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + return syscall(SYS_clock_gettime, clk_id, ts); ++#endif ++ return -1; + } + + int tst_clock_settime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_settime) + return syscall(SYS_clock_settime, clk_id, ts); ++#endif ++ return -1; + } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9b..b498de5b68 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +@@ -41,7 +41,11 @@ + #include + #include + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + char *TCID = "gettimeofday01"; + int TST_TOTAL = 1; +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e8..218e017df8 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +@@ -23,7 +23,11 @@ + + #include "tst_test.h" + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + static volatile sig_atomic_t done; + static char *str_rtime; +-- +2.25.0 + diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20190930.bb index 2853b1c..19bd7bc 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20190930.bb @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ + file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:38 +0000 Subject: [oe-commits] [openembedded-core] 04/24: iputils: Fix systemd and ipv6 detection In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.00C38232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 61edcad762aebd08f74144b5ca208a4c0332803a Author: Alex Kiernan AuthorDate: Thu Feb 13 10:00:29 2020 +0000 iputils: Fix systemd and ipv6 detection When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...infod-fix-systemd-Documentation-url-error.patch | 28 +++++++++++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 ++++++++++++++++++++++ meta/recipes-extended/iputils/iputils_s20190709.bb | 23 ++++++++--- 3 files changed, 91 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 0000000..03a3f56 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-off-by: Alex Kiernan +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 0000000..d7367ca --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 13 Feb 2020 06:08:45 +0000 +Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers + +Neither rarpd nor rdisc can gain the necessary capabilities with +PrivateUsers enabled. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + systemd/rarpd.service.in | 1 - + systemd/rdisc.service.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in +index 4e2a1ec9d0e5..a71b87d36b37 100644 +--- a/systemd/rdisc.service.in ++++ b/systemd/rdisc.service.in +@@ -8,9 +8,10 @@ After=network.target + EnvironmentFile=-/etc/sysconfig/rdisc + ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS + ++CapabilityBoundingSet=CAP_NET_RAW + AmbientCapabilities=CAP_NET_RAW + PrivateTmp=yes +-PrivateUsers=yes ++DynamicUser=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae1..2aed6b5 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -12,6 +12,8 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ + file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" @@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:39 +0000 Subject: [oe-commits] [openembedded-core] 05/24: icecc.bbclass: replace superfluous "+=" with "=" In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.10B22232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f5d30f7da62173a1c40d825c0a220a873dad22b2 Author: Robert P. J. Day AuthorDate: Thu Feb 13 08:21:57 2020 -0500 icecc.bbclass: replace superfluous "+=" with "=" Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index bc3d6f4..d095305 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend += "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@icecc_dep_prepend(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:43 +0000 Subject: [oe-commits] [openembedded-core] 09/24: python: Add magic recipe In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.4C0B3232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 65471765f8e865f7864f1c51bc5ba325db010b82 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:33 2020 -0600 python: Add magic recipe The python-magic module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/python/python3-magic_0.4.15.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index abbdb74..171a436 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -580,6 +580,7 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.40DD6232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b2f2fdfb90a626dcb0f9474ac0af847e76fbd599 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:32 2020 -0600 python: Add libarchive-c recipe The libarchive python module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + .../recipes-devtools/python/python3-libarchive-c_2.9.bb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c68e9ed..abbdb74 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -579,6 +579,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.5A4DF232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fa9be46acfeefbfb5d692bbf041cf76c0ce55071 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:34 2020 -0600 recipes-support: Add diffoscope recipe Diffoscope is the universal diff tool, capable of comparing many different formats. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 171a436..4a267fa 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi " RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb new file mode 100644 index 0000000..a00f281 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -0,0 +1,15 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:40 +0000 Subject: [oe-commits] [openembedded-core] 06/24: ppp: Security fix CVE-2020-8597 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.1EAA2232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e3eb5dc5a41639605a5d5fd0439c0b5a8f94ad12 Author: Yi Zhao AuthorDate: Thu Feb 13 16:55:01 2020 +0800 ppp: Security fix CVE-2020-8597 CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000..b7ba7ba --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4..60c56dd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:41 +0000 Subject: [oe-commits] [openembedded-core] 07/24: wayland: upgrade 1.17.0 -> 1.18.0 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.2FCFC232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d042a9c6466134c7919a1c36c236e4ab2891aede Author: Denys Dmytriyenko AuthorDate: Thu Feb 13 01:23:44 2020 -0500 wayland: upgrade 1.17.0 -> 1.18.0 This is the official release for Wayland 1.18. The main new features in this release are: - Add support for the Meson build system (autotools is still supported but will be removed in a future release) - Add API to tag proxy objects to allow applications and toolkits to share the same Wayland connection - Track wayland-server timers in user-space to prevent creating too many FDs - Add wl_global_remove, a new function to mitigate race conditions with globals https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html 2 upstreamed patches are dropped. Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- 3 files changed, 3 insertions(+), 221 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch deleted file mode 100644 index c443587..0000000 --- a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Fri, 25 Oct 2019 21:03:23 -0500 -Subject: [PATCH] scanner: Add configure check for strndup - -Some platforms may not have strndup() (e.g. MinGW), so provide a -equivalent implementation if it's not found. - -Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571] -Signed-off-by: Joshua Watt ---- - configure.ac | 2 +- - src/scanner.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d56f2b..1c99e21 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ fi - AC_SUBST(GCC_CFLAGS) - - AC_CHECK_HEADERS([sys/prctl.h]) --AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) -+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup]) - - AC_ARG_ENABLE([libraries], - [AC_HELP_STRING([--disable-libraries], -diff --git a/src/scanner.c b/src/scanner.c -index a94be5d..27004bc 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx, - - } - -+#ifndef HAVE_STRNDUP -+char * -+strndup(const char *s, size_t size) -+{ -+ char *r = malloc(size + 1); -+ strncpy(r, s, size); -+ r[size] = '\0'; -+ return r; -+} -+#endif -+ - static void - end_element(void *data, const XML_Char *name) - { diff --git a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch b/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch deleted file mode 100644 index b05b875..0000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch +++ /dev/null @@ -1,166 +0,0 @@ -From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Tue, 5 Nov 2019 09:09:50 -0600 -Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h - -Including wayland-server-core.h in wayland-private.h is problematic -because wayland-private.h is included by wayland-scanner which should be -able to build against non-POSIX platforms (e.g. MinGW). The only reason -that wayland-server-core.h was included in wayland-private.h was for the -wl_private_signal definitions, so move those to a -wayland-server-private.h file that can be included by both -wayland-server.c and the tests. - -Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc] -Signed-off-by: Joshua Watt ---- - Makefile.am | 3 +- - src/wayland-private.h | 22 +-------------- - src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++ - src/wayland-server.c | 1 + - tests/newsignal-test.c | 2 +- - 5 files changed, 58 insertions(+), 23 deletions(-) - create mode 100644 src/wayland-server-private.h - -diff --git a/Makefile.am b/Makefile.am -index f47d055..026d981 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \ - src/connection.c \ - src/wayland-os.c \ - src/wayland-os.h \ -- src/wayland-private.h -+ src/wayland-private.h \ -+ src/wayland-server-private.h - - include_HEADERS = \ - src/wayland-util.h \ -diff --git a/src/wayland-private.h b/src/wayland-private.h -index 29516ec..dc7d12f 100644 ---- a/src/wayland-private.h -+++ b/src/wayland-private.h -@@ -31,11 +31,11 @@ - #include - #include - #include -+#include - - #define WL_HIDE_DEPRECATED 1 - - #include "wayland-util.h" --#include "wayland-server-core.h" - - /* Invalid memory address */ - #define WL_ARRAY_POISON_PTR (void *) 4 -@@ -236,26 +236,6 @@ zalloc(size_t s) - return calloc(1, s); - } - --struct wl_priv_signal { -- struct wl_list listener_list; -- struct wl_list emit_list; --}; -- --void --wl_priv_signal_init(struct wl_priv_signal *signal); -- --void --wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -- --struct wl_listener * --wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -- --void --wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -- --void --wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -- - void - wl_connection_close_fds_in(struct wl_connection *connection, int max); - -diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h -new file mode 100644 -index 0000000..23fa458 ---- /dev/null -+++ b/src/wayland-server-private.h -@@ -0,0 +1,53 @@ -+/* -+ * Copyright ? 2008-2011 Kristian H?gsberg -+ * Copyright ? 2011 Intel Corporation -+ * Copyright ? 2013 Jason Ekstrand -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef WAYLAND_SERVER_PRIVATE_H -+#define WAYLAND_SERVER_PRIVATE_H -+ -+#include "wayland-server-core.h" -+ -+struct wl_priv_signal { -+ struct wl_list listener_list; -+ struct wl_list emit_list; -+}; -+ -+void -+wl_priv_signal_init(struct wl_priv_signal *signal); -+ -+void -+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -+ -+struct wl_listener * -+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -+ -+void -+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -+ -+void -+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -+ -+#endif -diff --git a/src/wayland-server.c b/src/wayland-server.c -index 19f6a76..d6f0206 100644 ---- a/src/wayland-server.c -+++ b/src/wayland-server.c -@@ -45,6 +45,7 @@ - - #include "wayland-util.h" - #include "wayland-private.h" -+#include "wayland-server-private.h" - #include "wayland-server.h" - #include "wayland-os.h" - -diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c -index 47c429b..f3a7bd9 100644 ---- a/tests/newsignal-test.c -+++ b/tests/newsignal-test.c -@@ -26,7 +26,7 @@ - #include - - #include "test-runner.h" --#include "wayland-private.h" -+#include "wayland-server-private.h" - - static void - signal_notify(struct wl_listener *listener, void *data) diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb similarity index 84% rename from meta/recipes-graphics/wayland/wayland_1.17.0.bb rename to meta/recipes-graphics/wayland/wayland_1.18.0.bb index 12916a0..7a3f075 100644 --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ - file://0001-scanner-Add-configure-check-for-strndup.patch \ - file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \ + file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" -SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" +SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" +SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:46 +0000 Subject: [oe-commits] [openembedded-core] 12/24: python3: install _tkinter.*.so to python3-tkinter package In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.7D596232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 559c695ba223050b08932f6ad004b2db256f43a2 Author: Yi Zhao AuthorDate: Wed Feb 12 14:24:40 2020 +0800 python3: install _tkinter.*.so to python3-tkinter package When enable PACKAGECONFIG[tk], we should install _tkinter.*.so to python3-tkinter package rather than python3-misc package. Fixes: ERROR: python3-3.8.1-r0 do_package_qa: QA Issue: /usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so contained in package python3-misc requires libtk8.6.so()(64bit), but no providers found in RDEPENDS_python3-misc? [file-rdeps] Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3/python3-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index cbfa8d5..251271c 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -1127,6 +1127,7 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so", "${libdir}/python${PYTHON_MAJMIN}/tkinter" ], "cached": [] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:45 +0000 Subject: [oe-commits] [openembedded-core] 11/24: oeqa: reproducible: Run diffoscope on saved output In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.6A8FE232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3d2597db2463682e45972c38ec9a9201974efbc6 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:35 2020 -0600 oeqa: reproducible: Run diffoscope on saved output If there are differing packages and they are being saved for review, automatically run diffoscope on them and include the output in the saved output. The output is currently done in HTML format since these are typically published on a webpage by the autobuilder. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index f6433c9..d3fd8c3 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: MIT # -# Copyright 2019 by Garmin Ltd. or its subsidiaries +# Copyright 2019-2020 by Garmin Ltd. or its subsidiaries from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars @@ -167,10 +167,16 @@ class ReproducibleTests(OESelftestTestCase): return d def test_reproducible_builds(self): + def strip_topdir(s): + if s.startswith(self.topdir): + return s[len(self.topdir):] + return s + # Build native utilities self.write_config('') - bitbake("diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -206,18 +212,22 @@ class ReproducibleTests(OESelftestTestCase): if self.save_results: for d in result.different: - self.copy_file(d.reference, '/'.join([save_dir, d.reference])) - self.copy_file(d.test, '/'.join([save_dir, d.test])) + self.copy_file(d.reference, '/'.join([save_dir, 'packages', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages', strip_topdir(d.test)])) if result.missing or result.different: fails.append("The following %s packages are missing or different: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) - if fails: - self.fail('\n'.join(fails)) - # Clean up empty directories if self.save_results: if not os.listdir(save_dir): os.rmdir(save_dir) + else: + self.logger.info('Running diffoscope') + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + + if fails: + self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:47 +0000 Subject: [oe-commits] [openembedded-core] 13/24: linux-yocto-dev: Add paravirt_kvm support for qemux86-64 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.8C942232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f1018506731670130b5087a5b96c8dbb9eb95934 Author: He Zhe AuthorDate: Wed Feb 12 15:35:57 2020 +0800 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 This feature includes paravirtualized KVM guest support, including KVMCLOCK for enhancing clock accuracy of guest OS. With it we can prevent the following error. "clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large" Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index afda849..c364a97 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -48,7 +48,7 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/ta KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_VERSION_SANITY_SKIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:48 +0000 Subject: [oe-commits] [openembedded-core] 14/24: kernel-fitimage: fix devicetree reproducibility In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.9B891232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b513185646cf98baae79ea6b460d113536595f32 Author: Alex Kiernan AuthorDate: Wed Feb 12 11:33:36 2020 +0000 kernel-fitimage: fix devicetree reproducibility Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index d1b8cdc..72b05ff 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,7 +391,7 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:49 +0000 Subject: [oe-commits] [openembedded-core] 15/24: devicetree.bbclass: include symbols in base DT In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.AC6F6232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0c736030695ed3a63be09f3d3cd23029b46535c3 Author: Alex Kiernan AuthorDate: Wed Feb 12 10:35:26 2020 +0000 devicetree.bbclass: include symbols in base DT When processing overlays, the base device tree must be compiled with symbols, otherwise attempting to apply overlays in U-Boot will fail with: failed on fdt_overlay_apply(): FDT_ERR_NOTFOUND base fdt does did not have a /__symbols__ node make sure you've compiled with -@ Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/devicetree.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass index d8779c7..c772ab2 100644 --- a/meta/classes/devicetree.bbclass +++ b/meta/classes/devicetree.bbclass @@ -59,7 +59,7 @@ DT_BOOT_CPU ??= "0" DTC_FLAGS ?= "-R ${DT_RESERVED_MAP} -b ${DT_BOOT_CPU}" DTC_PPFLAGS ?= "-nostdinc -undef -D__DTS__ -x assembler-with-cpp" -DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE}" +DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE} -@" DTC_OFLAGS ?= "-p 0 -@ -H epapr" python () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:51 +0000 Subject: [oe-commits] [openembedded-core] 17/24: binutils: additional patch should be added with space. In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.CA2E1232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 878a6493a0c0a52f514fb977f002c37126d8f264 Author: Jeremy Puhlman AuthorDate: Mon Feb 10 13:29:26 2020 -0800 binutils: additional patch should be added with space. If an append adds a patch or file with SRC_URI += , the spaceless append causes the file listings to concatinate and cause failures in the nativesdk-binutils parse/build. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.33.bb index ecdab96..8bd2bf7 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.33.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = "file://nativesdk-relocation.patch" +SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:53 +0000 Subject: [oe-commits] [openembedded-core] 19/24: sudo: upgrade 1.8.30 -> 1.8.31 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.F2457232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 230b33ba1a8a3abd8860df16652c36cb83ebc48e Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:00 2020 -0800 sudo: upgrade 1.8.30 -> 1.8.31 -License-Update: Copyright year updated from 1998-2019 to 1998-2020. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 3b314dd..5d27d46 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.31.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.30.bb rename to meta/recipes-extended/sudo/sudo_1.8.31.bb index 9d014d2..39d8817 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.31.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" -SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" +SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de" +SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:52 +0000 Subject: [oe-commits] [openembedded-core] 18/24: qemu: Upgrade to 4.2.0 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.E4E72232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0f650362c926053ef79a9829d102484c01a31936 Author: Alistair Francis AuthorDate: Mon Feb 10 13:25:15 2020 -0800 qemu: Upgrade to 4.2.0 While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +-- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 ++- ...fix-regression-in-parsing-vga-cmdline-par.patch | 54 +++++++++++ ...0011-linux-user-remove-host-stime-syscall.patch | 61 ------------ ...2-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 --------------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 21 files changed, 108 insertions(+), 228 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5a..23f2ce9 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43..28cfd2c 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0012-fix-libcap-header-issue-on-some-distro.patch \ + file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060..a557e74 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ + file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102..66ff996 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd5..7f7da51 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68..012d60d 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab4..bc30397 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a736815..ec30337 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a423855..0810ae8 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2..89baad9 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25..30bb4dd 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d94..7e273ee 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7da..34df78b 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch new file mode 100644 index 0000000..2fe0850 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch @@ -0,0 +1,54 @@ +From a88c40f02ace88f09b2a85a64831b277b2ebc88c Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Sat, 21 Dec 2019 17:21:24 +0100 +Subject: [PATCH] hw/i386/pc: fix regression in parsing vga cmdline parameter + +When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0 +would refuse to start with a rather cryptic message: + + $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet' + qemu: can't parse 'vga' parameter: Invalid argument + +It was not clear whether this applied to the '-vga std' parameter or the +'-append' one. Fix the parsing regression and clarify the error. + +Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()") +Cc: Sergio Lopez +Signed-off-by: Peter Wu +Message-Id: <20191221162124.1159291-1-peter at lekensteyn.nl> +Cc: qemu-stable at nongnu.org +Signed-off-by: Paolo Bonzini +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c] +--- + hw/i386/x86.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/i386/x86.c b/hw/i386/x86.c +index d8bb5c2a96..9b9a4d5837 100644 +--- a/hw/i386/x86.c ++++ b/hw/i386/x86.c +@@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, + vmode = strstr(kernel_cmdline, "vga="); + if (vmode) { + unsigned int video_mode; ++ const char *end; + int ret; + /* skip "vga=" */ + vmode += 4; +@@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, + } else if (!strncmp(vmode, "ask", 3)) { + video_mode = 0xfffd; + } else { +- ret = qemu_strtoui(vmode, NULL, 0, &video_mode); +- if (ret != 0) { +- fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", +- strerror(-ret)); ++ ret = qemu_strtoui(vmode, &end, 0, &video_mode); ++ if (ret != 0 || (*end && *end != ' ')) { ++ fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); + exit(1); + } + } +-- +2.25.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be..0000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e4..0000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:54 +0000 Subject: [oe-commits] [openembedded-core] 20/24: xkeyboard-config: upgrade 2.28 -> 2.29 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234236.0C5D6232A56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dd9048d4d931596485430dcae972d71f112155dd Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:01 2020 -0800 xkeyboard-config: upgrade 2.28 -> 2.29 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb similarity index 87% rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb index 7a3d694..c8fa98e 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" -SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" +SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" +SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:55 +0000 Subject: [oe-commits] [openembedded-core] 21/24: libtasn1: upgrade 4.15.0 -> 4.16.0 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234236.223DE232A55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 82fca745853524d8deb89df5edf5fc1a0ce20ab1 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:02 2020 -0800 libtasn1: upgrade 4.15.0 -> 4.16.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb similarity index 83% rename from meta/recipes-support/gnutls/libtasn1_4.15.0.bb rename to meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 115c98a..8337b70 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" -SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:50 +0000 Subject: [oe-commits] [openembedded-core] 16/24: mtdev: upgrade 1.1.5 -> 1.1.6 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234235.BBD53232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 941d066ea9a012bd25e51aca447e007447e7994d Author: Pierre-Jean Texier via Openembedded-core AuthorDate: Mon Feb 10 22:25:59 2020 +0100 mtdev: upgrade 1.1.5 -> 1.1.6 Also remove patch which have been merged upstream Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------------------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +-- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index a0cebe5..0000000 --- a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,77 +0,0 @@ -From af75e8ee3d12a493b758421b2feed0351fdcbbf0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 23 Nov 2019 13:44:32 -0800 -Subject: [PATCH] adjust for 64bit time_t for 32bit architectures - -libc that has support for 32 bit applications to use 64 bit -time_t supplies __USE_TIME_BITS64 define [1] - -[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/core.c | 8 +++++++- - test/mtdev-test.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/core.c b/src/core.c -index 87ef420..0d91c0b 100644 ---- a/src/core.c -+++ b/src/core.c -@@ -31,6 +31,11 @@ - #include "evbuf.h" - #include "match.h" - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - static inline int istouch(const struct mtdev_slot *data, - const struct mtdev *dev) - { -@@ -251,7 +256,8 @@ static void push_slot_changes(struct mtdev_state *state, - count++; - if (!count) - return; -- ev.time = syn->time; -+ ev.input_event_sec = syn->input_event_sec; -+ ev.input_event_usec = syn->input_event_usec; - ev.type = EV_ABS; - ev.code = ABS_MT_SLOT; - ev.value = slot; -diff --git a/test/mtdev-test.c b/test/mtdev-test.c -index 1b3e4f2..773f86a 100644 ---- a/test/mtdev-test.c -+++ b/test/mtdev-test.c -@@ -30,9 +30,15 @@ - #include - #include - #include -+#include -+ -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - /* year-proof millisecond event time */ --typedef __u64 mstime_t; -+typedef uint64_t mstime_t; - - static int use_event(const struct input_event *ev) - { -@@ -47,7 +53,7 @@ static void print_event(const struct input_event *ev) - { - static const mstime_t ms = 1000; - static int slot; -- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; -+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; - if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) - slot = ev->value; - fprintf(stderr, "%012llx %02d %01d %04x %d\n", --- -2.24.0 - diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb similarity index 65% rename from meta/recipes-graphics/wayland/mtdev_1.1.5.bb rename to meta/recipes-graphics/wayland/mtdev_1.1.6.bb index aa8bb69..7c1cb5e 100644 --- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb +++ b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb @@ -11,10 +11,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ -" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" +SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:56 +0000 Subject: [oe-commits] [openembedded-core] 22/24: libxcrypt: upgrade 4.4.10 -> 4.4.12 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234236.32DA5232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e977782a3244642b9b312137a4843efc358d4614 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:03 2020 -0800 libxcrypt: upgrade 4.4.10 -> 4.4.12 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index accbdd6..59744c0 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" +SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:57 +0000 Subject: [oe-commits] [openembedded-core] 23/24: libcheck: upgrade 0.13.0 -> 0.14.0 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234236.3EC5E232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8bd59f7bcade950476c1388620fd808629424d21 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:04 2020 -0800 libcheck: upgrade 0.13.0 -> 0.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcheck/libcheck_0.13.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb similarity index 83% rename from meta/recipes-support/libcheck/libcheck_0.13.0.bb rename to meta/recipes-support/libcheck/libcheck_0.14.0.bb index 226417f..a88f009 100644 --- a/meta/recipes-support/libcheck/libcheck_0.13.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "2c730c40b08482eaeb10132517970593" -SRC_URI[sha256sum] = "c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 13 23:42:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 13 Feb 2020 23:42:58 +0000 Subject: [oe-commits] [openembedded-core] 24/24: librepo: upgrade 1.11.1 -> 1.11.2 In-Reply-To: <158163735409.11302.13146267630062385739@git.openembedded.org> References: <158163735409.11302.13146267630062385739@git.openembedded.org> Message-ID: <20200213234236.49B6F232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a47bcdfa7e169827c4288a6cf4687d414d5cb496 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:05 2020 -0800 librepo: upgrade 1.11.1 -> 1.11.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/librepo/librepo_1.11.1.bb b/meta/recipes-devtools/librepo/librepo_1.11.2.bb similarity index 93% rename from meta/recipes-devtools/librepo/librepo_1.11.1.bb rename to meta/recipes-devtools/librepo/librepo_1.11.2.bb index dbf1016..6a0a59f 100644 --- a/meta/recipes-devtools/librepo/librepo_1.11.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.11.2.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff" +SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 08:31:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 08:31:27 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (a47bcdf -> 84430df) Message-ID: <158166908787.19137.12517774287577968289@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard a47bcdf librepo: upgrade 1.11.1 -> 1.11.2 discard 8bd59f7 libcheck: upgrade 0.13.0 -> 0.14.0 discard e977782 libxcrypt: upgrade 4.4.10 -> 4.4.12 discard 82fca74 libtasn1: upgrade 4.15.0 -> 4.16.0 discard dd9048d xkeyboard-config: upgrade 2.28 -> 2.29 new 83488ee libtasn1: upgrade 4.15.0 -> 4.16.0 new bd44823 libxcrypt: upgrade 4.4.10 -> 4.4.12 new c000f49 libcheck: upgrade 0.13.0 -> 0.14.0 new 363aafc librepo: upgrade 1.11.1 -> 1.11.2 new 84430df diffoscope: fixup This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a47bcdf) \ N -- N -- N refs/heads/master-next (84430df) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../xorg-lib/{xkeyboard-config_2.29.bb => xkeyboard-config_2.28.bb} | 4 ++-- meta/recipes-support/diffoscope/diffoscope_136.bb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.29.bb => xkeyboard-config_2.28.bb} (87%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 08:31:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 08:31:29 +0000 Subject: [oe-commits] [openembedded-core] 02/05: libxcrypt: upgrade 4.4.10 -> 4.4.12 In-Reply-To: <158166908787.19137.12517774287577968289@git.openembedded.org> References: <158166908787.19137.12517774287577968289@git.openembedded.org> Message-ID: <20200214083128.2AA7C232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bd448236dc65d6bc5091aaf96a25cdbc91eab73a Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:03 2020 -0800 libxcrypt: upgrade 4.4.10 -> 4.4.12 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index accbdd6..59744c0 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" +SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 08:31:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 08:31:30 +0000 Subject: [oe-commits] [openembedded-core] 03/05: libcheck: upgrade 0.13.0 -> 0.14.0 In-Reply-To: <158166908787.19137.12517774287577968289@git.openembedded.org> References: <158166908787.19137.12517774287577968289@git.openembedded.org> Message-ID: <20200214083128.35C68232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c000f494ca99243255616f54165b57ba753e55d2 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:04 2020 -0800 libcheck: upgrade 0.13.0 -> 0.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcheck/libcheck_0.13.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb similarity index 83% rename from meta/recipes-support/libcheck/libcheck_0.13.0.bb rename to meta/recipes-support/libcheck/libcheck_0.14.0.bb index 226417f..a88f009 100644 --- a/meta/recipes-support/libcheck/libcheck_0.13.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "2c730c40b08482eaeb10132517970593" -SRC_URI[sha256sum] = "c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 08:31:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 08:31:28 +0000 Subject: [oe-commits] [openembedded-core] 01/05: libtasn1: upgrade 4.15.0 -> 4.16.0 In-Reply-To: <158166908787.19137.12517774287577968289@git.openembedded.org> References: <158166908787.19137.12517774287577968289@git.openembedded.org> Message-ID: <20200214083128.205AF232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 83488ee7c717b91c9efadc011def15ac6f4f0a0f Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:02 2020 -0800 libtasn1: upgrade 4.15.0 -> 4.16.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb similarity index 83% rename from meta/recipes-support/gnutls/libtasn1_4.15.0.bb rename to meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 115c98a..8337b70 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" -SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 08:31:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 08:31:31 +0000 Subject: [oe-commits] [openembedded-core] 04/05: librepo: upgrade 1.11.1 -> 1.11.2 In-Reply-To: <158166908787.19137.12517774287577968289@git.openembedded.org> References: <158166908787.19137.12517774287577968289@git.openembedded.org> Message-ID: <20200214083128.3FBBC232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 363aafca6ff86798980a81442d56a75be75582d1 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:05 2020 -0800 librepo: upgrade 1.11.1 -> 1.11.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/librepo/librepo_1.11.1.bb b/meta/recipes-devtools/librepo/librepo_1.11.2.bb similarity index 93% rename from meta/recipes-devtools/librepo/librepo_1.11.1.bb rename to meta/recipes-devtools/librepo/librepo_1.11.2.bb index dbf1016..6a0a59f 100644 --- a/meta/recipes-devtools/librepo/librepo_1.11.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.11.2.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff" +SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 08:31:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 08:31:32 +0000 Subject: [oe-commits] [openembedded-core] 05/05: diffoscope: fixup In-Reply-To: <158166908787.19137.12517774287577968289@git.openembedded.org> References: <158166908787.19137.12517774287577968289@git.openembedded.org> Message-ID: <20200214083128.4CB0D232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 84430dfc349a947aca800c1dac669551f5d4fc53 Author: Richard Purdie AuthorDate: Fri Feb 14 08:25:18 2020 +0000 diffoscope: fixup Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_136.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb index a00f281..3e3e1df 100644 --- a/meta/recipes-support/diffoscope/diffoscope_136.bb +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -12,4 +12,7 @@ SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7 RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" +# Dependencies don't build for musl +COMPATIBLE_HOST_libc-musl = 'null' + BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:35 +0000 Subject: [oe-commits] [openembedded-core] 01/26: qemuarm: Disable highmem when QB_MACHINE is virt In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131934.DA3FA232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4486f4523f6671841ffa65ce2419b9e3e018ad76 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:50 2020 -0800 qemuarm: Disable highmem when QB_MACHINE is virt running ptests on qemuarm returns fails since it finds errors in kernel logs like below *********************** Central error: [ 4.338465] pci-host-generic 4010000000.pcie: ECAM ioremap failed *********************** Since its a 32bit kernel 4010000000 address is truncated to 10000000 and ends up in conflicts with VIRT_PCIE_MMIO, which ranges from 0x10000000 to 0x3efeffff This is happening because the linux-yocto kernel is not compiled with LPAE support, however, virt machine for qemuarm assumes that by default Should LPAE be enabled by default in kernel config is a separate question Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 26f40b1..367fcef 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MACHINE = "-machine virt" +QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:36 +0000 Subject: [oe-commits] [openembedded-core] 02/26: oeqa: Use --disable-maintainer-mode configure option In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131934.E52B3232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3dc4e27e7633ce3ca6b9647810d0996bdee48771 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:51 2020 -0800 oeqa: Use --disable-maintainer-mode configure option since the versions of autotools might differ on target and build host, plus difference in timestamps for configure and system can result in reconfigure lets avoid that by disabling maintainer mode Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd..d0f9166 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb..902e93f 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:34 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (ef24a54 -> 7331062) Message-ID: <158168637447.9942.10365662971022640100@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from ef24a54 package_ipk: Minor import tweak + ensure packages regenerated new 4486f45 qemuarm: Disable highmem when QB_MACHINE is virt new 3dc4e27 oeqa: Use --disable-maintainer-mode configure option new 8b6c22a ltp: Fix tescases with 64bit time_t using 32bit arches new aec9f9b crosssdk: Set nativesdk specific distro features new 5ee10b1 binutils: Bail out if gold is used on 32/64 bit RISC-V new e742e5f iputils: Fix systemd and ipv6 detection new 8cd1150 icecc.bbclass: replace superfluous "+=" with "=" new b01505e ppp: Security fix CVE-2020-8597 new c127e7a wayland: upgrade 1.17.0 -> 1.18.0 new 288becd python: Add libarchive-c recipe new 64560fc python: Add magic recipe new c92cf36 recipes-support: Add diffoscope recipe new 085b0a3 diffoscope: Exclude from musl builds new 6e1d5e8 oeqa: reproducible: Run diffoscope on saved output new 991d7ce python3: install _tkinter.*.so to python3-tkinter package new 74ffa77 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 new 9e4a91b kernel-fitimage: fix devicetree reproducibility new d075e39 devicetree.bbclass: include symbols in base DT new c48e2f4 mtdev: upgrade 1.1.5 -> 1.1.6 new 227bace binutils: additional patch should be added with space. new ca276b7 qemu: Upgrade to 4.2.0 new 19711ad sudo: upgrade 1.8.30 -> 1.8.31 new 320b62f libtasn1: upgrade 4.15.0 -> 4.16.0 new b76b8fb libxcrypt: upgrade 4.4.10 -> 4.4.12 new 4b9387f libcheck: upgrade 0.13.0 -> 0.14.0 new 7331062 librepo: upgrade 1.11.1 -> 1.11.2 The 26 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/crosssdk.bbclass | 6 + meta/classes/devicetree.bbclass | 2 +- meta/classes/icecc.bbclass | 2 +- meta/classes/kernel-fitimage.bbclass | 2 +- meta/conf/distro/include/maintainers.inc | 3 + meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/reproducible.py | 24 ++- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + ...compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 7 + meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- .../{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- .../python/python3-libarchive-c_2.9.bb | 17 +++ .../python/python3-magic_0.4.15.bb | 19 +++ .../python/python3/python3-manifest.json | 1 + meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 +-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 +- ...fix-regression-in-parsing-vga-cmdline-par.patch | 54 +++++++ ...0011-linux-user-remove-host-stime-syscall.patch | 61 -------- ...2-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 -------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 ...infod-fix-systemd-Documentation-url-error.patch | 28 ++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 ++++++ meta/recipes-extended/iputils/iputils_s20190709.bb | 23 ++- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 81 ++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + meta/recipes-extended/sudo/sudo.inc | 2 +- .../sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 +- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- meta/recipes-support/diffoscope/diffoscope_136.bb | 18 +++ .../{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 +- .../{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 +- 57 files changed, 440 insertions(+), 561 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} (100%) rename meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} (93%) create mode 100644 meta/recipes-devtools/python/python3-libarchive-c_2.9.bb create mode 100644 meta/recipes-devtools/python/python3-magic_0.4.15.bb rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0012-fix-libcap-header-issue-on-some-distro.patch} (100%) rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) create mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch create mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch rename meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} (92%) delete mode 100644 meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch rename meta/recipes-graphics/wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} (65%) delete mode 100644 meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch rename meta/recipes-graphics/wayland/{wayland_1.17.0.bb => wayland_1.18.0.bb} (84%) create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb rename meta/recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} (83%) rename meta/recipes-support/libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} (83%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:38 +0000 Subject: [oe-commits] [openembedded-core] 04/26: crosssdk: Set nativesdk specific distro features In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.0C76F232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit aec9f9bd9549938a6ed42e9879f3a2fdcc89463d Author: Khem Raj AuthorDate: Thu Feb 13 00:21:58 2020 -0800 crosssdk: Set nativesdk specific distro features Currently, normal distro features e.g. ld-is-gold is impacting crosssdk recipes, which actually should not be the case, since that feature is essentially intended for target packages and not nativesdk packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index c718a09..04aecb6 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -5,9 +5,15 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" + python () { # set TUNE_PKGARCH to SDK_ARCH d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # Set features here to prevent appends and distro features backfill + # from modifying nativesdk distro features + features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split()) + filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).split()) + d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered))) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:37 +0000 Subject: [oe-commits] [openembedded-core] 03/26: ltp: Fix tescases with 64bit time_t using 32bit arches In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131934.F21A9232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8b6c22a0dc61579d112161fd49da855a678cc58b Author: Khem Raj AuthorDate: Thu Feb 13 00:21:57 2020 -0800 ltp: Fix tescases with 64bit time_t using 32bit arches This helps it compile on musl Fixes | tst_clocks.c:31:17: error: 'SYS_clock_getres' undeclared (first use in this function); did you mean 'tst_clock_getres Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 81 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 2 files changed, 82 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch new file mode 100644 index 0000000..92e5fdf --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -0,0 +1,81 @@ +From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Feb 2020 22:22:17 -0800 +Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them + +musl is using 64bit time_t now on 32bit architectures and these syscalls +no longer exist, therefore its better to check for them being available +before using them + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Signed-off-by: Khem Raj +--- + lib/tst_clocks.c | 9 +++++++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ + 3 files changed, 17 insertions(+) + +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 35798a4aaf..6a5b05c4ea 100644 +--- a/lib/tst_clocks.c ++++ b/lib/tst_clocks.c +@@ -28,15 +28,24 @@ + + int tst_clock_getres(clockid_t clk_id, struct timespec *res) + { ++#if defined(__NR_clock_getres) + return syscall(SYS_clock_getres, clk_id, res); ++#endif ++ return -1; + } + + int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + return syscall(SYS_clock_gettime, clk_id, ts); ++#endif ++ return -1; + } + + int tst_clock_settime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_settime) + return syscall(SYS_clock_settime, clk_id, ts); ++#endif ++ return -1; + } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9b..b498de5b68 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +@@ -41,7 +41,11 @@ + #include + #include + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + char *TCID = "gettimeofday01"; + int TST_TOTAL = 1; +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e8..218e017df8 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +@@ -23,7 +23,11 @@ + + #include "tst_test.h" + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + static volatile sig_atomic_t done; + static char *str_rtime; +-- +2.25.0 + diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20190930.bb index 2853b1c..19bd7bc 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20190930.bb @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ + file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:39 +0000 Subject: [oe-commits] [openembedded-core] 05/26: binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.18307232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5ee10b10b3316a368cea73df470befd587ef1cd0 Author: Khem Raj AuthorDate: Thu Feb 13 00:21:59 2020 -0800 binutils: Bail out if gold is used on 32/64 bit RISC-V gold is not supporting risc-v yet and, this will cause subltle errors during build e.g. autoconf not finding certain features like visibility and it could take a while to unwind the problem. Its better to error out early Remove dwp and ld.gold for rv32 as well Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 0fb6cae..a4b9aa5 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -40,6 +40,7 @@ FILES_${PN}-dev = " \ LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS_riscv64 = "" +LDGOLD_ALTS_riscv32 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -83,6 +84,7 @@ LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" @@ -163,3 +165,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:41 +0000 Subject: [oe-commits] [openembedded-core] 07/26: icecc.bbclass: replace superfluous "+=" with "=" In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.2D4B0232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8cd1150a813ba7aa395f3f62c6b91a3561e81c92 Author: Robert P. J. Day AuthorDate: Thu Feb 13 08:21:57 2020 -0500 icecc.bbclass: replace superfluous "+=" with "=" Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index bc3d6f4..d095305 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend += "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@icecc_dep_prepend(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:44 +0000 Subject: [oe-commits] [openembedded-core] 10/26: python: Add libarchive-c recipe In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.49552232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 288becda36dcc9f5435ec00258c0d0594e0011c1 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:32 2020 -0600 python: Add libarchive-c recipe The libarchive python module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + .../recipes-devtools/python/python3-libarchive-c_2.9.bb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c68e9ed..abbdb74 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -579,6 +579,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.233E6232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e742e5f711d46b1664cc5bec2f788dc0e020ccaa Author: Alex Kiernan AuthorDate: Thu Feb 13 10:00:29 2020 +0000 iputils: Fix systemd and ipv6 detection When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...infod-fix-systemd-Documentation-url-error.patch | 28 +++++++++++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 ++++++++++++++++++++++ meta/recipes-extended/iputils/iputils_s20190709.bb | 23 ++++++++--- 3 files changed, 91 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 0000000..03a3f56 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-off-by: Alex Kiernan +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 0000000..d7367ca --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 13 Feb 2020 06:08:45 +0000 +Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers + +Neither rarpd nor rdisc can gain the necessary capabilities with +PrivateUsers enabled. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + systemd/rarpd.service.in | 1 - + systemd/rdisc.service.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in +index 4e2a1ec9d0e5..a71b87d36b37 100644 +--- a/systemd/rdisc.service.in ++++ b/systemd/rdisc.service.in +@@ -8,9 +8,10 @@ After=network.target + EnvironmentFile=-/etc/sysconfig/rdisc + ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS + ++CapabilityBoundingSet=CAP_NET_RAW + AmbientCapabilities=CAP_NET_RAW + PrivateTmp=yes +-PrivateUsers=yes ++DynamicUser=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae1..2aed6b5 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -12,6 +12,8 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ + file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" @@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:45 +0000 Subject: [oe-commits] [openembedded-core] 11/26: python: Add magic recipe In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.52DCC232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 64560fcbe7c9658fcca86010502d00998d88f418 Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:33 2020 -0600 python: Add magic recipe The python-magic module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/python/python3-magic_0.4.15.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index abbdb74..171a436 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -580,6 +580,7 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.35870232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b01505e018ff46f1af34f98219d55f4ca700cd5a Author: Yi Zhao AuthorDate: Thu Feb 13 16:55:01 2020 +0800 ppp: Security fix CVE-2020-8597 CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000..b7ba7ba --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4..60c56dd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:46 +0000 Subject: [oe-commits] [openembedded-core] 12/26: recipes-support: Add diffoscope recipe In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.5C4CE232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c92cf366c301a98ff1546d80d6c3a138f952252a Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:34 2020 -0600 recipes-support: Add diffoscope recipe Diffoscope is the universal diff tool, capable of comparing many different formats. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 171a436..4a267fa 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi " RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb new file mode 100644 index 0000000..a00f281 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -0,0 +1,15 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:47 +0000 Subject: [oe-commits] [openembedded-core] 13/26: diffoscope: Exclude from musl builds In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.64E31232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 085b0a3337e04e14e0d922a9028a7748dc81c4d0 Author: Richard Purdie AuthorDate: Fri Feb 14 08:25:18 2020 +0000 diffoscope: Exclude from musl builds Various dependencies don't build for musl so exclude this recipe too, at least for now until the issues are resolved to avoid build failures in world builds. Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_136.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb index a00f281..3e3e1df 100644 --- a/meta/recipes-support/diffoscope/diffoscope_136.bb +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -12,4 +12,7 @@ SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7 RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" +# Dependencies don't build for musl +COMPATIBLE_HOST_libc-musl = 'null' + BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:43 +0000 Subject: [oe-commits] [openembedded-core] 09/26: wayland: upgrade 1.17.0 -> 1.18.0 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.3F777232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c127e7ac7c6da11417a599384002fd7c1420c7c2 Author: Denys Dmytriyenko AuthorDate: Thu Feb 13 01:23:44 2020 -0500 wayland: upgrade 1.17.0 -> 1.18.0 This is the official release for Wayland 1.18. The main new features in this release are: - Add support for the Meson build system (autotools is still supported but will be removed in a future release) - Add API to tag proxy objects to allow applications and toolkits to share the same Wayland connection - Track wayland-server timers in user-space to prevent creating too many FDs - Add wl_global_remove, a new function to mitigate race conditions with globals https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html 2 upstreamed patches are dropped. Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- 3 files changed, 3 insertions(+), 221 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch deleted file mode 100644 index c443587..0000000 --- a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Fri, 25 Oct 2019 21:03:23 -0500 -Subject: [PATCH] scanner: Add configure check for strndup - -Some platforms may not have strndup() (e.g. MinGW), so provide a -equivalent implementation if it's not found. - -Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571] -Signed-off-by: Joshua Watt ---- - configure.ac | 2 +- - src/scanner.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d56f2b..1c99e21 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ fi - AC_SUBST(GCC_CFLAGS) - - AC_CHECK_HEADERS([sys/prctl.h]) --AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) -+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup]) - - AC_ARG_ENABLE([libraries], - [AC_HELP_STRING([--disable-libraries], -diff --git a/src/scanner.c b/src/scanner.c -index a94be5d..27004bc 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx, - - } - -+#ifndef HAVE_STRNDUP -+char * -+strndup(const char *s, size_t size) -+{ -+ char *r = malloc(size + 1); -+ strncpy(r, s, size); -+ r[size] = '\0'; -+ return r; -+} -+#endif -+ - static void - end_element(void *data, const XML_Char *name) - { diff --git a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch b/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch deleted file mode 100644 index b05b875..0000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch +++ /dev/null @@ -1,166 +0,0 @@ -From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Tue, 5 Nov 2019 09:09:50 -0600 -Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h - -Including wayland-server-core.h in wayland-private.h is problematic -because wayland-private.h is included by wayland-scanner which should be -able to build against non-POSIX platforms (e.g. MinGW). The only reason -that wayland-server-core.h was included in wayland-private.h was for the -wl_private_signal definitions, so move those to a -wayland-server-private.h file that can be included by both -wayland-server.c and the tests. - -Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc] -Signed-off-by: Joshua Watt ---- - Makefile.am | 3 +- - src/wayland-private.h | 22 +-------------- - src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++ - src/wayland-server.c | 1 + - tests/newsignal-test.c | 2 +- - 5 files changed, 58 insertions(+), 23 deletions(-) - create mode 100644 src/wayland-server-private.h - -diff --git a/Makefile.am b/Makefile.am -index f47d055..026d981 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \ - src/connection.c \ - src/wayland-os.c \ - src/wayland-os.h \ -- src/wayland-private.h -+ src/wayland-private.h \ -+ src/wayland-server-private.h - - include_HEADERS = \ - src/wayland-util.h \ -diff --git a/src/wayland-private.h b/src/wayland-private.h -index 29516ec..dc7d12f 100644 ---- a/src/wayland-private.h -+++ b/src/wayland-private.h -@@ -31,11 +31,11 @@ - #include - #include - #include -+#include - - #define WL_HIDE_DEPRECATED 1 - - #include "wayland-util.h" --#include "wayland-server-core.h" - - /* Invalid memory address */ - #define WL_ARRAY_POISON_PTR (void *) 4 -@@ -236,26 +236,6 @@ zalloc(size_t s) - return calloc(1, s); - } - --struct wl_priv_signal { -- struct wl_list listener_list; -- struct wl_list emit_list; --}; -- --void --wl_priv_signal_init(struct wl_priv_signal *signal); -- --void --wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -- --struct wl_listener * --wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -- --void --wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -- --void --wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -- - void - wl_connection_close_fds_in(struct wl_connection *connection, int max); - -diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h -new file mode 100644 -index 0000000..23fa458 ---- /dev/null -+++ b/src/wayland-server-private.h -@@ -0,0 +1,53 @@ -+/* -+ * Copyright ? 2008-2011 Kristian H?gsberg -+ * Copyright ? 2011 Intel Corporation -+ * Copyright ? 2013 Jason Ekstrand -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef WAYLAND_SERVER_PRIVATE_H -+#define WAYLAND_SERVER_PRIVATE_H -+ -+#include "wayland-server-core.h" -+ -+struct wl_priv_signal { -+ struct wl_list listener_list; -+ struct wl_list emit_list; -+}; -+ -+void -+wl_priv_signal_init(struct wl_priv_signal *signal); -+ -+void -+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -+ -+struct wl_listener * -+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -+ -+void -+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -+ -+void -+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -+ -+#endif -diff --git a/src/wayland-server.c b/src/wayland-server.c -index 19f6a76..d6f0206 100644 ---- a/src/wayland-server.c -+++ b/src/wayland-server.c -@@ -45,6 +45,7 @@ - - #include "wayland-util.h" - #include "wayland-private.h" -+#include "wayland-server-private.h" - #include "wayland-server.h" - #include "wayland-os.h" - -diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c -index 47c429b..f3a7bd9 100644 ---- a/tests/newsignal-test.c -+++ b/tests/newsignal-test.c -@@ -26,7 +26,7 @@ - #include - - #include "test-runner.h" --#include "wayland-private.h" -+#include "wayland-server-private.h" - - static void - signal_notify(struct wl_listener *listener, void *data) diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb similarity index 84% rename from meta/recipes-graphics/wayland/wayland_1.17.0.bb rename to meta/recipes-graphics/wayland/wayland_1.18.0.bb index 12916a0..7a3f075 100644 --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ - file://0001-scanner-Add-configure-check-for-strndup.patch \ - file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \ + file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" -SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" +SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" +SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:49 +0000 Subject: [oe-commits] [openembedded-core] 15/26: python3: install _tkinter.*.so to python3-tkinter package In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.7D53C232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 991d7ced7262a1340878bada307c6d021ea9cb77 Author: Yi Zhao AuthorDate: Wed Feb 12 14:24:40 2020 +0800 python3: install _tkinter.*.so to python3-tkinter package When enable PACKAGECONFIG[tk], we should install _tkinter.*.so to python3-tkinter package rather than python3-misc package. Fixes: ERROR: python3-3.8.1-r0 do_package_qa: QA Issue: /usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so contained in package python3-misc requires libtk8.6.so()(64bit), but no providers found in RDEPENDS_python3-misc? [file-rdeps] Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3/python3-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index cbfa8d5..251271c 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -1127,6 +1127,7 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so", "${libdir}/python${PYTHON_MAJMIN}/tkinter" ], "cached": [] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:48 +0000 Subject: [oe-commits] [openembedded-core] 14/26: oeqa: reproducible: Run diffoscope on saved output In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.719C8232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6e1d5e8b58f0940ba6dfd99536159dd974e6f24c Author: Joshua Watt AuthorDate: Tue Feb 11 21:14:35 2020 -0600 oeqa: reproducible: Run diffoscope on saved output If there are differing packages and they are being saved for review, automatically run diffoscope on them and include the output in the saved output. The output is currently done in HTML format since these are typically published on a webpage by the autobuilder. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index f6433c9..d3fd8c3 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: MIT # -# Copyright 2019 by Garmin Ltd. or its subsidiaries +# Copyright 2019-2020 by Garmin Ltd. or its subsidiaries from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars @@ -167,10 +167,16 @@ class ReproducibleTests(OESelftestTestCase): return d def test_reproducible_builds(self): + def strip_topdir(s): + if s.startswith(self.topdir): + return s[len(self.topdir):] + return s + # Build native utilities self.write_config('') - bitbake("diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -206,18 +212,22 @@ class ReproducibleTests(OESelftestTestCase): if self.save_results: for d in result.different: - self.copy_file(d.reference, '/'.join([save_dir, d.reference])) - self.copy_file(d.test, '/'.join([save_dir, d.test])) + self.copy_file(d.reference, '/'.join([save_dir, 'packages', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages', strip_topdir(d.test)])) if result.missing or result.different: fails.append("The following %s packages are missing or different: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) - if fails: - self.fail('\n'.join(fails)) - # Clean up empty directories if self.save_results: if not os.listdir(save_dir): os.rmdir(save_dir) + else: + self.logger.info('Running diffoscope') + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + + if fails: + self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:50 +0000 Subject: [oe-commits] [openembedded-core] 16/26: linux-yocto-dev: Add paravirt_kvm support for qemux86-64 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.88E0F232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 74ffa7730e194e7b5dc71e63939b4a4a9843be93 Author: He Zhe AuthorDate: Wed Feb 12 15:35:57 2020 +0800 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 This feature includes paravirtualized KVM guest support, including KVMCLOCK for enhancing clock accuracy of guest OS. With it we can prevent the following error. "clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large" Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index afda849..c364a97 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -48,7 +48,7 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/ta KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_VERSION_SANITY_SKIP = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:54 +0000 Subject: [oe-commits] [openembedded-core] 20/26: binutils: additional patch should be added with space. In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.B57C5232A66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 227bacec59501b6ef0aca50c62ad1f4acd167b5d Author: Jeremy Puhlman AuthorDate: Mon Feb 10 13:29:26 2020 -0800 binutils: additional patch should be added with space. If an append adds a patch or file with SRC_URI += , the spaceless append causes the file listings to concatinate and cause failures in the nativesdk-binutils parse/build. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.33.bb index ecdab96..8bd2bf7 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.33.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = "file://nativesdk-relocation.patch" +SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:58 +0000 Subject: [oe-commits] [openembedded-core] 24/26: libxcrypt: upgrade 4.4.10 -> 4.4.12 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.EA53C232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b76b8fb11d4e9019072c89668acdecbeb1824699 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:03 2020 -0800 libxcrypt: upgrade 4.4.10 -> 4.4.12 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index accbdd6..59744c0 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" +SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:57 +0000 Subject: [oe-commits] [openembedded-core] 23/26: libtasn1: upgrade 4.15.0 -> 4.16.0 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.DD0EE232A69@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 320b62f12334684f1261b06e3e7bc8106e3b9490 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:02 2020 -0800 libtasn1: upgrade 4.15.0 -> 4.16.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb similarity index 83% rename from meta/recipes-support/gnutls/libtasn1_4.15.0.bb rename to meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 115c98a..8337b70 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" -SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:53 +0000 Subject: [oe-commits] [openembedded-core] 19/26: mtdev: upgrade 1.1.5 -> 1.1.6 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.AB16C232A65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c48e2f4e93a5aae1c4dec1511297c88f494bcc5d Author: Pierre-Jean Texier via Openembedded-core AuthorDate: Mon Feb 10 22:25:59 2020 +0100 mtdev: upgrade 1.1.5 -> 1.1.6 Also remove patch which have been merged upstream Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------------------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +-- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index a0cebe5..0000000 --- a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,77 +0,0 @@ -From af75e8ee3d12a493b758421b2feed0351fdcbbf0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 23 Nov 2019 13:44:32 -0800 -Subject: [PATCH] adjust for 64bit time_t for 32bit architectures - -libc that has support for 32 bit applications to use 64 bit -time_t supplies __USE_TIME_BITS64 define [1] - -[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/core.c | 8 +++++++- - test/mtdev-test.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/core.c b/src/core.c -index 87ef420..0d91c0b 100644 ---- a/src/core.c -+++ b/src/core.c -@@ -31,6 +31,11 @@ - #include "evbuf.h" - #include "match.h" - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - static inline int istouch(const struct mtdev_slot *data, - const struct mtdev *dev) - { -@@ -251,7 +256,8 @@ static void push_slot_changes(struct mtdev_state *state, - count++; - if (!count) - return; -- ev.time = syn->time; -+ ev.input_event_sec = syn->input_event_sec; -+ ev.input_event_usec = syn->input_event_usec; - ev.type = EV_ABS; - ev.code = ABS_MT_SLOT; - ev.value = slot; -diff --git a/test/mtdev-test.c b/test/mtdev-test.c -index 1b3e4f2..773f86a 100644 ---- a/test/mtdev-test.c -+++ b/test/mtdev-test.c -@@ -30,9 +30,15 @@ - #include - #include - #include -+#include -+ -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - /* year-proof millisecond event time */ --typedef __u64 mstime_t; -+typedef uint64_t mstime_t; - - static int use_event(const struct input_event *ev) - { -@@ -47,7 +53,7 @@ static void print_event(const struct input_event *ev) - { - static const mstime_t ms = 1000; - static int slot; -- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; -+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; - if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) - slot = ev->value; - fprintf(stderr, "%012llx %02d %01d %04x %d\n", --- -2.24.0 - diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb similarity index 65% rename from meta/recipes-graphics/wayland/mtdev_1.1.5.bb rename to meta/recipes-graphics/wayland/mtdev_1.1.6.bb index aa8bb69..7c1cb5e 100644 --- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb +++ b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb @@ -11,10 +11,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ -" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" +SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:55 +0000 Subject: [oe-commits] [openembedded-core] 21/26: qemu: Upgrade to 4.2.0 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.C36AD232A67@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ca276b77904429a1ff3188d2373535a462afe266 Author: Alistair Francis AuthorDate: Mon Feb 10 13:25:15 2020 -0800 qemu: Upgrade to 4.2.0 While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- .../{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...native_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...001-qemu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...age-ptest-which-runs-all-unit-test-cases-.patch | 6 +- ...dition-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...-set-ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...ardev-connect-socket-to-a-spawned-command.patch | 14 +-- .../qemu/0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +-- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++-- ...ure-Add-pkg-config-handling-for-libgcrypt.patch | 14 ++- ...fix-regression-in-parsing-vga-cmdline-par.patch | 54 +++++++++++ ...0011-linux-user-remove-host-stime-syscall.patch | 61 ------------ ...2-fix-libcap-header-issue-on-some-distro.patch} | 0 ...rror-messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 --------------------- .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 21 files changed, 108 insertions(+), 228 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5a..23f2ce9 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43..28cfd2c 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0012-fix-libcap-header-issue-on-some-distro.patch \ + file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060..a557e74 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ + file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102..66ff996 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd5..7f7da51 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68..012d60d 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab4..bc30397 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a736815..ec30337 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a423855..0810ae8 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2..89baad9 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25..30bb4dd 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d94..7e273ee 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7da..34df78b 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch new file mode 100644 index 0000000..2fe0850 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch @@ -0,0 +1,54 @@ +From a88c40f02ace88f09b2a85a64831b277b2ebc88c Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Sat, 21 Dec 2019 17:21:24 +0100 +Subject: [PATCH] hw/i386/pc: fix regression in parsing vga cmdline parameter + +When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0 +would refuse to start with a rather cryptic message: + + $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet' + qemu: can't parse 'vga' parameter: Invalid argument + +It was not clear whether this applied to the '-vga std' parameter or the +'-append' one. Fix the parsing regression and clarify the error. + +Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()") +Cc: Sergio Lopez +Signed-off-by: Peter Wu +Message-Id: <20191221162124.1159291-1-peter at lekensteyn.nl> +Cc: qemu-stable at nongnu.org +Signed-off-by: Paolo Bonzini +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c] +--- + hw/i386/x86.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/i386/x86.c b/hw/i386/x86.c +index d8bb5c2a96..9b9a4d5837 100644 +--- a/hw/i386/x86.c ++++ b/hw/i386/x86.c +@@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, + vmode = strstr(kernel_cmdline, "vga="); + if (vmode) { + unsigned int video_mode; ++ const char *end; + int ret; + /* skip "vga=" */ + vmode += 4; +@@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, + } else if (!strncmp(vmode, "ask", 3)) { + video_mode = 0xfffd; + } else { +- ret = qemu_strtoui(vmode, NULL, 0, &video_mode); +- if (ret != 0) { +- fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", +- strerror(-ret)); ++ ret = qemu_strtoui(vmode, &end, 0, &video_mode); ++ if (ret != 0 || (*end && *end != ' ')) { ++ fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); + exit(1); + } + } +-- +2.25.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be..0000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e4..0000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:51 +0000 Subject: [oe-commits] [openembedded-core] 17/26: kernel-fitimage: fix devicetree reproducibility In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.95CA4232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9e4a91b63dd8e0c1708da2ac7de461b35fb0b011 Author: Alex Kiernan AuthorDate: Wed Feb 12 11:33:36 2020 +0000 kernel-fitimage: fix devicetree reproducibility Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/kernel-fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index d1b8cdc..72b05ff 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,7 +391,7 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:52 +0000 Subject: [oe-commits] [openembedded-core] 18/26: devicetree.bbclass: include symbols in base DT In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.9FDB9232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d075e39c05ace6dad2c66a5e8c4b1e75aa751b6a Author: Alex Kiernan AuthorDate: Wed Feb 12 10:35:26 2020 +0000 devicetree.bbclass: include symbols in base DT When processing overlays, the base device tree must be compiled with symbols, otherwise attempting to apply overlays in U-Boot will fail with: failed on fdt_overlay_apply(): FDT_ERR_NOTFOUND base fdt does did not have a /__symbols__ node make sure you've compiled with -@ Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/devicetree.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass index d8779c7..c772ab2 100644 --- a/meta/classes/devicetree.bbclass +++ b/meta/classes/devicetree.bbclass @@ -59,7 +59,7 @@ DT_BOOT_CPU ??= "0" DTC_FLAGS ?= "-R ${DT_RESERVED_MAP} -b ${DT_BOOT_CPU}" DTC_PPFLAGS ?= "-nostdinc -undef -D__DTS__ -x assembler-with-cpp" -DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE}" +DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE} -@" DTC_OFLAGS ?= "-p 0 -@ -H epapr" python () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:56 +0000 Subject: [oe-commits] [openembedded-core] 22/26: sudo: upgrade 1.8.30 -> 1.8.31 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131935.CFFB5232A68@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 19711adc45cf57fc007a7d1e052726fd45157f98 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:00 2020 -0800 sudo: upgrade 1.8.30 -> 1.8.31 -License-Update: Copyright year updated from 1998-2019 to 1998-2020. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 3b314dd..5d27d46 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.31.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.30.bb rename to meta/recipes-extended/sudo/sudo_1.8.31.bb index 9d014d2..39d8817 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.31.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" -SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" +SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de" +SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:19:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:19:59 +0000 Subject: [oe-commits] [openembedded-core] 25/26: libcheck: upgrade 0.13.0 -> 0.14.0 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131936.01BE9232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4b9387f15c59699b1cd56d64066be01d01f4f51b Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:04 2020 -0800 libcheck: upgrade 0.13.0 -> 0.14.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcheck/libcheck_0.13.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb similarity index 83% rename from meta/recipes-support/libcheck/libcheck_0.13.0.bb rename to meta/recipes-support/libcheck/libcheck_0.14.0.bb index 226417f..a88f009 100644 --- a/meta/recipes-support/libcheck/libcheck_0.13.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "2c730c40b08482eaeb10132517970593" -SRC_URI[sha256sum] = "c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:00 +0000 Subject: [oe-commits] [openembedded-core] 26/26: librepo: upgrade 1.11.1 -> 1.11.2 In-Reply-To: <158168637447.9942.10365662971022640100@git.openembedded.org> References: <158168637447.9942.10365662971022640100@git.openembedded.org> Message-ID: <20200214131936.0E618232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7331062f82d3fa9d9ac69efc2e3cb05a6f120239 Author: Wang Mingyu AuthorDate: Mon Feb 10 09:38:05 2020 -0800 librepo: upgrade 1.11.1 -> 1.11.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/librepo/librepo_1.11.1.bb b/meta/recipes-devtools/librepo/librepo_1.11.2.bb similarity index 93% rename from meta/recipes-devtools/librepo/librepo_1.11.1.bb rename to meta/recipes-devtools/librepo/librepo_1.11.2.bb index dbf1016..6a0a59f 100644 --- a/meta/recipes-devtools/librepo/librepo_1.11.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.11.2.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff" +SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:19 +0000 Subject: [oe-commits] [openembedded-core] 01/19: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132018.B2737232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4b801a7f6d4062809bbb56ad4916ba64bec78087 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:18 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (84430df -> 9f0fe9d) Message-ID: <158168641826.11054.14184941531592659430@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 84430df diffoscope: fixup discard 363aafc librepo: upgrade 1.11.1 -> 1.11.2 discard c000f49 libcheck: upgrade 0.13.0 -> 0.14.0 discard bd44823 libxcrypt: upgrade 4.4.10 -> 4.4.12 discard 83488ee libtasn1: upgrade 4.15.0 -> 4.16.0 discard 230b33b sudo: upgrade 1.8.30 -> 1.8.31 discard 0f65036 qemu: Upgrade to 4.2.0 discard 878a649 binutils: additional patch should be added with space. discard 941d066 mtdev: upgrade 1.1.5 -> 1.1.6 discard 0c73603 devicetree.bbclass: include symbols in base DT discard b513185 kernel-fitimage: fix devicetree reproducibility discard f101850 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 discard 559c695 python3: install _tkinter.*.so to python3-tkinter package discard 3d2597d oeqa: reproducible: Run diffoscope on saved output discard fa9be46 recipes-support: Add diffoscope recipe discard 6547176 python: Add magic recipe discard b2f2fdf python: Add libarchive-c recipe discard d042a9c wayland: upgrade 1.17.0 -> 1.18.0 discard e3eb5dc ppp: Security fix CVE-2020-8597 discard f5d30f7 icecc.bbclass: replace superfluous "+=" with "=" discard 61edcad iputils: Fix systemd and ipv6 detection discard bbac678 binutils: Bail out if gold is used on 32/64 bit RISC-V discard 8192f43 crosssdk: Set natisdk specific distro features discard d5958bc ltp: Fix tescases with 64bit time_t using 32bit arches discard 06576c6 oeqa: Use --disable-maintainer-mode configure option discard 4ad346e qemuarm: Disable highmem when QB_MACHINE is virt discard 5d64f35 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 808d4a1 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 5562a61 HACK: signing: Add extra test debug discard 6fdd975 glew/curl: specify exclusive package configs discard 021e970 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 72e4037 oescripts.py: use unittest.SkipUnless for class skip add 4486f45 qemuarm: Disable highmem when QB_MACHINE is virt add 3dc4e27 oeqa: Use --disable-maintainer-mode configure option add 8b6c22a ltp: Fix tescases with 64bit time_t using 32bit arches add aec9f9b crosssdk: Set nativesdk specific distro features add 5ee10b1 binutils: Bail out if gold is used on 32/64 bit RISC-V add e742e5f iputils: Fix systemd and ipv6 detection add 8cd1150 icecc.bbclass: replace superfluous "+=" with "=" add b01505e ppp: Security fix CVE-2020-8597 add c127e7a wayland: upgrade 1.17.0 -> 1.18.0 add 288becd python: Add libarchive-c recipe add 64560fc python: Add magic recipe add c92cf36 recipes-support: Add diffoscope recipe add 085b0a3 diffoscope: Exclude from musl builds add 6e1d5e8 oeqa: reproducible: Run diffoscope on saved output add 991d7ce python3: install _tkinter.*.so to python3-tkinter package add 74ffa77 linux-yocto-dev: Add paravirt_kvm support for qemux86-64 add 9e4a91b kernel-fitimage: fix devicetree reproducibility add d075e39 devicetree.bbclass: include symbols in base DT add c48e2f4 mtdev: upgrade 1.1.5 -> 1.1.6 add 227bace binutils: additional patch should be added with space. add ca276b7 qemu: Upgrade to 4.2.0 add 19711ad sudo: upgrade 1.8.30 -> 1.8.31 add 320b62f libtasn1: upgrade 4.15.0 -> 4.16.0 add b76b8fb libxcrypt: upgrade 4.4.10 -> 4.4.12 add 4b9387f libcheck: upgrade 0.13.0 -> 0.14.0 add 7331062 librepo: upgrade 1.11.1 -> 1.11.2 new 4b801a7 oescripts.py: use unittest.SkipUnless for class skip new 2dd86b1 base.bbclass: extend PACKAGECONFIG for conflict package configs new 6aa2ab5 glew/curl: specify exclusive package configs new f60139b HACK: signing: Add extra test debug new a3f0055 sstatesig: Log timestamps for hashequiv in reprodubile builds new d95275e rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 1714125 staging: Handle races between binaries and their libs new c3a37ba bash: include patch 12-16 new 78ae6c2 libxml2: Fix CVE-2019-20388 new 5012000 swuashfs-tools: Enable on musl new 490d08c make: 4.2.1 -> 4.3 new 86f1669 glibc-testsuite: Remove the do_install task new 41c6921 glibc-testsuite: Exclude this recipe from world builds new 39ad2e9 perf: Correct the substitution of python shebangs new c5a260d strace: Update to 5.5 new 915d204 ffmpeg: add PACKAGECONFIG support for x265 new ec16cca python3-pip: upgrade 19.3.1 -> 20.0.2 new b03b8cc wic: Honor APPEND new 9f0fe9d ruby: upgrade 2.6.5 -> 2.7.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (84430df) \ N -- N -- N refs/heads/master-next (9f0fe9d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/image_types_wic.bbclass | 2 +- meta/classes/staging.bbclass | 12 ++- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 3 + .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 -------------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 -------- meta/recipes-devtools/make/make_4.2.1.bb | 12 --- meta/recipes-devtools/make/make_4.3.bb | 10 ++ ...python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 +- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- .../squashfs-tools/squashfs-tools_git.bb | 3 - .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 ----------- .../strace/strace/Makefile-ptest.patch | 6 +- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 --------- .../strace/strace/ptest-spacesave.patch | 17 +++- .../strace/strace/sys_headers.patch | 25 ----- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 ++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 +- meta/recipes-extended/bash/bash_5.0.bb | 15 +++ meta/recipes-kernel/perf/perf.bb | 7 +- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + scripts/lib/wic/ksparser.py | 5 + 32 files changed, 172 insertions(+), 385 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb create mode 100644 meta/recipes-devtools/make/make_4.3.bb rename meta/recipes-devtools/python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} (81%) create mode 100644 meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch rename meta/recipes-devtools/ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} (91%) delete mode 100644 meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch delete mode 100644 meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:22 +0000 Subject: [oe-commits] [openembedded-core] 04/19: HACK: signing: Add extra test debug In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132018.D9C1A232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f60139be4d3b0341e22b741c68eacd2474ec1da7 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:20 +0000 Subject: [oe-commits] [openembedded-core] 02/19: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132018.C3B3F232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2dd86b138a44c9b30bc5076ab0882a2e84c7b662 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:21 +0000 Subject: [oe-commits] [openembedded-core] 03/19: glew/curl: specify exclusive package configs In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132018.CE702232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6aa2ab56ef1cedcacbbbc2f783d331f7ce3db39b Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:23 +0000 Subject: [oe-commits] [openembedded-core] 05/19: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132018.E5763232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a3f005502b3fbaa19203c74f8cde5e892b34f2fc Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:24 +0000 Subject: [oe-commits] [openembedded-core] 06/19: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132018.F0DBC232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d95275e6182173c3f26ae88733d86766aa91b8c3 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:27 +0000 Subject: [oe-commits] [openembedded-core] 09/19: libxml2: Fix CVE-2019-20388 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.25B14232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 78ae6c2533c338431b6441b789b276c83cb2521c Author: Lee Chee Yang AuthorDate: Fri Feb 14 19:28:10 2020 +0800 libxml2: Fix CVE-2019-20388 see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 38 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..4ee2d4f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 6a4097c..097aceb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:28 +0000 Subject: [oe-commits] [openembedded-core] 10/19: swuashfs-tools: Enable on musl In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.35710232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5012000eb9372fc4f947bc327eb1577922298919 Author: Khem Raj AuthorDate: Thu Feb 13 23:03:52 2020 -0800 swuashfs-tools: Enable on musl Upstream has a patch [1] to fix musl builds, Prior to this it would not build on musl due to missing GNU extentions for fnmatch [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4fd33f8..9bcf026 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -12,9 +12,6 @@ SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ S = "${WORKDIR}/git/squashfs-tools" -# needs FNM_EXTMATCH -COMPATIBLE_HOST_libc-musl = 'null' - EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr reproducible" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:26 +0000 Subject: [oe-commits] [openembedded-core] 08/19: bash: include patch 12-16 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.12EBA232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c3a37ba3728170851db1ee6f568896bf9b595be9 Author: Lee Chee Yang AuthorDate: Fri Feb 14 19:28:09 2020 +0800 bash: include patch 12-16 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash_5.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 0c7b234..8ff9e6e 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -16,6 +16,11 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -50,6 +55,16 @@ SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" +SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" +SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" +SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" +SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" +SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" +SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" +SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" +SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" +SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" +SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:30 +0000 Subject: [oe-commits] [openembedded-core] 12/19: glibc-testsuite: Remove the do_install task In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.4C54C232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 86f1669d448315d2b31a1ab1fa38ee6631162643 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Remove the do_install task This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:25 +0000 Subject: [oe-commits] [openembedded-core] 07/19: staging: Handle races between binaries and their libs In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.07EF6232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1714125ba09ee37543d9f61657de662320caf81d Author: Richard Purdie AuthorDate: Fri Feb 14 12:50:18 2020 +0000 staging: Handle races between binaries and their libs There is a long standing issue where a binary could be installed into the sysroot before its library dependencies. We've always argued nothing should use the binary until its been installed by a dependency but there are issues around binaries which conflict with the host system, for example patch, python3, gzip and more. With the recent patch changes we've see issues like: ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0009-Change-order-of-CFLAGS.patch patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required by patch) Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce with -f) which is a symptom of this issue (libattr-native is a dependency of patch-native). There are other ways to fix this such as disabling libattr in patch, installing patch to a subdirectory and requiring PATH manipulation and so on. We can simply fix the staging code to handle /bin/ after everything else so lets do that and avoid all these other complications. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 4dd2ed0..530e23b 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -470,6 +470,7 @@ python extend_recipe_sysroot() { elif os.path.lexists(depdir + "/" + c): os.unlink(depdir + "/" + c) + binfiles = {} # Now handle installs for dep in configuredeps: c = setscenedeps[dep][0] @@ -562,7 +563,16 @@ python extend_recipe_sysroot() { if l.endswith("/"): staging_copydir(l, targetdir, dest, seendirs) continue - staging_copyfile(l, targetdir, dest, postinsts, seendirs) + if "/bin/" in l: + # defer /bin/* files until last in case they need libs + binfiles[l] = (targetdir, dest) + else: + staging_copyfile(l, targetdir, dest, postinsts, seendirs) + + # Handle deferred binfiles + for l in binfiles: + (targetdir, dest) = binfiles[l] + staging_copyfile(l, targetdir, dest, postinsts, seendirs) bb.note("Installed into sysroot: %s" % str(msg_adding)) bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:32 +0000 Subject: [oe-commits] [openembedded-core] 14/19: perf: Correct the substitution of python shebangs In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.7074F232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 39ad2e9f35516b1dc31d07201e3141e56cadc9ae Author: He Zhe AuthorDate: Fri Feb 14 11:57:37 2020 +0800 perf: Correct the substitution of python shebangs To make the native python3 is always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..a6fb51d 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:31 +0000 Subject: [oe-commits] [openembedded-core] 13/19: glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.5B032232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41c69216fd4352ab17aecb300e36db2c6e8b9109 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Exclude this recipe from world builds This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:34 +0000 Subject: [oe-commits] [openembedded-core] 16/19: ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.8CDB7232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 915d2043f2025f3a36d5dc472869a0e0c902227f Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 13 08:25:33 2020 -0800 ffmpeg: add PACKAGECONFIG support for x265 Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1..20a8249 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:29 +0000 Subject: [oe-commits] [openembedded-core] 11/19: make: 4.2.1 -> 4.3 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.413E2232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 490d08cb5165b6050e5de039482b380cbabb6b67 Author: Jens Rehsack AuthorDate: Thu Feb 13 14:36:16 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ---------------------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ------------ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 10 ++++ 5 files changed, 11 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..a3eb9d9 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:35 +0000 Subject: [oe-commits] [openembedded-core] 17/19: python3-pip: upgrade 19.3.1 -> 20.0.2 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.986C6232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ec16cca6fd5491007f95baf1733cb5708c77088a Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:05 2020 -0800 python3-pip: upgrade 19.3.1 -> 20.0.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pip_19.3.1.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb similarity index 81% rename from meta/recipes-devtools/python/python3-pip_19.3.1.bb rename to meta/recipes-devtools/python/python3-pip_20.0.2.bb index d27e6fc..08738fb 100644 --- a/meta/recipes-devtools/python/python3-pip_19.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" -SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" +SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" +SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" inherit pypi distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:36 +0000 Subject: [oe-commits] [openembedded-core] 18/19: wic: Honor APPEND In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.A28C1232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b03b8ccb11c2d2816966342ee1bc090e124e437b Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:33 +0000 Subject: [oe-commits] [openembedded-core] 15/19: strace: Update to 5.5 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.7F100232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c5a260d7864878d012f36b63bf1164c2925e7c00 Author: Alistair Francis AuthorDate: Thu Feb 13 15:25:28 2020 -0800 strace: Update to 5.5 Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 ---------------------- .../strace/strace/Makefile-ptest.patch | 6 ++- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 ------------------ .../strace/strace/ptest-spacesave.patch | 17 +++++-- .../strace/strace/sys_headers.patch | 25 ----------- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 ++++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdc..235e803 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a..0000000 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ ---- a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif ---- a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef7..42c1893 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff3..e8dbd7f 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b..e86da97 100644 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Aug 2016 23:47:57 -0700 Subject: [PATCH] strace: Fix build with mips/mips64 on musl diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index ae22105..0000000 --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy - ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -103,6 +103,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -110,6 +111,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc3..c5d8ff9 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + If the test is successful, remove the log and exp files. This stops strace using around 600MB of disk space and running our ptest images out of space. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh @@ -62,6 +62,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index d1b704e..0000000 --- a/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6f..088d685 100644 --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition fixes do_compile_ptest_base tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -18,6 +18,7 @@ diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048..d46b147 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb similarity index 80% rename from meta/recipes-devtools/strace/strace_5.4.bb rename to meta/recipes-devtools/strace/strace_5.5.bb index 1e428cc..6e7d639 100644 --- a/meta/recipes-devtools/strace/strace_5.4.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ - file://sys_headers.patch \ - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ " -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 13:20:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 13:20:37 +0000 Subject: [oe-commits] [openembedded-core] 19/19: ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <158168641826.11054.14184941531592659430@git.openembedded.org> References: <158168641826.11054.14184941531592659430@git.openembedded.org> Message-ID: <20200214132019.B57D4232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9f0fe9d4f7fd850efc9f22a4b41eee94ed65a869 Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:06 2020 -0800 ruby: upgrade 2.6.5 -> 2.7.0 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f..a38b3fe 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000..f316bed --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8b..b31dee1 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3..0000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee..c796318 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 15:54:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 15:54:42 +0000 Subject: [oe-commits] [openembedded-core] 01/02: musl: Update to latest tip In-Reply-To: <158169568176.21244.16884089821644346584@git.openembedded.org> References: <158169568176.21244.16884089821644346584@git.openembedded.org> Message-ID: <20200214155442.3FC3C232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a68e30bb860d82af72abad987a1ca52495cf4216 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 15:54:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 15:54:43 +0000 Subject: [oe-commits] [openembedded-core] 02/02: gdb: Upgrade to 9.1 release In-Reply-To: <158169568176.21244.16884089821644346584@git.openembedded.org> References: <158169568176.21244.16884089821644346584@git.openembedded.org> Message-ID: <20200214155442.50323232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9c582b476caf2cf034ffeea444fb73132dacd9a6 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 15:54:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 15:54:41 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (9f0fe9d -> 9c582b4) Message-ID: <158169568176.21244.16884089821644346584@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 9f0fe9d ruby: upgrade 2.6.5 -> 2.7.0 new a68e30b musl: Update to latest tip new 9c582b4 gdb: Upgrade to 9.1 release The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/musl/musl_git.bb | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 20 files changed, 125 insertions(+), 271 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) create mode 100644 meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 16:15:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 16:15:18 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: busybox: Backport patches to support removal of __NR_clock_gettime Message-ID: <158169691874.29628.8451363584194078828@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 203e7bc busybox: Backport patches to support removal of __NR_clock_gettime 203e7bc is described below commit 203e7bc93824bf9941b55a1565ae3eb2260dd3cf Author: Khem Raj AuthorDate: Wed Feb 12 18:15:48 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..f6fbed3 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..bbc5fa1 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 16:16:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 16:16:23 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (203e7bc -> 38233ea) Message-ID: <158169698309.31995.3777707325999303447@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 203e7bc busybox: Backport patches to support removal of __NR_clock_gettime new 38233ea busybox: Backport patches to support removal of __NR_clock_gettime This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (203e7bc) \ N -- N -- N refs/heads/master-next (38233ea) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 16:16:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 16:16:24 +0000 Subject: [oe-commits] [openembedded-core] 01/01: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158169698309.31995.3777707325999303447@git.openembedded.org> References: <158169698309.31995.3777707325999303447@git.openembedded.org> Message-ID: <20200214161623.3A8B7232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 38233ea52c4d78dc748760cf5f4545f6909ada4f Author: Khem Raj AuthorDate: Fri Feb 14 07:42:40 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..f6fbed3 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..bbc5fa1 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 16:25:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 16:25:15 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (38233ea -> 0faeaf4) Message-ID: <158169751519.5232.8643342648978416437@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 38233ea busybox: Backport patches to support removal of __NR_clock_gettime new 0faeaf4 busybox: Backport patches to support removal of __NR_clock_gettime This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (38233ea) \ N -- N -- N refs/heads/master-next (0faeaf4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 16:25:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 16:25:16 +0000 Subject: [oe-commits] [openembedded-core] 01/01: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158169751519.5232.8643342648978416437@git.openembedded.org> References: <158169751519.5232.8643342648978416437@git.openembedded.org> Message-ID: <20200214162515.589A3232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0faeaf4e6766ae35fb7f58157f639e35069c1519 Author: Khem Raj AuthorDate: Wed Feb 12 18:15:48 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..6e32b67 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..bbc5fa1 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:17 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (0faeaf4 -> 24861b4) Message-ID: <158170159784.23470.11534036363734602671@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 0faeaf4 busybox: Backport patches to support removal of __NR_clock_gettime discard 9c582b4 gdb: Upgrade to 9.1 release discard a68e30b musl: Update to latest tip discard 9f0fe9d ruby: upgrade 2.6.5 -> 2.7.0 discard b03b8cc wic: Honor APPEND discard ec16cca python3-pip: upgrade 19.3.1 -> 20.0.2 discard 915d204 ffmpeg: add PACKAGECONFIG support for x265 discard c5a260d strace: Update to 5.5 discard 39ad2e9 perf: Correct the substitution of python shebangs discard 41c6921 glibc-testsuite: Exclude this recipe from world builds discard 86f1669 glibc-testsuite: Remove the do_install task discard 490d08c make: 4.2.1 -> 4.3 discard 5012000 swuashfs-tools: Enable on musl discard 78ae6c2 libxml2: Fix CVE-2019-20388 discard c3a37ba bash: include patch 12-16 discard 1714125 staging: Handle races between binaries and their libs new 3c6530d staging: Handle races between binaries and their libs new 340760e bash: include patch 12-16 new 0dab813 libxml2: Fix CVE-2019-20388 new bb86667 swuashfs-tools: Enable on musl new 78901be make: 4.2.1 -> 4.3 new 8230eb0 glibc-testsuite: Remove the do_install task new ccf82f9 glibc-testsuite: Exclude this recipe from world builds new 76b25ce perf: Correct the substitution of python shebangs new c58d802 strace: Update to 5.5 new 5e89eeb ffmpeg: add PACKAGECONFIG support for x265 new 78f954c python3-pip: upgrade 19.3.1 -> 20.0.2 new 497ffd6 wic: Honor APPEND new acef430 ruby: upgrade 2.6.5 -> 2.7.0 new 72bb04b musl: Update to latest tip new 37dcad0 gdb: Upgrade to 9.1 release new 24861b4 busybox: Backport patches to support removal of __NR_clock_gettime This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0faeaf4) \ N -- N -- N refs/heads/master-next (24861b4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/staging.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:20 +0000 Subject: [oe-commits] [openembedded-core] 03/16: libxml2: Fix CVE-2019-20388 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.1D4B0232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0dab8136aad0944eb92f78bb38028dcf1814372d Author: Lee Chee Yang AuthorDate: Fri Feb 14 19:28:10 2020 +0800 libxml2: Fix CVE-2019-20388 see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 38 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..4ee2d4f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 6a4097c..097aceb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:21 +0000 Subject: [oe-commits] [openembedded-core] 04/16: swuashfs-tools: Enable on musl In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.2794D232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bb86667c8314859eea431406eb64858b41fe69eb Author: Khem Raj AuthorDate: Thu Feb 13 23:03:52 2020 -0800 swuashfs-tools: Enable on musl Upstream has a patch [1] to fix musl builds, Prior to this it would not build on musl due to missing GNU extentions for fnmatch [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4fd33f8..9bcf026 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -12,9 +12,6 @@ SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ S = "${WORKDIR}/git/squashfs-tools" -# needs FNM_EXTMATCH -COMPATIBLE_HOST_libc-musl = 'null' - EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr reproducible" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:18 +0000 Subject: [oe-commits] [openembedded-core] 01/16: staging: Handle races between binaries and their libs In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.08C3A232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c6530d23e946938357c0297150d5229ee811345 Author: Richard Purdie AuthorDate: Fri Feb 14 12:50:18 2020 +0000 staging: Handle races between binaries and their libs There is a long standing issue where a binary could be installed into the sysroot before its library dependencies. We've always argued nothing should use the binary until it has been installed by a dependency but there are issues around binaries which conflict with the host system, for example patch, python3, gzip and more. With the recent patch changes we've seen issues like: ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0009-Change-order-of-CFLAGS.patch patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required by patch) Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce with -f) which is a symptom of this issue (libattr-native is a dependency of patch-native). There are other ways to fix this such as disabling libattr in patch, installing patch to a subdirectory and requiring PATH manipulation and so on. We can simply fix the staging code to handle /bin/ after everything else so do that and avoid all these other complications. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 4dd2ed0..5dab427 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -470,6 +470,7 @@ python extend_recipe_sysroot() { elif os.path.lexists(depdir + "/" + c): os.unlink(depdir + "/" + c) + binfiles = {} # Now handle installs for dep in configuredeps: c = setscenedeps[dep][0] @@ -562,7 +563,16 @@ python extend_recipe_sysroot() { if l.endswith("/"): staging_copydir(l, targetdir, dest, seendirs) continue - staging_copyfile(l, targetdir, dest, postinsts, seendirs) + if "/bin/" in l or "/sbin/" in l: + # defer /*bin/* files until last in case they need libs + binfiles[l] = (targetdir, dest) + else: + staging_copyfile(l, targetdir, dest, postinsts, seendirs) + + # Handle deferred binfiles + for l in binfiles: + (targetdir, dest) = binfiles[l] + staging_copyfile(l, targetdir, dest, postinsts, seendirs) bb.note("Installed into sysroot: %s" % str(msg_adding)) bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:19 +0000 Subject: [oe-commits] [openembedded-core] 02/16: bash: include patch 12-16 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.1232A232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 340760ec89a2e54988abcdf9e37090e28f1d80cf Author: Lee Chee Yang AuthorDate: Fri Feb 14 19:28:09 2020 +0800 bash: include patch 12-16 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash_5.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 0c7b234..8ff9e6e 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -16,6 +16,11 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -50,6 +55,16 @@ SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" +SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" +SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" +SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" +SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" +SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" +SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" +SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" +SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" +SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" +SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:23 +0000 Subject: [oe-commits] [openembedded-core] 06/16: glibc-testsuite: Remove the do_install task In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.3CF5F232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8230eb0afc244bfb05edee7270ddb115b16d2306 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Remove the do_install task This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:25 +0000 Subject: [oe-commits] [openembedded-core] 08/16: perf: Correct the substitution of python shebangs In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.50D1D232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 76b25ce78032a531becaab1b625ddda50ae30d1c Author: He Zhe AuthorDate: Fri Feb 14 11:57:37 2020 +0800 perf: Correct the substitution of python shebangs To make the native python3 is always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..a6fb51d 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:24 +0000 Subject: [oe-commits] [openembedded-core] 07/16: glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.4697C232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ccf82f9c1e6356bb1c318643452692efcb1d1fa7 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Exclude this recipe from world builds This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:27 +0000 Subject: [oe-commits] [openembedded-core] 10/16: ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.6341A232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5e89eeb263de192384f86fc74552aa5e6f8f7b1f Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 13 08:25:33 2020 -0800 ffmpeg: add PACKAGECONFIG support for x265 Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1..20a8249 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:22 +0000 Subject: [oe-commits] [openembedded-core] 05/16: make: 4.2.1 -> 4.3 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.325C9232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 78901bee978e7a098c6d94ef1db27b583295755f Author: Jens Rehsack AuthorDate: Thu Feb 13 14:36:16 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ---------------------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ------------ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 10 ++++ 5 files changed, 11 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..a3eb9d9 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:29 +0000 Subject: [oe-commits] [openembedded-core] 12/16: wic: Honor APPEND In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.75E31232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 497ffd685c64bfb0e455eb07e9a27c820a94d032 Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:26 +0000 Subject: [oe-commits] [openembedded-core] 09/16: strace: Update to 5.5 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.5B15A232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c58d802525aa4996159d1f025fe683f7d91b9e09 Author: Alistair Francis AuthorDate: Thu Feb 13 15:25:28 2020 -0800 strace: Update to 5.5 Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 ---------------------- .../strace/strace/Makefile-ptest.patch | 6 ++- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 ------------------ .../strace/strace/ptest-spacesave.patch | 17 +++++-- .../strace/strace/sys_headers.patch | 25 ----------- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 ++++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdc..235e803 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a..0000000 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ ---- a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif ---- a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef7..42c1893 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff3..e8dbd7f 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b..e86da97 100644 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Aug 2016 23:47:57 -0700 Subject: [PATCH] strace: Fix build with mips/mips64 on musl diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index ae22105..0000000 --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy - ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -103,6 +103,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -110,6 +111,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc3..c5d8ff9 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + If the test is successful, remove the log and exp files. This stops strace using around 600MB of disk space and running our ptest images out of space. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh @@ -62,6 +62,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index d1b704e..0000000 --- a/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6f..088d685 100644 --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition fixes do_compile_ptest_base tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -18,6 +18,7 @@ diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048..d46b147 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb similarity index 80% rename from meta/recipes-devtools/strace/strace_5.4.bb rename to meta/recipes-devtools/strace/strace_5.5.bb index 1e428cc..6e7d639 100644 --- a/meta/recipes-devtools/strace/strace_5.4.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ - file://sys_headers.patch \ - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ " -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:28 +0000 Subject: [oe-commits] [openembedded-core] 11/16: python3-pip: upgrade 19.3.1 -> 20.0.2 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.6C8B3232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 78f954cd84cf5ef289f3280db917c644515c0fb2 Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:05 2020 -0800 python3-pip: upgrade 19.3.1 -> 20.0.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pip_19.3.1.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb similarity index 81% rename from meta/recipes-devtools/python/python3-pip_19.3.1.bb rename to meta/recipes-devtools/python/python3-pip_20.0.2.bb index d27e6fc..08738fb 100644 --- a/meta/recipes-devtools/python/python3-pip_19.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" -SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" +SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" +SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" inherit pypi distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:31 +0000 Subject: [oe-commits] [openembedded-core] 14/16: musl: Update to latest tip In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.892B1232A65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72bb04be1774db739149c115b2c7de40b0bdf103 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:33 +0000 Subject: [oe-commits] [openembedded-core] 16/16: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.A27E3232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 24861b403eb3168a2dec31be13006151fef9dcab Author: Khem Raj AuthorDate: Wed Feb 12 18:15:48 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..6e32b67 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..bbc5fa1 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:30 +0000 Subject: [oe-commits] [openembedded-core] 13/16: ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.7F497232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit acef430dd7ddbed94270479fc47d478544239ced Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:06 2020 -0800 ruby: upgrade 2.6.5 -> 2.7.0 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f..a38b3fe 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000..f316bed --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8b..b31dee1 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3..0000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee..c796318 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:33:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:33:32 +0000 Subject: [oe-commits] [openembedded-core] 15/16: gdb: Upgrade to 9.1 release In-Reply-To: <158170159784.23470.11534036363734602671@git.openembedded.org> References: <158170159784.23470.11534036363734602671@git.openembedded.org> Message-ID: <20200214173318.95D9B232A66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 37dcad05c07d2182c830f2a8915c7ac5e88b9608 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:23 +0000 Subject: [oe-commits] [openembedded-core] 01/13: squashfs-tools: Enable on musl In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.A3413232A58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7eff2bbc358fe73f732de090cceb3a711318ef79 Author: Khem Raj AuthorDate: Thu Feb 13 23:03:52 2020 -0800 squashfs-tools: Enable on musl Upstream has a patch [1] to fix musl builds, Prior to this it would not build on musl due to missing GNU extentions for fnmatch [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4fd33f8..9bcf026 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -12,9 +12,6 @@ SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ S = "${WORKDIR}/git/squashfs-tools" -# needs FNM_EXTMATCH -COMPATIBLE_HOST_libc-musl = 'null' - EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr reproducible" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:22 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (24861b4 -> d2130d2) Message-ID: <158170250252.29519.5565460649669881789@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 24861b4 busybox: Backport patches to support removal of __NR_clock_gettime discard 37dcad0 gdb: Upgrade to 9.1 release discard 72bb04b musl: Update to latest tip discard acef430 ruby: upgrade 2.6.5 -> 2.7.0 discard 497ffd6 wic: Honor APPEND discard 78f954c python3-pip: upgrade 19.3.1 -> 20.0.2 discard 5e89eeb ffmpeg: add PACKAGECONFIG support for x265 discard c58d802 strace: Update to 5.5 discard 76b25ce perf: Correct the substitution of python shebangs discard ccf82f9 glibc-testsuite: Exclude this recipe from world builds discard 8230eb0 glibc-testsuite: Remove the do_install task discard 78901be make: 4.2.1 -> 4.3 discard bb86667 swuashfs-tools: Enable on musl new 7eff2bb squashfs-tools: Enable on musl new 3c6b87e make: 4.2.1 -> 4.3 new 4b926b9 glibc-testsuite: Remove the do_install task new ef1c156 glibc-testsuite: Exclude this recipe from world builds new ac524f8 perf: Correct the substitution of python shebangs new e3b9e48 strace: Update to 5.5 new 24e5c54 ffmpeg: add PACKAGECONFIG support for x265 new 728e904 python3-pip: upgrade 19.3.1 -> 20.0.2 new c43b16b wic: Honor APPEND new 2a902e2 ruby: upgrade 2.6.5 -> 2.7.0 new f4c1d16 musl: Update to latest tip new 676af1a gdb: Upgrade to 9.1 release new d2130d2 busybox: Backport patches to support removal of __NR_clock_gettime This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (24861b4) \ N -- N -- N refs/heads/master-next (d2130d2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:25 +0000 Subject: [oe-commits] [openembedded-core] 03/13: glibc-testsuite: Remove the do_install task In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.B6647232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4b926b94ff9b33e33d31889f25e1a1ade5d3bd05 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Remove the do_install task This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:26 +0000 Subject: [oe-commits] [openembedded-core] 04/13: glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.BE571232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ef1c1564327e67db826aab88c0ce073ab849ae00 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Exclude this recipe from world builds This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:24 +0000 Subject: [oe-commits] [openembedded-core] 02/13: make: 4.2.1 -> 4.3 In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.ABEC0232A59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c6b87ee747f22fe927f9fb950aa3ffda9e588a1 Author: Jens Rehsack AuthorDate: Thu Feb 13 14:36:16 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ---------------------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ------------ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 10 ++++ 5 files changed, 11 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..a3eb9d9 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:27 +0000 Subject: [oe-commits] [openembedded-core] 05/13: perf: Correct the substitution of python shebangs In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.C6110232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ac524f8e29957fa6da708a5bd24907ad0096058e Author: He Zhe AuthorDate: Fri Feb 14 11:57:37 2020 +0800 perf: Correct the substitution of python shebangs To make the native python3 is always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..a6fb51d 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:29 +0000 Subject: [oe-commits] [openembedded-core] 07/13: ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.DEA51232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 24e5c540327dc4fd61407a6369d44cd197051d53 Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 13 08:25:33 2020 -0800 ffmpeg: add PACKAGECONFIG support for x265 Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1..20a8249 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:30 +0000 Subject: [oe-commits] [openembedded-core] 08/13: python3-pip: upgrade 19.3.1 -> 20.0.2 In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.E8106232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 728e90413d7628e5b2a86ee38a426f68c6931302 Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:05 2020 -0800 python3-pip: upgrade 19.3.1 -> 20.0.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pip_19.3.1.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb similarity index 81% rename from meta/recipes-devtools/python/python3-pip_19.3.1.bb rename to meta/recipes-devtools/python/python3-pip_20.0.2.bb index d27e6fc..08738fb 100644 --- a/meta/recipes-devtools/python/python3-pip_19.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" -SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" +SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" +SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" inherit pypi distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:28 +0000 Subject: [oe-commits] [openembedded-core] 06/13: strace: Update to 5.5 In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.D1FA4232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e3b9e486430ce682f90a955aa005a5c4396911dc Author: Alistair Francis AuthorDate: Thu Feb 13 15:25:28 2020 -0800 strace: Update to 5.5 Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 ---------------------- .../strace/strace/Makefile-ptest.patch | 6 ++- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 ------------------ .../strace/strace/ptest-spacesave.patch | 17 +++++-- .../strace/strace/sys_headers.patch | 25 ----------- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 ++++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdc..235e803 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a..0000000 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ ---- a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif ---- a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef7..42c1893 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff3..e8dbd7f 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b..e86da97 100644 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Aug 2016 23:47:57 -0700 Subject: [PATCH] strace: Fix build with mips/mips64 on musl diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index ae22105..0000000 --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy - ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -103,6 +103,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -110,6 +111,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc3..c5d8ff9 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + If the test is successful, remove the log and exp files. This stops strace using around 600MB of disk space and running our ptest images out of space. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh @@ -62,6 +62,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index d1b704e..0000000 --- a/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6f..088d685 100644 --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition fixes do_compile_ptest_base tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -18,6 +18,7 @@ diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048..d46b147 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb similarity index 80% rename from meta/recipes-devtools/strace/strace_5.4.bb rename to meta/recipes-devtools/strace/strace_5.5.bb index 1e428cc..6e7d639 100644 --- a/meta/recipes-devtools/strace/strace_5.4.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ - file://sys_headers.patch \ - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ " -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:33 +0000 Subject: [oe-commits] [openembedded-core] 11/13: musl: Update to latest tip In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174823.10C41232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f4c1d1663e80a694c7880c3d10c659419bd1fb5a Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:31 +0000 Subject: [oe-commits] [openembedded-core] 09/13: wic: Honor APPEND In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174822.F2223232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c43b16b4b72e698d6c0965becc7c6f98888c7f7a Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:32 +0000 Subject: [oe-commits] [openembedded-core] 10/13: ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174823.08059232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2a902e2d88f8c51da0558ca88294026f9b6fdaea Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:06 2020 -0800 ruby: upgrade 2.6.5 -> 2.7.0 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f..a38b3fe 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000..f316bed --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8b..b31dee1 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3..0000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee..c796318 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:34 +0000 Subject: [oe-commits] [openembedded-core] 12/13: gdb: Upgrade to 9.1 release In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174823.20C70232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 676af1aaf211cd407efc1d3ff5d3f38c3c4c40ea Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 17:48:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 17:48:35 +0000 Subject: [oe-commits] [openembedded-core] 13/13: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158170250252.29519.5565460649669881789@git.openembedded.org> References: <158170250252.29519.5565460649669881789@git.openembedded.org> Message-ID: <20200214174823.2BF8B232A57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d2130d212880a1743bcc39a59bb5e8e5276ea86e Author: Khem Raj AuthorDate: Wed Feb 12 18:15:48 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..6e32b67 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..bbc5fa1 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:35 +0000 Subject: [oe-commits] [openembedded-core] 01/10: glibc-testsuite: Remove the do_install task In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180634.BBCE1232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c715d51138e6e4170c3b3c98a62536b252878d5f Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Remove the do_install task This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:36 +0000 Subject: [oe-commits] [openembedded-core] 02/10: glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180634.CC9BD232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 06ae4207f59ef4147ec3bb9e7f0fab0a99829273 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Exclude this recipe from world builds This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:38 +0000 Subject: [oe-commits] [openembedded-core] 04/10: ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180634.E8380232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6a9220940df503a5ccc824eb3310aabe5bf5b1e8 Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 13 08:25:33 2020 -0800 ffmpeg: add PACKAGECONFIG support for x265 Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1..20a8249 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:34 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d2130d2 -> 1f14275) Message-ID: <158170359440.8551.8914924604181580481@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard d2130d2 busybox: Backport patches to support removal of __NR_clock_gettime discard 676af1a gdb: Upgrade to 9.1 release discard f4c1d16 musl: Update to latest tip discard 2a902e2 ruby: upgrade 2.6.5 -> 2.7.0 discard c43b16b wic: Honor APPEND discard 728e904 python3-pip: upgrade 19.3.1 -> 20.0.2 discard 24e5c54 ffmpeg: add PACKAGECONFIG support for x265 discard e3b9e48 strace: Update to 5.5 discard ac524f8 perf: Correct the substitution of python shebangs discard ef1c156 glibc-testsuite: Exclude this recipe from world builds discard 4b926b9 glibc-testsuite: Remove the do_install task discard 3c6b87e make: 4.2.1 -> 4.3 new c715d51 glibc-testsuite: Remove the do_install task new 06ae420 glibc-testsuite: Exclude this recipe from world builds new a286a07 strace: Update to 5.5 new 6a92209 ffmpeg: add PACKAGECONFIG support for x265 new 392c4aa python3-pip: upgrade 19.3.1 -> 20.0.2 new 7f6ef47 wic: Honor APPEND new 51fba6a ruby: upgrade 2.6.5 -> 2.7.0 new 2b72f3b busybox: Backport patches to support removal of __NR_clock_gettime new acdd1d4 musl: Update to latest tip new 1f14275 gdb: Upgrade to 9.1 release This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d2130d2) \ N -- N -- N refs/heads/master-next (1f14275) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...all-wrappers-around-clock_gettime-closes-.patch | 13 +++- ...unsv-Use-64-prefix-syscall-if-we-have-to.patch} | 33 +++++----- meta/recipes-core/busybox/busybox_1.31.1.bb | 3 +- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ++++++++++++++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ++++ meta/recipes-devtools/make/make_4.3.bb | 10 ---- meta/recipes-kernel/perf/perf.bb | 7 ++- 9 files changed, 158 insertions(+), 32 deletions(-) copy meta/recipes-core/busybox/busybox/{0001-time-Use-64-prefix-syscall-if-we-have-to.patch => 0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch} (60%) create mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make_4.2.1.bb delete mode 100644 meta/recipes-devtools/make/make_4.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:37 +0000 Subject: [oe-commits] [openembedded-core] 03/10: strace: Update to 5.5 In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180634.D7286232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a286a07f6abefca2d0c0aa7c48059a2fd13eb5e1 Author: Alistair Francis AuthorDate: Thu Feb 13 15:25:28 2020 -0800 strace: Update to 5.5 Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 ---------------------- .../strace/strace/Makefile-ptest.patch | 6 ++- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 ------------------ .../strace/strace/ptest-spacesave.patch | 17 +++++-- .../strace/strace/sys_headers.patch | 25 ----------- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 ++++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdc..235e803 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a..0000000 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ ---- a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif ---- a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef7..42c1893 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff3..e8dbd7f 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b..e86da97 100644 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Aug 2016 23:47:57 -0700 Subject: [PATCH] strace: Fix build with mips/mips64 on musl diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index ae22105..0000000 --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy - ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -103,6 +103,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -110,6 +111,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc3..c5d8ff9 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + If the test is successful, remove the log and exp files. This stops strace using around 600MB of disk space and running our ptest images out of space. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh @@ -62,6 +62,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index d1b704e..0000000 --- a/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6f..088d685 100644 --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition fixes do_compile_ptest_base tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -18,6 +18,7 @@ diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048..d46b147 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb similarity index 80% rename from meta/recipes-devtools/strace/strace_5.4.bb rename to meta/recipes-devtools/strace/strace_5.5.bb index 1e428cc..6e7d639 100644 --- a/meta/recipes-devtools/strace/strace_5.4.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ - file://sys_headers.patch \ - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ " -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:39 +0000 Subject: [oe-commits] [openembedded-core] 05/10: python3-pip: upgrade 19.3.1 -> 20.0.2 In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180635.00CFA232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 392c4aaacdeca3798855f563084af349371075de Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:05 2020 -0800 python3-pip: upgrade 19.3.1 -> 20.0.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pip_19.3.1.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb similarity index 81% rename from meta/recipes-devtools/python/python3-pip_19.3.1.bb rename to meta/recipes-devtools/python/python3-pip_20.0.2.bb index d27e6fc..08738fb 100644 --- a/meta/recipes-devtools/python/python3-pip_19.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" -SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" +SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" +SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" inherit pypi distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:40 +0000 Subject: [oe-commits] [openembedded-core] 06/10: wic: Honor APPEND In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180635.10CCB232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7f6ef4736fdd72003cd57f1fbefb4a3a98b75a1b Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:41 +0000 Subject: [oe-commits] [openembedded-core] 07/10: ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180635.206F1232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 51fba6ab52a3542f4347e4f39bc69e518eeb6431 Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:06 2020 -0800 ruby: upgrade 2.6.5 -> 2.7.0 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f..a38b3fe 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000..f316bed --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8b..b31dee1 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3..0000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee..c796318 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:42 +0000 Subject: [oe-commits] [openembedded-core] 08/10: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180635.3223F232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2b72f3b3e3f1bca0d128451e5b981e967f07017c Author: Khem Raj AuthorDate: Fri Feb 14 10:00:07 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 120 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + 5 files changed, 266 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..1217daa --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,120 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] +Signed-off-by: Denys Vlasenko +--- + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); +-#elif __TIMESIZE == 64 +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..4760570 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,46 @@ +From 8c7419649d6e6fda8fa7d0e863084c78ac728628 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 28 Aug 2019 10:54:15 -0700 +Subject: [PATCH 3/3] runsv: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Signed-off-by: Alistair Francis +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=ad27d44ebe950335616f37e36863469dc181b455] +--- + runit/runsv.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/runit/runsv.c b/runit/runsv.c +index ccc762d78..737909b0e 100644 +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++#elif __TIMESIZE == 64 ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + } + #else + static void gettimeofday_ns(struct timespec *ts) +-- +2.22.0 + diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..ec5b580 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -42,6 +42,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-check-uudecode-before-using-it.patch \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ file://0001-Remove-stime-function-calls.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:43 +0000 Subject: [oe-commits] [openembedded-core] 09/10: musl: Update to latest tip In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180635.3EB92232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit acdd1d4a54c9d65bc6214816321f88f4f955a4a0 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:06:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:06:44 +0000 Subject: [oe-commits] [openembedded-core] 10/10: gdb: Upgrade to 9.1 release In-Reply-To: <158170359440.8551.8914924604181580481@git.openembedded.org> References: <158170359440.8551.8914924604181580481@git.openembedded.org> Message-ID: <20200214180635.5AA40232A5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f1427561413d80212b409476eada16bfe036b62 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:07:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:07:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1f14275 -> 30f5f44) Message-ID: <158170366793.9488.15230758830978713464@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 1f14275 gdb: Upgrade to 9.1 release new 54680e3 ell: upgrade 0.27 -> 0.28 new a6fd3fa icu: upgrade 64.2 -> 65.1 new 8e9bb65 libgpg-error: upgrade 1.36 -> 1.37 new 30f5f44 python3-pycairo: upgrade 1.18.2 -> 1.19.0 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 +- ...pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +- .../icu/{icu_64.2.bb => icu_65.1.bb} | 4 +- .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- 5 files changed, 9 insertions(+), 154 deletions(-) rename meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} (83%) rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} (77%) rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:07:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:07:48 +0000 Subject: [oe-commits] [openembedded-core] 01/04: ell: upgrade 0.27 -> 0.28 In-Reply-To: <158170366793.9488.15230758830978713464@git.openembedded.org> References: <158170366793.9488.15230758830978713464@git.openembedded.org> Message-ID: <20200214180748.3DBF1232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 54680e37bb73eb75caaae7e1bae3f8b6d9494937 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:26 2020 -0800 ell: upgrade 0.27 -> 0.28 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.27.bb rename to meta/recipes-core/ell/ell_0.28.bb index 503f1e2..464bf63 100644 --- a/meta/recipes-core/ell/ell_0.27.bb +++ b/meta/recipes-core/ell/ell_0.28.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2" -SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96" +SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9" +SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b" do_configure_prepend () { mkdir -p ${S}/build-aux -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:07:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:07:49 +0000 Subject: [oe-commits] [openembedded-core] 02/04: icu: upgrade 64.2 -> 65.1 In-Reply-To: <158170366793.9488.15230758830978713464@git.openembedded.org> References: <158170366793.9488.15230758830978713464@git.openembedded.org> Message-ID: <20200214180748.48A3D232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a6fd3fa5ee45d17fc2b5df5392c427190e32beea Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:27 2020 -0800 icu: upgrade 64.2 -> 65.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb similarity index 88% rename from meta/recipes-support/icu/icu_64.2.bb rename to meta/recipes-support/icu/icu_65.1.bb index 44caa43..bd932d7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_65.1.bb @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:07:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:07:51 +0000 Subject: [oe-commits] [openembedded-core] 04/04: python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <158170366793.9488.15230758830978713464@git.openembedded.org> References: <158170366793.9488.15230758830978713464@git.openembedded.org> Message-ID: <20200214180748.5D93D232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 30f5f441fca26f3451b4b50c5287168feac8c68c Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:29 2020 -0800 python3-pycairo: upgrade 1.18.2 -> 1.19.0 -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" is added Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb similarity index 77% rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb index 3aedf3d..8f60834 100644 --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "python-devel" LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz" UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" S = "${WORKDIR}/pycairo-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:07:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:07:50 +0000 Subject: [oe-commits] [openembedded-core] 03/04: libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <158170366793.9488.15230758830978713464@git.openembedded.org> References: <158170366793.9488.15230758830978713464@git.openembedded.org> Message-ID: <20200214180748.52D9E232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8e9bb657d5a256a7255720d4b992ad978822b142 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:28 2020 -0800 libgpg-error: upgrade 1.36 -> 1.37 libgpg-error-1.36-gawk5-support.patch Removed since it is included in 1.37. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..bf1da84 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,10 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:13:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:13:38 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: populate_sdk_ext: We now require python3, not python Message-ID: <158170401836.14676.14758980775564640118@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 6c7d766 populate_sdk_ext: We now require python3, not python 6c7d766 is described below commit 6c7d7669415137fe0958a593cae3786f339214c2 Author: Richard Purdie AuthorDate: Fri Feb 14 18:13:14 2020 +0000 populate_sdk_ext: We now require python3, not python Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9511e55..57fd29b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -613,8 +613,8 @@ sdk_ext_preinst() { exit 1 fi # The relocation script used by buildtools installer requires python - if ! command -v python > /dev/null; then - echo "ERROR: The installer requires python, please install it first" + if ! command -v python3 > /dev/null; then + echo "ERROR: The installer requires python3, please install it first" exit 1 fi missing_utils="" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 18:16:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 18:16:11 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: bitbake: layerindex: use branch when specified Message-ID: <158170417197.15512.4854365417302323638@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new acb962a bitbake: layerindex: use branch when specified acb962a is described below commit acb962a7874e82fcadc516ed0e907af91f5d4b15 Author: Jon Mason AuthorDate: Thu Dec 19 11:39:08 2019 -0600 bitbake: layerindex: use branch when specified When currently specified, the branch is used to verify the versioning of the meta layer, but the master branch is checked out. This change allows for the branch to be specified. Now it is easy to specify all of the meta layers being added are of the same version, without having to do it in each individual git tree. Also, it will error if there are branches without a matching version. Finally, this allows for meta layer git trees without a master branch. Signed-off-by: Jon Mason Minor rework of the patch to use the layerBranch actual_branch since the layerindex referenced branch may be different then the overall release branch. Also adjust the patch to use the default git checkout branch instead of master if no branch was specified. (Some repositories don't have a master branch.) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- lib/bblayers/layerindex.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/bblayers/layerindex.py b/lib/bblayers/layerindex.py index 57cd902..aa3b682 100644 --- a/lib/bblayers/layerindex.py +++ b/lib/bblayers/layerindex.py @@ -24,7 +24,7 @@ class LayerIndexPlugin(ActionPlugin): This class inherits ActionPlugin to get do_add_layer. """ - def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer): + def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch): layername = self.get_layer_name(url) if os.path.splitext(layername)[1] == '.git': layername = os.path.splitext(layername)[0] @@ -32,9 +32,13 @@ class LayerIndexPlugin(ActionPlugin): layerdir = os.path.join(repodir, subdir) if not os.path.exists(repodir): if fetch_layer: - result = subprocess.call(['git', 'clone', url, repodir]) + cmd = ['git', 'clone', '-b' , branch, url, repodir] + if not branch: + # Branch really shouldn't be empty, but use the repo default if it is + cmd = ['git', 'clone', url, repodir] + result = subprocess.call(cmd) if result: - logger.error("Failed to download %s" % url) + logger.error("Failed to download %s (%s)" % (url, branch)) return None, None, None else: return subdir, layername, layerdir @@ -171,7 +175,8 @@ class LayerIndexPlugin(ActionPlugin): subdir, name, layerdir = self.get_fetch_layer(fetchdir, layerBranch.layer.vcs_url, layerBranch.vcs_subdir, - not args.show_only) + not args.show_only, + layerBranch.actual_branch) if not name: # Error already shown return 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:37 +0000 Subject: [oe-commits] [openembedded-core] 02/10: musl: Update to latest tip In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.65EE6232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e3a84da11c217441d95029759855465d5009d2bb Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:35 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6c7d766 -> 921da19) Message-ID: <158172207509.3609.5608912170314387699@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 6c7d766 populate_sdk_ext: We now require python3, not python discard 30f5f44 python3-pycairo: upgrade 1.18.2 -> 1.19.0 discard 8e9bb65 libgpg-error: upgrade 1.36 -> 1.37 discard a6fd3fa icu: upgrade 64.2 -> 65.1 discard 54680e3 ell: upgrade 0.27 -> 0.28 discard 1f14275 gdb: Upgrade to 9.1 release discard acdd1d4 musl: Update to latest tip discard 2b72f3b busybox: Backport patches to support removal of __NR_clock_gettime new 0263532 busybox: Backport patches to support removal of __NR_clock_gettime new e3a84da musl: Update to latest tip new e80cf26 gdb: Upgrade to 9.1 release new f65989a ell: upgrade 0.27 -> 0.28 new f6a39c1 icu: upgrade 64.2 -> 65.1 new 2080cc5 libgpg-error: upgrade 1.36 -> 1.37 new fa34471 python3-pycairo: upgrade 1.18.2 -> 1.19.0 new 3dd8a65 populate_sdk_ext: We now require python3, not python new 1f43871 qemuriscv64: Set the Xvisor platform new 921da19 db: Fix timespec length assumptions This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6c7d766) \ N -- N -- N refs/heads/master-next (921da19) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/machine/qemuriscv64.conf | 2 + ...all-wrappers-around-clock_gettime-closes-.patch | 2 +- .../db/0001-clock-Do-not-define-own-timespec.patch | 45 ++++++++++++++++++++++ meta/recipes-support/db/db_5.3.28.bb | 1 + 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:36 +0000 Subject: [oe-commits] [openembedded-core] 01/10: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.5BCA1232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0263532633d2d3e2e31868b01bc69209c4a2e2d3 Author: Khem Raj AuthorDate: Fri Feb 14 10:00:07 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 120 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + 5 files changed, 266 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..0c7f9b8 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,120 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] +Signed-off-by: Denys Vlasenko +--- + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); +-#elif __TIMESIZE == 64 +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..4760570 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,46 @@ +From 8c7419649d6e6fda8fa7d0e863084c78ac728628 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 28 Aug 2019 10:54:15 -0700 +Subject: [PATCH 3/3] runsv: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Signed-off-by: Alistair Francis +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=ad27d44ebe950335616f37e36863469dc181b455] +--- + runit/runsv.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/runit/runsv.c b/runit/runsv.c +index ccc762d78..737909b0e 100644 +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++#elif __TIMESIZE == 64 ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + } + #else + static void gettimeofday_ns(struct timespec *ts) +-- +2.22.0 + diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..ec5b580 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -42,6 +42,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-check-uudecode-before-using-it.patch \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ file://0001-Remove-stime-function-calls.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:39 +0000 Subject: [oe-commits] [openembedded-core] 04/10: ell: upgrade 0.27 -> 0.28 In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.7D4E7232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f65989aa213605cd9b4d3eddadd5a5c49760f522 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:26 2020 -0800 ell: upgrade 0.27 -> 0.28 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.27.bb rename to meta/recipes-core/ell/ell_0.28.bb index 503f1e2..464bf63 100644 --- a/meta/recipes-core/ell/ell_0.27.bb +++ b/meta/recipes-core/ell/ell_0.28.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2" -SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96" +SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9" +SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b" do_configure_prepend () { mkdir -p ${S}/build-aux -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:38 +0000 Subject: [oe-commits] [openembedded-core] 03/10: gdb: Upgrade to 9.1 release In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.72E86232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e80cf26d531923c626657f89695e720f2edf4d13 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:40 +0000 Subject: [oe-commits] [openembedded-core] 05/10: icu: upgrade 64.2 -> 65.1 In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.8744B232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f6a39c117bb0de4abf56ebbbb6d6e737b0e3cc84 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:27 2020 -0800 icu: upgrade 64.2 -> 65.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb similarity index 88% rename from meta/recipes-support/icu/icu_64.2.bb rename to meta/recipes-support/icu/icu_65.1.bb index 44caa43..bd932d7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_65.1.bb @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:42 +0000 Subject: [oe-commits] [openembedded-core] 07/10: python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.9E331232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fa34471aefb2f9c1d3a2c794b974aa0b45f820c1 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:29 2020 -0800 python3-pycairo: upgrade 1.18.2 -> 1.19.0 -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" is added Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb similarity index 77% rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb index 3aedf3d..8f60834 100644 --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "python-devel" LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz" UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" S = "${WORKDIR}/pycairo-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:43 +0000 Subject: [oe-commits] [openembedded-core] 08/10: populate_sdk_ext: We now require python3, not python In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.A6D6D232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3dd8a6571874f731d3c53b9fc9c642b60ba17bf9 Author: Richard Purdie AuthorDate: Fri Feb 14 18:13:14 2020 +0000 populate_sdk_ext: We now require python3, not python Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9511e55..57fd29b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -613,8 +613,8 @@ sdk_ext_preinst() { exit 1 fi # The relocation script used by buildtools installer requires python - if ! command -v python > /dev/null; then - echo "ERROR: The installer requires python, please install it first" + if ! command -v python3 > /dev/null; then + echo "ERROR: The installer requires python3, please install it first" exit 1 fi missing_utils="" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:44 +0000 Subject: [oe-commits] [openembedded-core] 09/10: qemuriscv64: Set the Xvisor platform In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.AF236232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f43871040d3456ab45997ff7c9ed58e60cbb57c Author: Alistair Francis AuthorDate: Fri Feb 14 11:42:30 2020 -0800 qemuriscv64: Set the Xvisor platform Set the platform information required to build Xvisor. https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-extended/xvisor Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/machine/qemuriscv64.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index b45fdd5..a753af0 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -4,6 +4,8 @@ require conf/machine/include/riscv/qemuriscv.inc +XVISOR_PLAT = "riscv/virt64" + EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE = "qemu-riscv64_smode_defconfig" UBOOT_ELF = "u-boot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:41 +0000 Subject: [oe-commits] [openembedded-core] 06/10: libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.93F87232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2080cc5dd579d0d3dbaeb9d8d16b4dff0ad077a6 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:28 2020 -0800 libgpg-error: upgrade 1.36 -> 1.37 libgpg-error-1.36-gawk5-support.patch Removed since it is included in 1.37. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..bf1da84 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,10 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:14:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:14:45 +0000 Subject: [oe-commits] [openembedded-core] 10/10: db: Fix timespec length assumptions In-Reply-To: <158172207509.3609.5608912170314387699@git.openembedded.org> References: <158172207509.3609.5608912170314387699@git.openembedded.org> Message-ID: <20200214231435.B7225232A65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 921da1987123d550386cf3f9b0f835220e255d1f Author: Khem Raj AuthorDate: Fri Feb 14 14:33:34 2020 -0800 db: Fix timespec length assumptions This should fix the vdso crashes seen with kernel 5.0+ python3[11312] general protection fault ip:b7e966b0 sp:bf8175cc error:0 in libc.so[b7e8b000+6b000] Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- .../db/0001-clock-Do-not-define-own-timespec.patch | 45 ++++++++++++++++++++++ meta/recipes-support/db/db_5.3.28.bb | 1 + 2 files changed, 46 insertions(+) diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch new file mode 100644 index 0000000..9d51a44 --- /dev/null +++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch @@ -0,0 +1,45 @@ +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 14:12:59 -0800 +Subject: [PATCH] clock: Do not define own timespec + +timespec is provided by libc and its best left to libc +os_gettime takes a db_timespec and passed its address to clock_gettime +which assumes that db_timespec and timespec are same but actually +its 12-bytes here and libc has 16-bytes + +This can cause problems especially with 64bit time_t + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/dbinc/clock.h | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +--- a/src/dbinc/clock.h ++++ b/src/dbinc/clock.h +@@ -44,22 +44,8 @@ + extern "C" { + #endif + +-/* +- * This declaration is POSIX-compatible. Because there are lots of different +- * time.h include file patterns out there, it's easier to declare our own name +- * in all cases than to try and discover if a system has a struct timespec. +- * For the same reason, and because we'd have to #include in db.h, +- * we don't export any timespec structures in the DB API, even in places where +- * it would make sense, like the replication statistics information. +- */ +-typedef struct { +- time_t tv_sec; /* seconds */ +-#ifdef HAVE_MIXED_SIZE_ADDRESSING +- int32_t tv_nsec; +-#else +- long tv_nsec; /* nanoseconds */ +-#endif +-} db_timespec; ++#include ++#define db_timespec struct timespec + + /* Operations on timespecs */ + #undef timespecclear diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index a296905..badb79f 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -26,6 +26,7 @@ SRC_URI += "file://fix-parallel-build.patch \ file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ file://sequence-type.patch \ file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ + file://0001-clock-Do-not-define-own-timespec.patch \ " # We are not interested in official latest 6.x versions; # let's track what debian is using. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:22 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (fe35221 -> cdb5327) Message-ID: <158172272214.10101.4100879824121084041@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from fe35221 samba: upgrade 4.10.11 -> 4.10.13 new 92f7fdc libmimetic: Library to aid multi-part form data parsing new fb432a3 x265: add x265 recipe new 9d915d2 packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools new 29db1c8 ipmitool: fix CVE-2020-5208 new 22f0957 libiio: upgrade 0.18 -> 0.19 new e2bef05 ntfs-3g-ntfsprogs: Make it support usrmerge properly new d2517c9 cryptsetup: upgrade 2.2.2 -> 2.3.0 new 21da4d8 fio: upgrade 3.17 -> 3.18 new 6373ccb hwdata: upgrade 0.331 -> 0.332 new a3ae93c libdbi-perl: upgrade 1.642 -> 1.643 new d9b32ab libp11: upgrade 0.4.10 -> 11 new 4992b1f python3-bcrypt: consolidate inc and bb files into a single bb file new 7be06e6 python-beautifulsoup4: consolidate inc and bb files into a single bb file new ceaff7f python3-behave: consolidate inc and bb files into a single bb file new 15c3ced pcimem: add initial version 2.0 new 9ec49e3 python3-blinker: consolidate inc and bb files into a single bb file new 3bbea2e python3-booleanpy: consolidate inc and bb files into a single bb file new f135c1e spidev-test: Add initial version of recipe new c577cac python3-cachetools: consolidate inc and bb files into a single bb file new 89531af python3-can: consolidate inc and bb files into a single bb file new 0e54e07 python3-cassandra-driver: consolidate inc and bb files into a single bb file new 1baea80 python3-certifi: consolidate inc and bb files into a single bb file new 454ab27 python3-chardet: consolidate inc and bb files into a single bb file new 26be6b0 python3-click: consolidate inc and bb files into a single bb file new 918765f python3-cmd2: consolidate inc and bb files into a single bb file new cdb5327 python3-cffi: consolidate inc and bb files into a single bb file The 26 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../files/0001-Make-build-support-usrmerge.patch | 43 ------- .../ntfs-3g-ntfsprogs_2017.3.23.bb | 15 ++- .../fio/{fio_3.17.bb => fio_3.18.bb} | 2 +- .../packagegroups/packagegroup-meta-oe.bb | 1 - .../{cryptsetup_2.2.2.bb => cryptsetup_2.3.0.bb} | 4 +- meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | 17 +++ .../{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} | 4 +- ...1-fru-Fix-buffer-overflow-vulnerabilities.patch | 133 +++++++++++++++++++++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 1 + meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 29 +++++ meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- meta-oe/recipes-support/libiio/libiio_git.bb | 5 +- ...Removing-test-directory-from-the-Makefile.patch | 67 +++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 21 ++++ .../libp11/{libp11_0.4.10.bb => libp11_11.bb} | 2 +- .../recipes-multimedia/x265/x265_3.2.1.bb | 24 ++++ .../recipes-devtools/python/python-bcrypt.inc | 17 --- .../python/python-beautifulsoup4.inc | 17 --- .../recipes-devtools/python/python-behave.inc | 15 --- .../recipes-devtools/python/python-blinker.inc | 7 -- .../recipes-devtools/python/python-booleanpy.inc | 14 --- .../recipes-devtools/python/python-cachetools.inc | 16 --- meta-python/recipes-devtools/python/python-can.inc | 18 --- .../python/python-cassandra-driver.inc | 33 ----- .../recipes-devtools/python/python-certifi.inc | 13 -- .../recipes-devtools/python/python-cffi.inc | 17 --- .../recipes-devtools/python/python-chardet.inc | 23 ---- .../recipes-devtools/python/python-click.inc | 25 ---- .../recipes-devtools/python/python-cmd2.inc | 13 -- .../python/python3-bcrypt_3.1.7.bb | 19 ++- .../python/python3-beautifulsoup4_4.8.2.bb | 19 ++- .../python/python3-behave_1.2.6.bb | 17 ++- .../recipes-devtools/python/python3-blinker_1.4.bb | 8 +- .../python/python3-booleanpy_3.7.bb | 16 ++- .../python/python3-cachetools_4.0.0.bb | 18 ++- .../recipes-devtools/python/python3-can_3.3.2.bb | 17 ++- .../python/python3-cassandra-driver_3.14.0.bb | 35 +++++- .../python/python3-certifi_2019.11.28.bb | 15 ++- .../recipes-devtools/python/python3-cffi_1.14.0.bb | 19 ++- .../python/python3-chardet_3.0.4.bb | 29 ++++- .../recipes-devtools/python/python3-click_7.0.bb | 26 +++- .../recipes-devtools/python/python3-cmd2_0.9.23.bb | 20 +++- 42 files changed, 542 insertions(+), 316 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch rename meta-oe/recipes-benchmark/fio/{fio_3.17.bb => fio_3.18.bb} (96%) rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.2.2.bb => cryptsetup_2.3.0.bb} (96%) create mode 100644 meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb rename meta-oe/recipes-devtools/perl/{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} (92%) create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch create mode 100644 meta-oe/recipes-kernel/spidev-test/spidev-test.bb create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb rename meta-oe/recipes-support/libp11/{libp11_0.4.10.bb => libp11_11.bb} (93%) create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb delete mode 100644 meta-python/recipes-devtools/python/python-bcrypt.inc delete mode 100644 meta-python/recipes-devtools/python/python-beautifulsoup4.inc delete mode 100644 meta-python/recipes-devtools/python/python-behave.inc delete mode 100644 meta-python/recipes-devtools/python/python-blinker.inc delete mode 100644 meta-python/recipes-devtools/python/python-booleanpy.inc delete mode 100644 meta-python/recipes-devtools/python/python-cachetools.inc delete mode 100644 meta-python/recipes-devtools/python/python-can.inc delete mode 100644 meta-python/recipes-devtools/python/python-cassandra-driver.inc delete mode 100644 meta-python/recipes-devtools/python/python-certifi.inc delete mode 100644 meta-python/recipes-devtools/python/python-cffi.inc delete mode 100644 meta-python/recipes-devtools/python/python-chardet.inc delete mode 100644 meta-python/recipes-devtools/python/python-click.inc delete mode 100644 meta-python/recipes-devtools/python/python-cmd2.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:23 +0000 Subject: [oe-commits] [meta-openembedded] 01/26: libmimetic: Library to aid multi-part form data parsing In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232522.AD0F3232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 92f7fdca80517a59629ad144f5071175b9203b33 Author: asmitha AuthorDate: Thu Feb 13 14:49:50 2020 +0530 libmimetic: Library to aid multi-part form data parsing Mimetic library helps parsing the multi-part form data. This library can be used for scenarios that includes multi-part form data file uploads to the system. The patch file includes: i) The test directory is removed as there were errors (relocation errors) since the shared object files of libc++ and libc were not taken from the sysroot path but from the system's library path where the required version of the .so is not present. ii) The files 'mimetic/codec/other_codecs.h' and 'mimetic/contenttype.cxx' contains changes that resolves errors when compiling on target system aarch64-yoe-linux-musl. Signed-off-by: asmitha Signed-off-by: Khem Raj --- ...Removing-test-directory-from-the-Makefile.patch | 67 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 21 +++++++ 2 files changed, 88 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch new file mode 100644 index 0000000..50cd4d4 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch @@ -0,0 +1,67 @@ +From 64fd25af5fea3a3c9c12122a2fd0fab3cd420f72 Mon Sep 17 00:00:00 2001 +From: asmitk01-in +Date: Wed, 5 Feb 2020 00:14:42 -0600 +Subject: [PATCH] libmimetic: Removing test directory from the Makefile + +The test directory is removed as there were errors (relocation errors) +since the shared object files of libc++ and libc were not taken from the +sysroot path but from the system's library path where the required +version of the .so is not present. + +The files 'mimetic/codec/other_codecs.h' and 'mimetic/contenttype.cxx' +contains changes that resolves errors when compiling on target system +aarch64-yoe-linux-musl. + +Signed-off-by: asmitk01-in +Change-Id: I1822b36ad4a1fa5e7b165d8cac3a6e96aca11c35 +--- + Makefile.am | 2 +- + mimetic/codec/other_codecs.h | 4 ++++ + mimetic/contenttype.cxx | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 634bd4c..c7cbae7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST=LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc examples win32 + INCLUDES=-I$(top_srcdir) + ACLOCAL_AMFLAGS=-I m4 + +diff --git a/mimetic/codec/other_codecs.h b/mimetic/codec/other_codecs.h +index c4ccf3f..0fc88fd 100644 +--- a/mimetic/codec/other_codecs.h ++++ b/mimetic/codec/other_codecs.h +@@ -8,6 +8,10 @@ + #define _MIMETIC_CODEC_OTHER_CODECS_H_ + #include + ++#ifndef __GLIBC__ ++ typedef unsigned int uint; ++#endif ++ + namespace mimetic + { + +diff --git a/mimetic/contenttype.cxx b/mimetic/contenttype.cxx +index 522082d..0577d44 100644 +--- a/mimetic/contenttype.cxx ++++ b/mimetic/contenttype.cxx +@@ -13,6 +13,10 @@ + #include + #include + ++#ifndef __GLIBC__ ++ typedef unsigned int uint; ++#endif ++ + namespace mimetic + { + using namespace std; +-- +2.9.3 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb new file mode 100644 index 0000000..fd65db2 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -0,0 +1,21 @@ +# Released under the MIT license. + +SUMMARY = "Mimetic Library for multi-part parsing" +DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." +AUTHOR = "Stefano Barbato " +HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" +BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" + +SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" +SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ + file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ + " + +S = "${WORKDIR}/git" + +CXXFLAGS += "-Wno-narrowing" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:24 +0000 Subject: [oe-commits] [meta-openembedded] 02/26: x265: add x265 recipe In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232522.C729F232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fb432a3a772ffe2e9cf0fe23c66feabae4f01801 Author: William A. Kennington III via Openembedded-devel AuthorDate: Thu Feb 13 11:35:36 2020 -0800 x265: add x265 recipe Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../recipes-multimedia/x265/x265_3.2.1.bb | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb new file mode 100644 index 0000000..68c1a55 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre" + +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" + +S = "${WORKDIR}/x265_${PV}/source" + +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE_x86 = ".*" +COMPATIBLE_MACHINE_x86-64 = ".*" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:25 +0000 Subject: [oe-commits] [meta-openembedded] 03/26: packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232522.E2A76232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9d915d247eda0fbaedd016faa507e0a5ac130618 Author: Khem Raj AuthorDate: Thu Feb 13 23:54:06 2020 -0800 packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 777623b..bad4aa7 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -116,7 +116,6 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ mpich msgpack-c nlohmann-json openocd pax-utils \ ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ protobuf protobuf-c python3-distutils-extra \ - python-cpuset python-distutils-extra python-futures python-pygobject \ rapidjson serialcheck sip3 tclap uftrace uw-imap valijson \ xmlrpc-c yajl yasm \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:26 +0000 Subject: [oe-commits] [meta-openembedded] 04/26: ipmitool: fix CVE-2020-5208 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.0B1D7232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 29db1c8f9880989fa35f87f5cc307725cf3fbd17 Author: Wenlin Kang AuthorDate: Fri Feb 14 17:08:19 2020 +0800 ipmitool: fix CVE-2020-5208 Fix CVE-2020-5208 Signed-off-by: Wenlin Kang Signed-off-by: Khem Raj --- ...1-fru-Fix-buffer-overflow-vulnerabilities.patch | 133 +++++++++++++++++++++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 1 + 2 files changed, 134 insertions(+) diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch new file mode 100644 index 0000000..b65e3ef --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch @@ -0,0 +1,133 @@ +From e824c23316ae50beb7f7488f2055ac65e8b341f2 Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 16:33:59 +0000 +Subject: [PATCH] fru: Fix buffer overflow vulnerabilities + +Partial fix for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +The `read_fru_area_section` function only performs size validation of +requested read size, and falsely assumes that the IPMI message will not +respond with more than the requested amount of data; it uses the +unvalidated response size to copy into `frubuf`. If the response is +larger than the request, this can result in overflowing the buffer. + +The same issue affects the `read_fru_area` function. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2] +CVE: CVE-2020-5208 + +Signed-off-by: Wenlin Kang +--- + lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c +index c2a139d..2e323ff 100644 +--- a/lib/ipmi_fru.c ++++ b/lib/ipmi_fru.c +@@ -663,7 +663,10 @@ int + read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + uint32_t offset, uint32_t length, uint8_t *frubuf) + { +- uint32_t off = offset, tmp, finish; ++ uint32_t off = offset; ++ uint32_t tmp; ++ uint32_t finish; ++ uint32_t size_left_in_buffer; + struct ipmi_rs * rsp; + struct ipmi_rq req; + uint8_t msg_data[4]; +@@ -676,10 +679,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + + finish = offset + length; + if (finish > fru->size) { ++ memset(frubuf + fru->size, 0, length - fru->size); + finish = fru->size; + lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " + "Adjusting to %d", + offset + length, finish - offset); ++ length = finish - offset; + } + + memset(&req, 0, sizeof(req)); +@@ -715,6 +720,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + } + } + ++ size_left_in_buffer = length; + do { + tmp = fru->access ? off >> 1 : off; + msg_data[0] = id; +@@ -756,9 +762,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + } + + tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; ++ if(rsp->data_len < 1 ++ || tmp > rsp->data_len - 1 ++ || tmp > size_left_in_buffer) ++ { ++ printf(" Not enough buffer size"); ++ return -1; ++ } ++ + memcpy(frubuf, rsp->data + 1, tmp); + off += tmp; + frubuf += tmp; ++ size_left_in_buffer -= tmp; + /* sometimes the size returned in the Info command + * is too large. return 0 so higher level function + * still attempts to parse what was returned */ +@@ -791,7 +806,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + uint32_t offset, uint32_t length, uint8_t *frubuf) + { + static uint32_t fru_data_rqst_size = 20; +- uint32_t off = offset, tmp, finish; ++ uint32_t off = offset; ++ uint32_t tmp, finish; ++ uint32_t size_left_in_buffer; + struct ipmi_rs * rsp; + struct ipmi_rq req; + uint8_t msg_data[4]; +@@ -804,10 +821,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + + finish = offset + length; + if (finish > fru->size) { ++ memset(frubuf + fru->size, 0, length - fru->size); + finish = fru->size; + lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " + "Adjusting to %d", + offset + length, finish - offset); ++ length = finish - offset; + } + + memset(&req, 0, sizeof(req)); +@@ -822,6 +841,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + if (fru->access && fru_data_rqst_size > 16) + #endif + fru_data_rqst_size = 16; ++ ++ size_left_in_buffer = length; + do { + tmp = fru->access ? off >> 1 : off; + msg_data[0] = id; +@@ -853,8 +874,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + } + + tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; ++ if(rsp->data_len < 1 ++ || tmp > rsp->data_len - 1 ++ || tmp > size_left_in_buffer) ++ { ++ printf(" Not enough buffer size"); ++ return -1; ++ } + memcpy((frubuf + off)-offset, rsp->data + 1, tmp); + off += tmp; ++ size_left_in_buffer -= tmp; + + /* sometimes the size returned in the Info command + * is too large. return 0 so higher level function +-- +2.17.1 + diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb index b7f1aa9..500d5bd 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb @@ -24,6 +24,7 @@ DEPENDS = "openssl readline ncurses" SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \ file://0001-Migrate-to-openssl-1.1.patch \ + file://0001-fru-Fix-buffer-overflow-vulnerabilities.patch \ " SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3" SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:27 +0000 Subject: [oe-commits] [meta-openembedded] 05/26: libiio: upgrade 0.18 -> 0.19 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.17333232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 22f0957655ec8d1a95afe1d509b97865ccfc88d5 Author: Pierre-Jean Texier AuthorDate: Fri Feb 14 11:31:08 2020 +0000 libiio: upgrade 0.18 -> 0.19 See full changelog https://github.com/analogdevicesinc/libiio/releases/tag/v0.19 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-support/libiio/libiio_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index b53ba46..0586349 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,9 +4,8 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -# v0.18 + a single commit fixing the build -SRCREV = "5090603d01779bb1717fb0c50953330e8770550f" -PV = "0.18+git${SRCPV}" +SRCREV = "5f5af2e417129ad8f4e05fc5c1b730f0694dca12" +PV = "0.19+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:29 +0000 Subject: [oe-commits] [meta-openembedded] 07/26: cryptsetup: upgrade 2.2.2 -> 2.3.0 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.2BD5B232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d2517c9bdf4ebc3f0fec63580c93383041b03391 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:39 2020 -0800 cryptsetup: upgrade 2.2.2 -> 2.3.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../cryptsetup/{cryptsetup_2.2.2.bb => cryptsetup_2.3.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb similarity index 96% rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb index 479b9eb..0e36ed4 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "2b64ca9ea16e823df359eacf9c02414b" -SRC_URI[sha256sum] = "2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46" +SRC_URI[md5sum] = "48be3bd7c557d051f638047d280e93ee" +SRC_URI[sha256sum] = "395690de99509428354d3cd15cf023bed01487e6f1565b2181e013dc847bbc85" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:28 +0000 Subject: [oe-commits] [meta-openembedded] 06/26: ntfs-3g-ntfsprogs: Make it support usrmerge properly In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.21286232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e2bef05d90cc421cb7ae0762b4154efd9b900539 Author: Peter Kjellerstedt AuthorDate: Fri Feb 14 17:42:52 2020 +0100 ntfs-3g-ntfsprogs: Make it support usrmerge properly An attempt to solve the problem that some files are installed to /sbin even though the usrmerge distro feature is enabled was made in commit 97c0af59 ("ntfs-3g-ntfsprogs: support usrmerge"). However, it merely just removed the problematic files, which meant that the package was rendered unusable. Solve the problem properly by moving all files that are installed in /sbin to ${base_sbindir} instead. Also clear up a cryptic comment. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- .../files/0001-Make-build-support-usrmerge.patch | 43 ---------------------- .../ntfs-3g-ntfsprogs_2017.3.23.bb | 15 ++++++-- 2 files changed, 11 insertions(+), 47 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch deleted file mode 100644 index fce10b9..0000000 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 29 Aug 2019 10:21:58 +0800 -Subject: [PATCH] Make build support usrmerge - -Upstream-Status: Inappropriate[oe-specific] - -Signed-off-by: Changqing Li ---- - ntfsprogs/Makefile.am | 2 -- - src/Makefile.am | 3 --- - 2 files changed, 5 deletions(-) - -diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am -index f4f9d1b..1f6a673 100644 ---- a/ntfsprogs/Makefile.am -+++ b/ntfsprogs/Makefile.am -@@ -165,8 +165,6 @@ extras: libs $(EXTRA_PROGRAMS) - - if ENABLE_MOUNT_HELPER - install-exec-hook: -- $(INSTALL) -d $(DESTDIR)/sbin -- $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs - - install-data-hook: - $(INSTALL) -d $(DESTDIR)$(man8dir) -diff --git a/src/Makefile.am b/src/Makefile.am -index 8d98408..d0a6a45 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -66,9 +66,6 @@ endif - - if ENABLE_MOUNT_HELPER - install-exec-local: install-rootbinPROGRAMS -- $(MKDIR_P) "$(DESTDIR)/sbin" -- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" -- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" - - install-data-local: install-man8 - $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" --- -2.7.4 - diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index 1559bfd..6f5cb6c 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-Make-build-support-usrmerge.patch','',d)} \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" @@ -35,10 +34,18 @@ FILES_ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*" FILES_libntfs-3g = "${libdir}/*${SOLIBS}" do_install_append() { - # Standard mount will execute the program /sbin/mount.TYPE - # when called. Add the symbolic to let mount could find ntfs. - ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs + # Standard mount will execute the program /sbin/mount.TYPE when called. + # Add a symbolic link to let mount find ntfs. + ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs rmdir ${D}${libdir}/ntfs-3g + + # Handle when usrmerge is in effect. Some files are installed to /sbin + # regardless of the value of ${base_sbindir}. + if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then + mkdir -p ${D}${base_sbindir} + mv ${D}/sbin/* ${D}${base_sbindir} + rmdir ${D}/sbin + fi } # Satisfy the -dev runtime dependency -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:30 +0000 Subject: [oe-commits] [meta-openembedded] 08/26: fio: upgrade 3.17 -> 3.18 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.36C02232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 21da4d869d99d9846db51cf4b8128a6d0b17c531 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:40 2020 -0800 fio: upgrade 3.17 -> 3.18 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/{fio_3.17.bb => fio_3.18.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.18.bb similarity index 96% rename from meta-oe/recipes-benchmark/fio/fio_3.17.bb rename to meta-oe/recipes-benchmark/fio/fio_3.18.bb index 482928c..b648429 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.18.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" +SRCREV = "ac694f66968fe7b18c820468abd8333f3df333fb" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:31 +0000 Subject: [oe-commits] [meta-openembedded] 09/26: hwdata: upgrade 0.331 -> 0.332 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.4087A232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6373ccb8e88a62b98a9720a83334a1e0adc6cafd Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:41 2020 -0800 hwdata: upgrade 0.331 -> 0.332 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index e63838f..77bb60a 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.331" -SRCREV = "337be5f6acbe15aa06063914e1fd25d49a05523b" +PV = "0.332" +SRCREV = "17cc5d636a559ae1073865846980e4db35f7989a" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:32 +0000 Subject: [oe-commits] [meta-openembedded] 10/26: libdbi-perl: upgrade 1.642 -> 1.643 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.4C8CE232A64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a3ae93c89566f33711576e0aae33c6288deba105 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:42 2020 -0800 libdbi-perl: upgrade 1.642 -> 1.643 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../perl/{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb similarity index 92% rename from meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb rename to meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb index 7532b3f..75fad46 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb @@ -10,8 +10,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" -SRC_URI[md5sum] = "f2ba18b5cea1c8cb322a62be0a847f3d" -SRC_URI[sha256sum] = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d" +SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398" +SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa" S = "${WORKDIR}/DBI-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:33 +0000 Subject: [oe-commits] [meta-openembedded] 11/26: libp11: upgrade 0.4.10 -> 11 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.5911C232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d9b32ab93dfce633ced45c238a6700e4c387f095 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:43 2020 -0800 libp11: upgrade 0.4.10 -> 11 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/libp11/{libp11_0.4.10.bb => libp11_11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-oe/recipes-support/libp11/libp11_11.bb similarity index 93% rename from meta-oe/recipes-support/libp11/libp11_0.4.10.bb rename to meta-oe/recipes-support/libp11/libp11_11.bb index 655db49..5a0951d 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-oe/recipes-support/libp11/libp11_11.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:34 +0000 Subject: [oe-commits] [meta-openembedded] 12/26: python3-bcrypt: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.656F2232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4992b1fce99ebb1162e8935ca8e46efc54d25aba Author: Derek Straka AuthorDate: Fri Feb 14 13:45:18 2020 -0500 python3-bcrypt: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-bcrypt.inc | 17 ----------------- .../recipes-devtools/python/python3-bcrypt_3.1.7.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-bcrypt.inc b/meta-python/recipes-devtools/python/python-bcrypt.inc deleted file mode 100644 index a264003..0000000 --- a/meta-python/recipes-devtools/python/python-bcrypt.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Modern password hashing for your software and your servers." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" - -DEPENDS += "${PYTHON_PN}-cffi-native" - -SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" -SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" - -inherit pypi - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-six \ -" diff --git a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb index d2ec9e3..0f2d31f 100644 --- a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb +++ b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-bcrypt.inc +DESCRIPTION = "Modern password hashing for your software and your servers." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" + +DEPENDS += "${PYTHON_PN}-cffi-native" + +SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" +SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-six \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:37 +0000 Subject: [oe-commits] [meta-openembedded] 15/26: pcimem: add initial version 2.0 In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.8B700232A66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 15c3ced71129efb8020bf80c65b9fd17c1dda7e1 Author: Randy Schacher AuthorDate: Fri Feb 14 11:07:46 2020 -0800 pcimem: add initial version 2.0 Initial revision from 09724edb1783a98da2b7ae53c5aaa87493aabc9b Reviewed-by: Jonathan Richardson Reviewed-by: Randy Schacher Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb new file mode 100644 index 0000000..107d5a8 --- /dev/null +++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Simple program to read & write to a pci device from userspace" +HOMEPAGE = "https://github.com/billfarrow/pcimem" +BUGTRACKER = "https://github.com/billfarrow/pcimem/issues" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +COMPATIBLE_HOST = "(x86_64|aarch64|arm)" + +SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" +SRC_URI = "git://github.com/billfarrow/pcimem.git " + +S = "${WORKDIR}/git" + +do_install() { + install -D -m 0755 ${B}/pcimem ${D}${bindir}/pcimem +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:39 +0000 Subject: [oe-commits] [meta-openembedded] 17/26: python3-booleanpy: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.A0E78232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3bbea2ebd05095da5f3da6d37c871cbdf8480f06 Author: Derek Straka AuthorDate: Fri Feb 14 14:44:14 2020 -0500 python3-booleanpy: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-booleanpy.inc | 14 -------------- .../recipes-devtools/python/python3-booleanpy_3.7.bb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-booleanpy.inc b/meta-python/recipes-devtools/python/python-booleanpy.inc deleted file mode 100644 index 335d7d3..0000000 --- a/meta-python/recipes-devtools/python/python-booleanpy.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" -HOMEPAGE = "https://github.com/bastikr/boolean.py" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319747a5eb94cddf646037c01ddba47" - -SRC_URI[md5sum] = "1189d115a38f84f5df743014926a9159" -SRC_URI[sha256sum] = "bd19b412435611ecc712603d0fd7d0e280e24698e7a6e3d5f610473870c5dd1e" - -PYPI_PACKAGE = "boolean.py" - -inherit pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb b/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb index 5f8602d..ebf7ba4 100644 --- a/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb +++ b/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb @@ -1,2 +1,14 @@ -inherit setuptools3 -require python-booleanpy.inc +SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" +HOMEPAGE = "https://github.com/bastikr/boolean.py" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319747a5eb94cddf646037c01ddba47" + +SRC_URI[md5sum] = "1189d115a38f84f5df743014926a9159" +SRC_URI[sha256sum] = "bd19b412435611ecc712603d0fd7d0e280e24698e7a6e3d5f610473870c5dd1e" + +PYPI_PACKAGE = "boolean.py" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:40 +0000 Subject: [oe-commits] [meta-openembedded] 18/26: spidev-test: Add initial version of recipe In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.AE1B4232A68@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f135c1e500eac0e86b99a5e2b84d1baaf644f6c7 Author: Arun Parameswaran AuthorDate: Fri Feb 14 11:44:20 2020 -0800 spidev-test: Add initial version of recipe Allows for testing SPI interface using spidev driver and is part of the kernel tools. Signed-off-by: Arun Parameswaran Reviewed-by: Jonathan Richardson Tested-by: Jonathan Richardson Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb new file mode 100644 index 0000000..6626302 --- /dev/null +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -0,0 +1,29 @@ +SUMMARY = "Test SPI devices" +DESCRIPTION = "SPI testing utility using the spidev driver" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +PROVIDES = "virtual/spidev-test" + +inherit bash-completion kernelsrc kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +EXTRA_OEMAKE = "-C ${S}/tools/spi O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +python do_package_prepend() { + d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) +} + +B = "${WORKDIR}/${BPN}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:42 +0000 Subject: [oe-commits] [meta-openembedded] 20/26: python3-can: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.C4C21232A62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 89531af4436ebefab3494b37e632b9f3e4c754de Author: Derek Straka AuthorDate: Fri Feb 14 14:56:19 2020 -0500 python3-can: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-can.inc | 18 ------------------ .../recipes-devtools/python/python3-can_3.3.2.bb | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-can.inc b/meta-python/recipes-devtools/python/python-can.inc deleted file mode 100644 index 7d0100d..0000000 --- a/meta-python/recipes-devtools/python/python-can.inc +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Controller Area Network (CAN) interface module for Python" -SECTION = "devel/python" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" -SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" - -PYPI_PACKAGE="python-can" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-wrapt \ -" diff --git a/meta-python/recipes-devtools/python/python3-can_3.3.2.bb b/meta-python/recipes-devtools/python/python3-can_3.3.2.bb index aaa9e81..4597795 100644 --- a/meta-python/recipes-devtools/python/python3-can_3.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-can_3.3.2.bb @@ -1,7 +1,22 @@ -require python-can.inc +SUMMARY = "Controller Area Network (CAN) interface module for Python" +SECTION = "devel/python" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" +SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" + +PYPI_PACKAGE="python-can" + inherit pypi setuptools3 RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-codecs \ ${PYTHON_PN}-compression \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-sqlite3 \ + ${PYTHON_PN}-wrapt \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:41 +0000 Subject: [oe-commits] [meta-openembedded] 19/26: python3-cachetools: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.B8B00232A60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c577cacf88b1b0e8542e9a1b1081b8c55ec2aa3a Author: Derek Straka AuthorDate: Fri Feb 14 14:47:39 2020 -0500 python3-cachetools: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-cachetools.inc | 16 ---------------- .../python/python3-cachetools_4.0.0.bb | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cachetools.inc b/meta-python/recipes-devtools/python/python-cachetools.inc deleted file mode 100644 index f3d3bc6..0000000 --- a/meta-python/recipes-devtools/python/python-cachetools.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Extensible memoizing collections and decorators" -HOMEPAGE = "https://github.com/tkem/cachetools" -DESCRIPTION = "This module provides various memoizing \ -collections and decorators, including variants of the \ -Python 3 Standard Library @lru_cache function decorator." -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5" - -inherit pypi - -SRC_URI[md5sum] = "6a88df13467e80eb61dd2bedad19b83c" -SRC_URI[sha256sum] = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb b/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb index 76b2f67..50d0f25 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-cachetools.inc +SUMMARY = "Extensible memoizing collections and decorators" +HOMEPAGE = "https://github.com/tkem/cachetools" +DESCRIPTION = "This module provides various memoizing \ +collections and decorators, including variants of the \ +Python 3 Standard Library @lru_cache function decorator." +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "6a88df13467e80eb61dd2bedad19b83c" +SRC_URI[sha256sum] = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:35 +0000 Subject: [oe-commits] [meta-openembedded] 13/26: python-beautifulsoup4: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.71B93232A5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7be06e671c78229c84f6cb22616c9d10d821f6ad Author: Derek Straka AuthorDate: Fri Feb 14 13:53:45 2020 -0500 python-beautifulsoup4: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-beautifulsoup4.inc | 17 ----------------- .../python/python3-beautifulsoup4_4.8.2.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-beautifulsoup4.inc b/meta-python/recipes-devtools/python/python-beautifulsoup4.inc deleted file mode 100644 index 3e95bb7..0000000 --- a/meta-python/recipes-devtools/python/python-beautifulsoup4.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Screen-scraping library" -HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" - -SRC_URI[md5sum] = "5dbdb56c009e4632bae7bed1b385804b" -SRC_URI[sha256sum] = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a" - -inherit pypi - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-html5lib \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-soupsieve \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb index d98df11..63fbd09 100644 --- a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb +++ b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-beautifulsoup4.inc +SUMMARY = "Screen-scraping library" +HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" + +SRC_URI[md5sum] = "5dbdb56c009e4632bae7bed1b385804b" +SRC_URI[sha256sum] = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-html5lib \ + ${PYTHON_PN}-lxml \ + ${PYTHON_PN}-soupsieve \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:36 +0000 Subject: [oe-commits] [meta-openembedded] 14/26: python3-behave: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.7F1D5232A65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ceaff7f5c99bf0ff388f4d7a14b20298601c5791 Author: Derek Straka AuthorDate: Fri Feb 14 13:57:24 2020 -0500 python3-behave: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-behave.inc | 15 --------------- .../recipes-devtools/python/python3-behave_1.2.6.bb | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-behave.inc b/meta-python/recipes-devtools/python/python-behave.inc deleted file mode 100644 index ded7580..0000000 --- a/meta-python/recipes-devtools/python/python-behave.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "A behavior-driven development framework, Python style" -HOMEPAGE = "https://github.com/behave/behave" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" - -SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" -SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-parse-type \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - " diff --git a/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb b/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb index 1c55871..a28e527 100644 --- a/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb +++ b/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb @@ -1,2 +1,15 @@ -inherit setuptools3 -require python-behave.inc +SUMMARY = "A behavior-driven development framework, Python style" +HOMEPAGE = "https://github.com/behave/behave" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" + +SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" +SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-parse-type \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:44 +0000 Subject: [oe-commits] [meta-openembedded] 22/26: python3-certifi: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.DBD36232A5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1baea80ea6d4a5f39ef63087163434a697fd91a0 Author: Derek Straka AuthorDate: Fri Feb 14 17:35:27 2020 -0500 python3-certifi: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-certifi.inc | 13 ------------- .../recipes-devtools/python/python3-certifi_2019.11.28.bb | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-certifi.inc b/meta-python/recipes-devtools/python/python-certifi.inc deleted file mode 100644 index 98fa1f2..0000000 --- a/meta-python/recipes-devtools/python/python-certifi.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Python package for providing Mozilla's CA Bundle." -DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ -Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ -which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." -HOMEPAGE = " http://certifi.io/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" - -SRC_URI[md5sum] = "4d5229c4d9f0a4a79106f9e2c2cfd381" -SRC_URI[sha256sum] = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb b/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb index 70f674b..c9e945f 100644 --- a/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb +++ b/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb @@ -1,2 +1,15 @@ +SUMMARY = "Python package for providing Mozilla's CA Bundle." +DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ +Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ +which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." +HOMEPAGE = " http://certifi.io/" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" + +SRC_URI[md5sum] = "4d5229c4d9f0a4a79106f9e2c2cfd381" +SRC_URI[sha256sum] = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + inherit pypi setuptools3 -require python-certifi.inc + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:38 +0000 Subject: [oe-commits] [meta-openembedded] 16/26: python3-blinker: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.94C37232A67@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9ec49e371d712ba8a53f4bffd278df27ad18b58f Author: Derek Straka AuthorDate: Fri Feb 14 14:13:55 2020 -0500 python3-blinker: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-blinker.inc | 7 ------- meta-python/recipes-devtools/python/python3-blinker_1.4.bb | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-blinker.inc b/meta-python/recipes-devtools/python/python-blinker.inc deleted file mode 100644 index eaf3908..0000000 --- a/meta-python/recipes-devtools/python/python-blinker.inc +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=946d7e89af6f7733aeaebed5635d2682" - -SRC_URI[md5sum] = "8b3722381f83c2813c52de3016b68d33" -SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" - diff --git a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb index 924b3cf..e2f76c3 100644 --- a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb +++ b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb @@ -1,2 +1,8 @@ +DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=946d7e89af6f7733aeaebed5635d2682" + +SRC_URI[md5sum] = "8b3722381f83c2813c52de3016b68d33" +SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" + inherit pypi setuptools3 -require python-blinker.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:45 +0000 Subject: [oe-commits] [meta-openembedded] 23/26: python3-chardet: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.E726B232A5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 454ab2728780042ed7b270e07f6825b6bd9dfe43 Author: Derek Straka AuthorDate: Fri Feb 14 17:48:02 2020 -0500 python3-chardet: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-chardet.inc | 23 ----------------- .../python/python3-chardet_3.0.4.bb | 29 +++++++++++++++++----- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-chardet.inc b/meta-python/recipes-devtools/python/python-chardet.inc deleted file mode 100644 index 6305299..0000000 --- a/meta-python/recipes-devtools/python/python-chardet.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Universal encoding detector for Python 2 and 3" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" - -inherit pypi - -# setup.py of chardet needs this. -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" -SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES =+ "${PN}-cli" -RDEPENDS_${PN}-cli = "${PN} " -FILES_${PN}-cli += " \ - ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ -" - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-logging \ -" diff --git a/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb b/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb index 38d8122..80785b8 100644 --- a/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb @@ -1,7 +1,24 @@ -inherit setuptools3 -require python-chardet.inc +SUMMARY = "Universal encoding detector for Python 2 and 3" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" -do_install_append () { - # rename scripts that would conflict with the Python 2 build of chardet - mv ${D}${bindir}/chardetect ${D}${bindir}/chardetect3 -} +SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" +SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" + +# setup.py of chardet needs this. +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-cli" +FILES_${PN}-cli += " \ + ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ +" + +RDEPENDS_${PN}-cli = "${PN} " + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-logging \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:43 +0000 Subject: [oe-commits] [meta-openembedded] 21/26: python3-cassandra-driver: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.D1625232A5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0e54e075f7c399f03dfa1d6e8ed7ad812ba1cd49 Author: Derek Straka AuthorDate: Fri Feb 14 17:33:46 2020 -0500 python3-cassandra-driver: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-cassandra-driver.inc | 33 -------------------- .../python/python3-cassandra-driver_3.14.0.bb | 35 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cassandra-driver.inc b/meta-python/recipes-devtools/python/python-cassandra-driver.inc deleted file mode 100644 index 53ebfec..0000000 --- a/meta-python/recipes-devtools/python/python-cassandra-driver.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "DataStax Python Driver for Apache Cassandra" -DESCRIPTION = "A modern, feature-rich and highly-tunable Python client \ -library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using \ -exclusively Cassandra's binary protocol and Cassandra Query Language v3." -HOMEPAGE = "https://github.com/datastax/python-driver" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -SRCNAME = "cassandra-driver" - -SRC_URI[md5sum] = "c5bed026bf48c821424c1f6296193908" -SRC_URI[sha256sum] = "b65218e2582277f5b77d1436e420db8616f63e3437a9e839cdcd7172d760e861" - -DISTUTILS_BUILD_ARGS += " \ - --no-libev \ -" -DISTUTILS_INSTALL_ARGS += " \ - --no-libev \ -" - -inherit pypi - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-cython \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-json \ - libevent \ -" - -DEPENDS += "\ - ${PYTHON_PN}-cython \ -" diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb index 34f149d..768e557 100644 --- a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb @@ -1,8 +1,35 @@ -inherit setuptools3 -require python-cassandra-driver.inc +SUMMARY = "DataStax Python Driver for Apache Cassandra" +DESCRIPTION = "A modern, feature-rich and highly-tunable Python client \ +library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using \ +exclusively Cassandra's binary protocol and Cassandra Query Language v3." +HOMEPAGE = "https://github.com/datastax/python-driver" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +SRCNAME = "cassandra-driver" -# Requires concurrent which is currently in -misc -RDEPENDS_${PN} += " \ +SRC_URI[md5sum] = "c5bed026bf48c821424c1f6296193908" +SRC_URI[sha256sum] = "b65218e2582277f5b77d1436e420db8616f63e3437a9e839cdcd7172d760e861" + +DISTUTILS_BUILD_ARGS += " \ + --no-libev \ +" +DISTUTILS_INSTALL_ARGS += " \ + --no-libev \ +" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-cython \ + ${PYTHON_PN}-json \ ${PYTHON_PN}-misc \ + ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-six \ + libevent \ +" + +DEPENDS += "\ + ${PYTHON_PN}-cython \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:47 +0000 Subject: [oe-commits] [meta-openembedded] 25/26: python3-cmd2: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232524.08F71232A63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 918765f5b6ce59a98b86cc5d5fb384d7f34a91e8 Author: Derek Straka AuthorDate: Fri Feb 14 17:56:59 2020 -0500 python3-cmd2: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cmd2.inc | 13 ------------- .../recipes-devtools/python/python3-cmd2_0.9.23.bb | 20 ++++++++++++++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-python/recipes-devtools/python/python-cmd2.inc deleted file mode 100644 index 68381ad..0000000 --- a/meta-python/recipes-devtools/python/python-cmd2.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "http://packages.python.org/cmd2/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" - -SRC_URI[md5sum] = "6db66a06210d5f1edb44693b887ed62b" -SRC_URI[sha256sum] = "8ad12ef3cc46d03073c545b6e80a3f84a5921f6653073a60e7d9a7ff3b352c9e" - -inherit pypi - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb index f5c5c7e..a2bf0c4 100644 --- a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb +++ b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb @@ -1,9 +1,21 @@ -inherit setuptools3 -require python-cmd2.inc +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "http://packages.python.org/cmd2/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "6db66a06210d5f1edb44693b887ed62b" +SRC_URI[sha256sum] = "8ad12ef3cc46d03073c545b6e80a3f84a5921f6653073a60e7d9a7ff3b352c9e" + +inherit pypi setuptools3 RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-colorama \ ${PYTHON_PN}-pyperclip \ ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-attrs \ ${PYTHON_PN}-wcwidth \ - " +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:48 +0000 Subject: [oe-commits] [meta-openembedded] 26/26: python3-cffi: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232524.15E88232A5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cdb532734b5e35f81c3bff31d8f4b0a99a5647be Author: Derek Straka AuthorDate: Fri Feb 14 18:08:19 2020 -0500 python3-cffi: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cffi.inc | 17 ----------------- .../recipes-devtools/python/python3-cffi_1.14.0.bb | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cffi.inc b/meta-python/recipes-devtools/python/python-cffi.inc deleted file mode 100644 index af10c5f..0000000 --- a/meta-python/recipes-devtools/python/python-cffi.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Foreign Function Interface for Python calling C code" -HOMEPAGE = "http://cffi.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" -DEPENDS += "libffi ${PYTHON_PN}-pycparser" - -SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" -SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" - -RDEPENDS_${PN}_class-target = " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb index e888084..53c8ee2 100644 --- a/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb @@ -1,2 +1,19 @@ +SUMMARY = "Foreign Function Interface for Python calling C code" +HOMEPAGE = "http://cffi.readthedocs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" +DEPENDS += "libffi ${PYTHON_PN}-pycparser" + +SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" +SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" + inherit pypi setuptools3 -require python-cffi.inc + +RDEPENDS_${PN}_class-target = " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pycparser \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 14 23:25:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 14 Feb 2020 23:25:46 +0000 Subject: [oe-commits] [meta-openembedded] 24/26: python3-click: consolidate inc and bb files into a single bb file In-Reply-To: <158172272214.10101.4100879824121084041@git.openembedded.org> References: <158172272214.10101.4100879824121084041@git.openembedded.org> Message-ID: <20200214232523.F0D44232A61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 26be6b05ba9d85c907b32456239320730607f32d Author: Derek Straka AuthorDate: Fri Feb 14 17:52:06 2020 -0500 python3-click: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-click.inc | 25 --------------------- .../recipes-devtools/python/python3-click_7.0.bb | 26 +++++++++++++++++++++- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-click.inc b/meta-python/recipes-devtools/python/python-click.inc deleted file mode 100644 index f9dfd56..0000000 --- a/meta-python/recipes-devtools/python/python-click.inc +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A simple wrapper around optparse for powerful command line utilities." -DESCRIPTION = "\ -Click is a Python package for creating beautiful command line interfaces \ -in a composable way with as little code as necessary. It's the "Command \ -Line Interface Creation Kit". It's highly configurable but comes with \ -sensible defaults out of the box." -HOMEPAGE = "http://click.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" - -SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" -SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" - -UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" - -CLEANBROKEN = "1" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-threading \ - " - -BBCLASSEXTEND = "native nativesdk" - -PYPI_PACKAGE = "Click" diff --git a/meta-python/recipes-devtools/python/python3-click_7.0.bb b/meta-python/recipes-devtools/python/python3-click_7.0.bb index 1920644..cfa3e0f 100644 --- a/meta-python/recipes-devtools/python/python3-click_7.0.bb +++ b/meta-python/recipes-devtools/python/python3-click_7.0.bb @@ -1,2 +1,26 @@ +SUMMARY = "A simple wrapper around optparse for powerful command line utilities." +DESCRIPTION = "\ +Click is a Python package for creating beautiful command line interfaces \ +in a composable way with as little code as necessary. It's the "Command \ +Line Interface Creation Kit". It's highly configurable but comes with \ +sensible defaults out of the box." +HOMEPAGE = "http://click.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" + +SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" +SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" + +PYPI_PACKAGE = "Click" inherit pypi setuptools3 -require python-click.inc + +UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-threading \ + " + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:46 +0000 Subject: [oe-commits] [meta-openembedded] 01/30: packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011645.C2653232808@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 74b3646ce7edfb8c0fc21b270da483c243474f54 Author: Khem Raj AuthorDate: Thu Feb 13 23:54:06 2020 -0800 packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 777623b..bad4aa7 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -116,7 +116,6 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ mpich msgpack-c nlohmann-json openocd pax-utils \ ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ protobuf protobuf-c python3-distutils-extra \ - python-cpuset python-distutils-extra python-futures python-pygobject \ rapidjson serialcheck sip3 tclap uftrace uw-imap valijson \ xmlrpc-c yajl yasm \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:45 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (cdb5327 -> 37bef41) Message-ID: <158172940539.22614.1306210393488482718@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard cdb5327 python3-cffi: consolidate inc and bb files into a single bb file discard 918765f python3-cmd2: consolidate inc and bb files into a single bb file discard 26be6b0 python3-click: consolidate inc and bb files into a single bb file discard 454ab27 python3-chardet: consolidate inc and bb files into a single bb file discard 1baea80 python3-certifi: consolidate inc and bb files into a single bb file discard 0e54e07 python3-cassandra-driver: consolidate inc and bb files into a single bb file discard 89531af python3-can: consolidate inc and bb files into a single bb file discard c577cac python3-cachetools: consolidate inc and bb files into a single bb file discard f135c1e spidev-test: Add initial version of recipe discard 3bbea2e python3-booleanpy: consolidate inc and bb files into a single bb file discard 9ec49e3 python3-blinker: consolidate inc and bb files into a single bb file discard 15c3ced pcimem: add initial version 2.0 discard ceaff7f python3-behave: consolidate inc and bb files into a single bb file discard 7be06e6 python-beautifulsoup4: consolidate inc and bb files into a single bb file discard 4992b1f python3-bcrypt: consolidate inc and bb files into a single bb file discard d9b32ab libp11: upgrade 0.4.10 -> 11 discard a3ae93c libdbi-perl: upgrade 1.642 -> 1.643 discard 6373ccb hwdata: upgrade 0.331 -> 0.332 discard 21da4d8 fio: upgrade 3.17 -> 3.18 discard d2517c9 cryptsetup: upgrade 2.2.2 -> 2.3.0 discard e2bef05 ntfs-3g-ntfsprogs: Make it support usrmerge properly discard 22f0957 libiio: upgrade 0.18 -> 0.19 discard 29db1c8 ipmitool: fix CVE-2020-5208 discard 9d915d2 packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools discard fb432a3 x265: add x265 recipe new 74b3646 packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools new f3f8add ipmitool: fix CVE-2020-5208 new 69c0e0d libiio: upgrade 0.18 -> 0.19 new ba3e922 ntfs-3g-ntfsprogs: Make it support usrmerge properly new 59ceb3f cryptsetup: upgrade 2.2.2 -> 2.3.0 new 07030ea fio: upgrade 3.17 -> 3.18 new 69ef87a hwdata: upgrade 0.331 -> 0.332 new ba534c6 libdbi-perl: upgrade 1.642 -> 1.643 new 492f913 libp11: upgrade 0.4.10 -> 11 new eec3ad0 python3-bcrypt: consolidate inc and bb files into a single bb file new 2389125 python-beautifulsoup4: consolidate inc and bb files into a single bb file new 5254bc7 python3-behave: consolidate inc and bb files into a single bb file new 62c8b8a pcimem: add initial version 2.0 new db0438f python3-blinker: consolidate inc and bb files into a single bb file new cd5b357 python3-booleanpy: consolidate inc and bb files into a single bb file new 291f288 spidev-test: Add initial version of recipe new c02bc08 python3-cachetools: consolidate inc and bb files into a single bb file new 236eaef python3-can: consolidate inc and bb files into a single bb file new bcb0373 python3-cassandra-driver: consolidate inc and bb files into a single bb file new a95be58 python3-certifi: consolidate inc and bb files into a single bb file new c99094d python3-chardet: consolidate inc and bb files into a single bb file new c600b31 python3-click: consolidate inc and bb files into a single bb file new 47336bb python3-cmd2: consolidate inc and bb files into a single bb file new 3b03380 python3-cffi: consolidate inc and bb files into a single bb file new 88fb8fb pytest-timeout: New package new d009e51 pytest-metadata: Add new package new e249b68 pytest-html: Add new package new 85ac8a0 phoronix-test-suite: add missing mime and mime-xdg inherit new 3d83bae x265: add x265 recipe new 37bef41 libmimetic: Fix ordrered comparision between pointer and zero This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cdb5327) \ N -- N -- N refs/heads/master-next (37bef41) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 30 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../phoronix-test-suite_9.2.1.bb | 2 +- ...ic-Check-for-MMAP_FAILED-return-from-mmap.patch | 49 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 1 + .../recipes-multimedia/x265/x265_3.2.1.bb | 4 +- .../python/python3-pytest-html_1.6.bb | 19 +++++++++ .../python/python3-pytest-metadata_1.8.0.bb | 15 +++++++ .../python/python3-pytest-timeout_1.3.4.bb | 13 ++++++ 7 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch create mode 100644 meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb create mode 100644 meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:48 +0000 Subject: [oe-commits] [meta-openembedded] 03/30: libiio: upgrade 0.18 -> 0.19 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011645.DEED423280A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 69c0e0d84282d16b9e33de744ce2876e29392f53 Author: Pierre-Jean Texier AuthorDate: Fri Feb 14 11:31:08 2020 +0000 libiio: upgrade 0.18 -> 0.19 See full changelog https://github.com/analogdevicesinc/libiio/releases/tag/v0.19 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-support/libiio/libiio_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index b53ba46..0586349 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,9 +4,8 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -# v0.18 + a single commit fixing the build -SRCREV = "5090603d01779bb1717fb0c50953330e8770550f" -PV = "0.18+git${SRCPV}" +SRCREV = "5f5af2e417129ad8f4e05fc5c1b730f0694dca12" +PV = "0.19+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:47 +0000 Subject: [oe-commits] [meta-openembedded] 02/30: ipmitool: fix CVE-2020-5208 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011645.CDEDE232809@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f3f8add488e7eb380b2f6f520c6bfd0406bfb89b Author: Wenlin Kang AuthorDate: Fri Feb 14 17:08:19 2020 +0800 ipmitool: fix CVE-2020-5208 Fix CVE-2020-5208 Signed-off-by: Wenlin Kang Signed-off-by: Khem Raj --- ...1-fru-Fix-buffer-overflow-vulnerabilities.patch | 133 +++++++++++++++++++++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 1 + 2 files changed, 134 insertions(+) diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch new file mode 100644 index 0000000..b65e3ef --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch @@ -0,0 +1,133 @@ +From e824c23316ae50beb7f7488f2055ac65e8b341f2 Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 16:33:59 +0000 +Subject: [PATCH] fru: Fix buffer overflow vulnerabilities + +Partial fix for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +The `read_fru_area_section` function only performs size validation of +requested read size, and falsely assumes that the IPMI message will not +respond with more than the requested amount of data; it uses the +unvalidated response size to copy into `frubuf`. If the response is +larger than the request, this can result in overflowing the buffer. + +The same issue affects the `read_fru_area` function. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2] +CVE: CVE-2020-5208 + +Signed-off-by: Wenlin Kang +--- + lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c +index c2a139d..2e323ff 100644 +--- a/lib/ipmi_fru.c ++++ b/lib/ipmi_fru.c +@@ -663,7 +663,10 @@ int + read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + uint32_t offset, uint32_t length, uint8_t *frubuf) + { +- uint32_t off = offset, tmp, finish; ++ uint32_t off = offset; ++ uint32_t tmp; ++ uint32_t finish; ++ uint32_t size_left_in_buffer; + struct ipmi_rs * rsp; + struct ipmi_rq req; + uint8_t msg_data[4]; +@@ -676,10 +679,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + + finish = offset + length; + if (finish > fru->size) { ++ memset(frubuf + fru->size, 0, length - fru->size); + finish = fru->size; + lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " + "Adjusting to %d", + offset + length, finish - offset); ++ length = finish - offset; + } + + memset(&req, 0, sizeof(req)); +@@ -715,6 +720,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + } + } + ++ size_left_in_buffer = length; + do { + tmp = fru->access ? off >> 1 : off; + msg_data[0] = id; +@@ -756,9 +762,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + } + + tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; ++ if(rsp->data_len < 1 ++ || tmp > rsp->data_len - 1 ++ || tmp > size_left_in_buffer) ++ { ++ printf(" Not enough buffer size"); ++ return -1; ++ } ++ + memcpy(frubuf, rsp->data + 1, tmp); + off += tmp; + frubuf += tmp; ++ size_left_in_buffer -= tmp; + /* sometimes the size returned in the Info command + * is too large. return 0 so higher level function + * still attempts to parse what was returned */ +@@ -791,7 +806,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + uint32_t offset, uint32_t length, uint8_t *frubuf) + { + static uint32_t fru_data_rqst_size = 20; +- uint32_t off = offset, tmp, finish; ++ uint32_t off = offset; ++ uint32_t tmp, finish; ++ uint32_t size_left_in_buffer; + struct ipmi_rs * rsp; + struct ipmi_rq req; + uint8_t msg_data[4]; +@@ -804,10 +821,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + + finish = offset + length; + if (finish > fru->size) { ++ memset(frubuf + fru->size, 0, length - fru->size); + finish = fru->size; + lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " + "Adjusting to %d", + offset + length, finish - offset); ++ length = finish - offset; + } + + memset(&req, 0, sizeof(req)); +@@ -822,6 +841,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + if (fru->access && fru_data_rqst_size > 16) + #endif + fru_data_rqst_size = 16; ++ ++ size_left_in_buffer = length; + do { + tmp = fru->access ? off >> 1 : off; + msg_data[0] = id; +@@ -853,8 +874,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, + } + + tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; ++ if(rsp->data_len < 1 ++ || tmp > rsp->data_len - 1 ++ || tmp > size_left_in_buffer) ++ { ++ printf(" Not enough buffer size"); ++ return -1; ++ } + memcpy((frubuf + off)-offset, rsp->data + 1, tmp); + off += tmp; ++ size_left_in_buffer -= tmp; + + /* sometimes the size returned in the Info command + * is too large. return 0 so higher level function +-- +2.17.1 + diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb index b7f1aa9..500d5bd 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb @@ -24,6 +24,7 @@ DEPENDS = "openssl readline ncurses" SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \ file://0001-Migrate-to-openssl-1.1.patch \ + file://0001-fru-Fix-buffer-overflow-vulnerabilities.patch \ " SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3" SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:49 +0000 Subject: [oe-commits] [meta-openembedded] 04/30: ntfs-3g-ntfsprogs: Make it support usrmerge properly In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011645.E9DFD23280B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ba3e92238b32e18c3df83952b5d4e4de60933d1e Author: Peter Kjellerstedt AuthorDate: Fri Feb 14 17:42:52 2020 +0100 ntfs-3g-ntfsprogs: Make it support usrmerge properly An attempt to solve the problem that some files are installed to /sbin even though the usrmerge distro feature is enabled was made in commit 97c0af59 ("ntfs-3g-ntfsprogs: support usrmerge"). However, it merely just removed the problematic files, which meant that the package was rendered unusable. Solve the problem properly by moving all files that are installed in /sbin to ${base_sbindir} instead. Also clear up a cryptic comment. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- .../files/0001-Make-build-support-usrmerge.patch | 43 ---------------------- .../ntfs-3g-ntfsprogs_2017.3.23.bb | 15 ++++++-- 2 files changed, 11 insertions(+), 47 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch deleted file mode 100644 index fce10b9..0000000 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 29 Aug 2019 10:21:58 +0800 -Subject: [PATCH] Make build support usrmerge - -Upstream-Status: Inappropriate[oe-specific] - -Signed-off-by: Changqing Li ---- - ntfsprogs/Makefile.am | 2 -- - src/Makefile.am | 3 --- - 2 files changed, 5 deletions(-) - -diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am -index f4f9d1b..1f6a673 100644 ---- a/ntfsprogs/Makefile.am -+++ b/ntfsprogs/Makefile.am -@@ -165,8 +165,6 @@ extras: libs $(EXTRA_PROGRAMS) - - if ENABLE_MOUNT_HELPER - install-exec-hook: -- $(INSTALL) -d $(DESTDIR)/sbin -- $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs - - install-data-hook: - $(INSTALL) -d $(DESTDIR)$(man8dir) -diff --git a/src/Makefile.am b/src/Makefile.am -index 8d98408..d0a6a45 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -66,9 +66,6 @@ endif - - if ENABLE_MOUNT_HELPER - install-exec-local: install-rootbinPROGRAMS -- $(MKDIR_P) "$(DESTDIR)/sbin" -- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" -- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" - - install-data-local: install-man8 - $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" --- -2.7.4 - diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index 1559bfd..6f5cb6c 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-Make-build-support-usrmerge.patch','',d)} \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" @@ -35,10 +34,18 @@ FILES_ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*" FILES_libntfs-3g = "${libdir}/*${SOLIBS}" do_install_append() { - # Standard mount will execute the program /sbin/mount.TYPE - # when called. Add the symbolic to let mount could find ntfs. - ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs + # Standard mount will execute the program /sbin/mount.TYPE when called. + # Add a symbolic link to let mount find ntfs. + ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs rmdir ${D}${libdir}/ntfs-3g + + # Handle when usrmerge is in effect. Some files are installed to /sbin + # regardless of the value of ${base_sbindir}. + if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then + mkdir -p ${D}${base_sbindir} + mv ${D}/sbin/* ${D}${base_sbindir} + rmdir ${D}/sbin + fi } # Satisfy the -dev runtime dependency -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:50 +0000 Subject: [oe-commits] [meta-openembedded] 05/30: cryptsetup: upgrade 2.2.2 -> 2.3.0 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.00D5D23280C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 59ceb3f122cbb0a83ec1d9425767221c295645f0 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:39 2020 -0800 cryptsetup: upgrade 2.2.2 -> 2.3.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../cryptsetup/{cryptsetup_2.2.2.bb => cryptsetup_2.3.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb similarity index 96% rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb index 479b9eb..0e36ed4 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "2b64ca9ea16e823df359eacf9c02414b" -SRC_URI[sha256sum] = "2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46" +SRC_URI[md5sum] = "48be3bd7c557d051f638047d280e93ee" +SRC_URI[sha256sum] = "395690de99509428354d3cd15cf023bed01487e6f1565b2181e013dc847bbc85" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:51 +0000 Subject: [oe-commits] [meta-openembedded] 06/30: fio: upgrade 3.17 -> 3.18 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.085B523280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 07030ea0e87a64c84b74faebf2620eefcf492d19 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:40 2020 -0800 fio: upgrade 3.17 -> 3.18 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/{fio_3.17.bb => fio_3.18.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.18.bb similarity index 96% rename from meta-oe/recipes-benchmark/fio/fio_3.17.bb rename to meta-oe/recipes-benchmark/fio/fio_3.18.bb index 482928c..b648429 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.18.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" +SRCREV = "ac694f66968fe7b18c820468abd8333f3df333fb" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:52 +0000 Subject: [oe-commits] [meta-openembedded] 07/30: hwdata: upgrade 0.331 -> 0.332 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.0FF3623280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 69ef87aefc1c2040da1f064559e70afbb79ac10f Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:41 2020 -0800 hwdata: upgrade 0.331 -> 0.332 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index e63838f..77bb60a 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.331" -SRCREV = "337be5f6acbe15aa06063914e1fd25d49a05523b" +PV = "0.332" +SRCREV = "17cc5d636a559ae1073865846980e4db35f7989a" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:53 +0000 Subject: [oe-commits] [meta-openembedded] 08/30: libdbi-perl: upgrade 1.642 -> 1.643 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.1821223280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ba534c669d261a6771566a11d3de33316eafc032 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:42 2020 -0800 libdbi-perl: upgrade 1.642 -> 1.643 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../perl/{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb similarity index 92% rename from meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb rename to meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb index 7532b3f..75fad46 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb @@ -10,8 +10,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" -SRC_URI[md5sum] = "f2ba18b5cea1c8cb322a62be0a847f3d" -SRC_URI[sha256sum] = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d" +SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398" +SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa" S = "${WORKDIR}/DBI-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:54 +0000 Subject: [oe-commits] [meta-openembedded] 09/30: libp11: upgrade 0.4.10 -> 11 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.211E0232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 492f913dae5a737825ab3f2ab84f99ece914ba67 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:43 2020 -0800 libp11: upgrade 0.4.10 -> 11 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/libp11/{libp11_0.4.10.bb => libp11_11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-oe/recipes-support/libp11/libp11_11.bb similarity index 93% rename from meta-oe/recipes-support/libp11/libp11_0.4.10.bb rename to meta-oe/recipes-support/libp11/libp11_11.bb index 655db49..5a0951d 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-oe/recipes-support/libp11/libp11_11.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:55 +0000 Subject: [oe-commits] [meta-openembedded] 10/30: python3-bcrypt: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.29956232814@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit eec3ad0261320d7ece2ee3dcf223e4a64e73a39a Author: Derek Straka AuthorDate: Fri Feb 14 13:45:18 2020 -0500 python3-bcrypt: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-bcrypt.inc | 17 ----------------- .../recipes-devtools/python/python3-bcrypt_3.1.7.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-bcrypt.inc b/meta-python/recipes-devtools/python/python-bcrypt.inc deleted file mode 100644 index a264003..0000000 --- a/meta-python/recipes-devtools/python/python-bcrypt.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Modern password hashing for your software and your servers." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" - -DEPENDS += "${PYTHON_PN}-cffi-native" - -SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" -SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" - -inherit pypi - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-six \ -" diff --git a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb index d2ec9e3..0f2d31f 100644 --- a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb +++ b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-bcrypt.inc +DESCRIPTION = "Modern password hashing for your software and your servers." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" + +DEPENDS += "${PYTHON_PN}-cffi-native" + +SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" +SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-six \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:56 +0000 Subject: [oe-commits] [meta-openembedded] 11/30: python-beautifulsoup4: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.32E2B232815@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 238912598942d2d1aa0af1f708bbbd5c878e7278 Author: Derek Straka AuthorDate: Fri Feb 14 13:53:45 2020 -0500 python-beautifulsoup4: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-beautifulsoup4.inc | 17 ----------------- .../python/python3-beautifulsoup4_4.8.2.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-beautifulsoup4.inc b/meta-python/recipes-devtools/python/python-beautifulsoup4.inc deleted file mode 100644 index 3e95bb7..0000000 --- a/meta-python/recipes-devtools/python/python-beautifulsoup4.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Screen-scraping library" -HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" - -SRC_URI[md5sum] = "5dbdb56c009e4632bae7bed1b385804b" -SRC_URI[sha256sum] = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a" - -inherit pypi - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-html5lib \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-soupsieve \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb index d98df11..63fbd09 100644 --- a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb +++ b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-beautifulsoup4.inc +SUMMARY = "Screen-scraping library" +HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" + +SRC_URI[md5sum] = "5dbdb56c009e4632bae7bed1b385804b" +SRC_URI[sha256sum] = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-html5lib \ + ${PYTHON_PN}-lxml \ + ${PYTHON_PN}-soupsieve \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:57 +0000 Subject: [oe-commits] [meta-openembedded] 12/30: python3-behave: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.3C26B232816@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5254bc7cd2f317b75397886c7ac6d1ac13c3b529 Author: Derek Straka AuthorDate: Fri Feb 14 13:57:24 2020 -0500 python3-behave: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-behave.inc | 15 --------------- .../recipes-devtools/python/python3-behave_1.2.6.bb | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-behave.inc b/meta-python/recipes-devtools/python/python-behave.inc deleted file mode 100644 index ded7580..0000000 --- a/meta-python/recipes-devtools/python/python-behave.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "A behavior-driven development framework, Python style" -HOMEPAGE = "https://github.com/behave/behave" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" - -SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" -SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-parse-type \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - " diff --git a/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb b/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb index 1c55871..a28e527 100644 --- a/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb +++ b/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb @@ -1,2 +1,15 @@ -inherit setuptools3 -require python-behave.inc +SUMMARY = "A behavior-driven development framework, Python style" +HOMEPAGE = "https://github.com/behave/behave" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" + +SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" +SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-parse-type \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:58 +0000 Subject: [oe-commits] [meta-openembedded] 13/30: pcimem: add initial version 2.0 In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.43CD0232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 62c8b8a2b6965bb66096c047d56bb9632cb8af46 Author: Randy Schacher AuthorDate: Fri Feb 14 11:07:46 2020 -0800 pcimem: add initial version 2.0 Initial revision from 09724edb1783a98da2b7ae53c5aaa87493aabc9b Reviewed-by: Jonathan Richardson Reviewed-by: Randy Schacher Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb new file mode 100644 index 0000000..107d5a8 --- /dev/null +++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Simple program to read & write to a pci device from userspace" +HOMEPAGE = "https://github.com/billfarrow/pcimem" +BUGTRACKER = "https://github.com/billfarrow/pcimem/issues" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +COMPATIBLE_HOST = "(x86_64|aarch64|arm)" + +SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" +SRC_URI = "git://github.com/billfarrow/pcimem.git " + +S = "${WORKDIR}/git" + +do_install() { + install -D -m 0755 ${B}/pcimem ${D}${bindir}/pcimem +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:16:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:16:59 +0000 Subject: [oe-commits] [meta-openembedded] 14/30: python3-blinker: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.4D710232808@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit db0438f37d96b36f6e8a9577f998a320d642d8ee Author: Derek Straka AuthorDate: Fri Feb 14 14:13:55 2020 -0500 python3-blinker: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-blinker.inc | 7 ------- meta-python/recipes-devtools/python/python3-blinker_1.4.bb | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-blinker.inc b/meta-python/recipes-devtools/python/python-blinker.inc deleted file mode 100644 index eaf3908..0000000 --- a/meta-python/recipes-devtools/python/python-blinker.inc +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=946d7e89af6f7733aeaebed5635d2682" - -SRC_URI[md5sum] = "8b3722381f83c2813c52de3016b68d33" -SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" - diff --git a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb index 924b3cf..e2f76c3 100644 --- a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb +++ b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb @@ -1,2 +1,8 @@ +DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=946d7e89af6f7733aeaebed5635d2682" + +SRC_URI[md5sum] = "8b3722381f83c2813c52de3016b68d33" +SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" + inherit pypi setuptools3 -require python-blinker.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:00 +0000 Subject: [oe-commits] [meta-openembedded] 15/30: python3-booleanpy: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.57D3C232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cd5b3578a2fa2740fc70112202d0c908517f40fd Author: Derek Straka AuthorDate: Fri Feb 14 14:44:14 2020 -0500 python3-booleanpy: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-booleanpy.inc | 14 -------------- .../recipes-devtools/python/python3-booleanpy_3.7.bb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-booleanpy.inc b/meta-python/recipes-devtools/python/python-booleanpy.inc deleted file mode 100644 index 335d7d3..0000000 --- a/meta-python/recipes-devtools/python/python-booleanpy.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" -HOMEPAGE = "https://github.com/bastikr/boolean.py" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319747a5eb94cddf646037c01ddba47" - -SRC_URI[md5sum] = "1189d115a38f84f5df743014926a9159" -SRC_URI[sha256sum] = "bd19b412435611ecc712603d0fd7d0e280e24698e7a6e3d5f610473870c5dd1e" - -PYPI_PACKAGE = "boolean.py" - -inherit pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb b/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb index 5f8602d..ebf7ba4 100644 --- a/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb +++ b/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb @@ -1,2 +1,14 @@ -inherit setuptools3 -require python-booleanpy.inc +SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" +HOMEPAGE = "https://github.com/bastikr/boolean.py" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319747a5eb94cddf646037c01ddba47" + +SRC_URI[md5sum] = "1189d115a38f84f5df743014926a9159" +SRC_URI[sha256sum] = "bd19b412435611ecc712603d0fd7d0e280e24698e7a6e3d5f610473870c5dd1e" + +PYPI_PACKAGE = "boolean.py" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:01 +0000 Subject: [oe-commits] [meta-openembedded] 16/30: spidev-test: Add initial version of recipe In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.6153023281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 291f288e77904feea20cc931d988992600bc0036 Author: Arun Parameswaran AuthorDate: Fri Feb 14 11:44:20 2020 -0800 spidev-test: Add initial version of recipe Allows for testing SPI interface using spidev driver and is part of the kernel tools. Signed-off-by: Arun Parameswaran Reviewed-by: Jonathan Richardson Tested-by: Jonathan Richardson Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb new file mode 100644 index 0000000..6626302 --- /dev/null +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -0,0 +1,29 @@ +SUMMARY = "Test SPI devices" +DESCRIPTION = "SPI testing utility using the spidev driver" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +PROVIDES = "virtual/spidev-test" + +inherit bash-completion kernelsrc kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +EXTRA_OEMAKE = "-C ${S}/tools/spi O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +python do_package_prepend() { + d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) +} + +B = "${WORKDIR}/${BPN}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:06 +0000 Subject: [oe-commits] [meta-openembedded] 21/30: python3-chardet: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.95AEE23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c99094dc5affdb249102d30930e689a042412fc8 Author: Derek Straka AuthorDate: Fri Feb 14 17:48:02 2020 -0500 python3-chardet: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-chardet.inc | 23 ----------------- .../python/python3-chardet_3.0.4.bb | 29 +++++++++++++++++----- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-chardet.inc b/meta-python/recipes-devtools/python/python-chardet.inc deleted file mode 100644 index 6305299..0000000 --- a/meta-python/recipes-devtools/python/python-chardet.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Universal encoding detector for Python 2 and 3" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" - -inherit pypi - -# setup.py of chardet needs this. -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" -SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES =+ "${PN}-cli" -RDEPENDS_${PN}-cli = "${PN} " -FILES_${PN}-cli += " \ - ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ -" - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-logging \ -" diff --git a/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb b/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb index 38d8122..80785b8 100644 --- a/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb @@ -1,7 +1,24 @@ -inherit setuptools3 -require python-chardet.inc +SUMMARY = "Universal encoding detector for Python 2 and 3" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" -do_install_append () { - # rename scripts that would conflict with the Python 2 build of chardet - mv ${D}${bindir}/chardetect ${D}${bindir}/chardetect3 -} +SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" +SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" + +# setup.py of chardet needs this. +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-cli" +FILES_${PN}-cli += " \ + ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ +" + +RDEPENDS_${PN}-cli = "${PN} " + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-logging \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:05 +0000 Subject: [oe-commits] [meta-openembedded] 20/30: python3-certifi: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.8C1A323280B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a95be58589cd7826428fe056d63a02b008d3ff62 Author: Derek Straka AuthorDate: Fri Feb 14 17:35:27 2020 -0500 python3-certifi: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-certifi.inc | 13 ------------- .../recipes-devtools/python/python3-certifi_2019.11.28.bb | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-certifi.inc b/meta-python/recipes-devtools/python/python-certifi.inc deleted file mode 100644 index 98fa1f2..0000000 --- a/meta-python/recipes-devtools/python/python-certifi.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Python package for providing Mozilla's CA Bundle." -DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ -Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ -which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." -HOMEPAGE = " http://certifi.io/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" - -SRC_URI[md5sum] = "4d5229c4d9f0a4a79106f9e2c2cfd381" -SRC_URI[sha256sum] = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb b/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb index 70f674b..c9e945f 100644 --- a/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb +++ b/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb @@ -1,2 +1,15 @@ +SUMMARY = "Python package for providing Mozilla's CA Bundle." +DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ +Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ +which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." +HOMEPAGE = " http://certifi.io/" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" + +SRC_URI[md5sum] = "4d5229c4d9f0a4a79106f9e2c2cfd381" +SRC_URI[sha256sum] = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + inherit pypi setuptools3 -require python-certifi.inc + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:11 +0000 Subject: [oe-commits] [meta-openembedded] 26/30: pytest-metadata: Add new package In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.C91CB23280C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d009e5130e1a2b3791b1a906c2e81ab763ef3a7c Author: Jeremy Puhlman AuthorDate: Fri Feb 14 15:18:27 2020 -0800 pytest-metadata: Add new package Adds plugin support for accessing pytest metadata. Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- .../python/python3-pytest-metadata_1.8.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb b/meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb new file mode 100644 index 0000000..807b0ce --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" +HOMEPAGE = "https://github.com/pytest-dev/pytest-metadata" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +PYPI_PACKAGE = "pytest-metadata" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "95674c2390b58e0138cabac5101d1908" +SRC_URI[sha256sum] = "2071a59285de40d7541fde1eb9f1ddea1c9db165882df82781367471238b66ba" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:12 +0000 Subject: [oe-commits] [meta-openembedded] 27/30: pytest-html: Add new package In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.D344023280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e249b68d8c1c49fd0958fb37ffb7c5afd5811913 Author: Jeremy Puhlman AuthorDate: Fri Feb 14 15:18:28 2020 -0800 pytest-html: Add new package pytest-html add support for outputing html reports from ptest runs. Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- .../python/python3-pytest-html_1.6.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb b/meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb new file mode 100644 index 0000000..8ace29e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "pytest plugin for generating html reports from test results" +HOMEPAGE = "https://github.com/pytest-dev/pytest-html" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://../pytest-html.LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +# Per README.rst the license statement is fetched from +# https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE +SRC_URI += "https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE;name=license;downloadfilename=pytest-html.LICENSE" + +PYPI_PACKAGE = "pytest-html" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "ac956864a9b3392203dacd287ae450f0" +SRC_URI[sha256sum] = "a359de04273239587bd1a15b29b2266daeaf56b7a13f8224bc4fb3ae0ba72c3f" +SRC_URI[license.md5sum] = "5d425c8f3157dbf212db2ec53d9e5132" +SRC_URI[license.sha256sum] = "2bfdca60adf803108d4c7f009000bea76ad00e621e163197881b0eaae91b530e" + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:02 +0000 Subject: [oe-commits] [meta-openembedded] 17/30: python3-cachetools: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.6D90F232807@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c02bc0815ee4d9a46f08a9ac18270f62a19aed84 Author: Derek Straka AuthorDate: Fri Feb 14 14:47:39 2020 -0500 python3-cachetools: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-cachetools.inc | 16 ---------------- .../python/python3-cachetools_4.0.0.bb | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cachetools.inc b/meta-python/recipes-devtools/python/python-cachetools.inc deleted file mode 100644 index f3d3bc6..0000000 --- a/meta-python/recipes-devtools/python/python-cachetools.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Extensible memoizing collections and decorators" -HOMEPAGE = "https://github.com/tkem/cachetools" -DESCRIPTION = "This module provides various memoizing \ -collections and decorators, including variants of the \ -Python 3 Standard Library @lru_cache function decorator." -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5" - -inherit pypi - -SRC_URI[md5sum] = "6a88df13467e80eb61dd2bedad19b83c" -SRC_URI[sha256sum] = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb b/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb index 76b2f67..50d0f25 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-cachetools.inc +SUMMARY = "Extensible memoizing collections and decorators" +HOMEPAGE = "https://github.com/tkem/cachetools" +DESCRIPTION = "This module provides various memoizing \ +collections and decorators, including variants of the \ +Python 3 Standard Library @lru_cache function decorator." +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "6a88df13467e80eb61dd2bedad19b83c" +SRC_URI[sha256sum] = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:04 +0000 Subject: [oe-commits] [meta-openembedded] 19/30: python3-cassandra-driver: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.808C823280A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bcb03737b3838c1cd3eea16ab211194e8a1e2eb6 Author: Derek Straka AuthorDate: Fri Feb 14 17:33:46 2020 -0500 python3-cassandra-driver: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-cassandra-driver.inc | 33 -------------------- .../python/python3-cassandra-driver_3.14.0.bb | 35 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cassandra-driver.inc b/meta-python/recipes-devtools/python/python-cassandra-driver.inc deleted file mode 100644 index 53ebfec..0000000 --- a/meta-python/recipes-devtools/python/python-cassandra-driver.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "DataStax Python Driver for Apache Cassandra" -DESCRIPTION = "A modern, feature-rich and highly-tunable Python client \ -library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using \ -exclusively Cassandra's binary protocol and Cassandra Query Language v3." -HOMEPAGE = "https://github.com/datastax/python-driver" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -SRCNAME = "cassandra-driver" - -SRC_URI[md5sum] = "c5bed026bf48c821424c1f6296193908" -SRC_URI[sha256sum] = "b65218e2582277f5b77d1436e420db8616f63e3437a9e839cdcd7172d760e861" - -DISTUTILS_BUILD_ARGS += " \ - --no-libev \ -" -DISTUTILS_INSTALL_ARGS += " \ - --no-libev \ -" - -inherit pypi - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-cython \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-json \ - libevent \ -" - -DEPENDS += "\ - ${PYTHON_PN}-cython \ -" diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb index 34f149d..768e557 100644 --- a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb @@ -1,8 +1,35 @@ -inherit setuptools3 -require python-cassandra-driver.inc +SUMMARY = "DataStax Python Driver for Apache Cassandra" +DESCRIPTION = "A modern, feature-rich and highly-tunable Python client \ +library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using \ +exclusively Cassandra's binary protocol and Cassandra Query Language v3." +HOMEPAGE = "https://github.com/datastax/python-driver" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +SRCNAME = "cassandra-driver" -# Requires concurrent which is currently in -misc -RDEPENDS_${PN} += " \ +SRC_URI[md5sum] = "c5bed026bf48c821424c1f6296193908" +SRC_URI[sha256sum] = "b65218e2582277f5b77d1436e420db8616f63e3437a9e839cdcd7172d760e861" + +DISTUTILS_BUILD_ARGS += " \ + --no-libev \ +" +DISTUTILS_INSTALL_ARGS += " \ + --no-libev \ +" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-cython \ + ${PYTHON_PN}-json \ ${PYTHON_PN}-misc \ + ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-six \ + libevent \ +" + +DEPENDS += "\ + ${PYTHON_PN}-cython \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:03 +0000 Subject: [oe-commits] [meta-openembedded] 18/30: python3-can: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.77073232809@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 236eaefef1acc8d71aa5f0c1e06e43a0c63b1a8a Author: Derek Straka AuthorDate: Fri Feb 14 14:56:19 2020 -0500 python3-can: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-can.inc | 18 ------------------ .../recipes-devtools/python/python3-can_3.3.2.bb | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-can.inc b/meta-python/recipes-devtools/python/python-can.inc deleted file mode 100644 index 7d0100d..0000000 --- a/meta-python/recipes-devtools/python/python-can.inc +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Controller Area Network (CAN) interface module for Python" -SECTION = "devel/python" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" -SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" - -PYPI_PACKAGE="python-can" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-wrapt \ -" diff --git a/meta-python/recipes-devtools/python/python3-can_3.3.2.bb b/meta-python/recipes-devtools/python/python3-can_3.3.2.bb index aaa9e81..4597795 100644 --- a/meta-python/recipes-devtools/python/python3-can_3.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-can_3.3.2.bb @@ -1,7 +1,22 @@ -require python-can.inc +SUMMARY = "Controller Area Network (CAN) interface module for Python" +SECTION = "devel/python" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" +SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" + +PYPI_PACKAGE="python-can" + inherit pypi setuptools3 RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-codecs \ ${PYTHON_PN}-compression \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-sqlite3 \ + ${PYTHON_PN}-wrapt \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:07 +0000 Subject: [oe-commits] [meta-openembedded] 22/30: python3-click: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.A042E23281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c600b31de83884987d27c1f34927517cc55d208e Author: Derek Straka AuthorDate: Fri Feb 14 17:52:06 2020 -0500 python3-click: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-click.inc | 25 --------------------- .../recipes-devtools/python/python3-click_7.0.bb | 26 +++++++++++++++++++++- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-click.inc b/meta-python/recipes-devtools/python/python-click.inc deleted file mode 100644 index f9dfd56..0000000 --- a/meta-python/recipes-devtools/python/python-click.inc +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A simple wrapper around optparse for powerful command line utilities." -DESCRIPTION = "\ -Click is a Python package for creating beautiful command line interfaces \ -in a composable way with as little code as necessary. It's the "Command \ -Line Interface Creation Kit". It's highly configurable but comes with \ -sensible defaults out of the box." -HOMEPAGE = "http://click.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" - -SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" -SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" - -UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" - -CLEANBROKEN = "1" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-threading \ - " - -BBCLASSEXTEND = "native nativesdk" - -PYPI_PACKAGE = "Click" diff --git a/meta-python/recipes-devtools/python/python3-click_7.0.bb b/meta-python/recipes-devtools/python/python3-click_7.0.bb index 1920644..cfa3e0f 100644 --- a/meta-python/recipes-devtools/python/python3-click_7.0.bb +++ b/meta-python/recipes-devtools/python/python3-click_7.0.bb @@ -1,2 +1,26 @@ +SUMMARY = "A simple wrapper around optparse for powerful command line utilities." +DESCRIPTION = "\ +Click is a Python package for creating beautiful command line interfaces \ +in a composable way with as little code as necessary. It's the "Command \ +Line Interface Creation Kit". It's highly configurable but comes with \ +sensible defaults out of the box." +HOMEPAGE = "http://click.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" + +SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" +SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" + +PYPI_PACKAGE = "Click" inherit pypi setuptools3 -require python-click.inc + +UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-threading \ + " + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:08 +0000 Subject: [oe-commits] [meta-openembedded] 23/30: python3-cmd2: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.A9F2C23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 47336bb9397a22c452d5f6e83d7f6a5667645c60 Author: Derek Straka AuthorDate: Fri Feb 14 17:56:59 2020 -0500 python3-cmd2: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cmd2.inc | 13 ------------- .../recipes-devtools/python/python3-cmd2_0.9.23.bb | 20 ++++++++++++++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-python/recipes-devtools/python/python-cmd2.inc deleted file mode 100644 index 68381ad..0000000 --- a/meta-python/recipes-devtools/python/python-cmd2.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "http://packages.python.org/cmd2/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" - -SRC_URI[md5sum] = "6db66a06210d5f1edb44693b887ed62b" -SRC_URI[sha256sum] = "8ad12ef3cc46d03073c545b6e80a3f84a5921f6653073a60e7d9a7ff3b352c9e" - -inherit pypi - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb index f5c5c7e..a2bf0c4 100644 --- a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb +++ b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb @@ -1,9 +1,21 @@ -inherit setuptools3 -require python-cmd2.inc +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "http://packages.python.org/cmd2/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "6db66a06210d5f1edb44693b887ed62b" +SRC_URI[sha256sum] = "8ad12ef3cc46d03073c545b6e80a3f84a5921f6653073a60e7d9a7ff3b352c9e" + +inherit pypi setuptools3 RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-colorama \ ${PYTHON_PN}-pyperclip \ ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-attrs \ ${PYTHON_PN}-wcwidth \ - " +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:10 +0000 Subject: [oe-commits] [meta-openembedded] 25/30: pytest-timeout: New package In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.BA4EE232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 88fb8fbfcee1a472d2be44a4d86cd81677709bb0 Author: Jeremy Puhlman AuthorDate: Fri Feb 14 15:18:26 2020 -0800 pytest-timeout: New package Adds plugin for pytest to abort tests after a certain time out. Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-pytest-timeout_1.3.4.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb b/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb new file mode 100644 index 0000000..a359969 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb @@ -0,0 +1,13 @@ +SUMMARY = "py.test plugin to abort hanging tests" +HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" + +PYPI_PACKAGE = "pytest-timeout" + +SRC_URI[md5sum] = "1594762ae77ed7c6c2727aa8b4aa8bfb" +SRC_URI[sha256sum] = "80faa19cd245a42b87a51699d640c00d937c02b749052bfca6bae8bdbe12c48e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:09 +0000 Subject: [oe-commits] [meta-openembedded] 24/30: python3-cffi: consolidate inc and bb files into a single bb file In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.B2402232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3b033801a8144776050cd22a04e8299629846d28 Author: Derek Straka AuthorDate: Fri Feb 14 18:08:19 2020 -0500 python3-cffi: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cffi.inc | 17 ----------------- .../recipes-devtools/python/python3-cffi_1.14.0.bb | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cffi.inc b/meta-python/recipes-devtools/python/python-cffi.inc deleted file mode 100644 index af10c5f..0000000 --- a/meta-python/recipes-devtools/python/python-cffi.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Foreign Function Interface for Python calling C code" -HOMEPAGE = "http://cffi.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" -DEPENDS += "libffi ${PYTHON_PN}-pycparser" - -SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" -SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" - -RDEPENDS_${PN}_class-target = " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb index e888084..53c8ee2 100644 --- a/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb @@ -1,2 +1,19 @@ +SUMMARY = "Foreign Function Interface for Python calling C code" +HOMEPAGE = "http://cffi.readthedocs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" +DEPENDS += "libffi ${PYTHON_PN}-pycparser" + +SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" +SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" + inherit pypi setuptools3 -require python-cffi.inc + +RDEPENDS_${PN}_class-target = " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pycparser \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:13 +0000 Subject: [oe-commits] [meta-openembedded] 28/30: phoronix-test-suite: add missing mime and mime-xdg inherit In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.E31EE23280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 85ac8a0a8dcc7a434d97a37616069d1e928c7a10 Author: Tim Orling AuthorDate: Fri Feb 14 15:28:51 2020 -0800 phoronix-test-suite: add missing mime and mime-xdg inherit Fixes: " WARNING: phoronix-test-suite-9.2.1-r0 do_package_qa: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: phoronix-test-suite path '/work/all-oe-linux/phoronix-test-suite/9.2.1-r0/packages-split/ \ phoronix-test-suite/usr/share/applications/phoronix-test-suite-launcher.desktop' [mime-xdg] WARNING: phoronix-test-suite-9.2.1-r0 do_package_qa: QA Issue: package contains mime types but does not inhert mime: phoronix-test-suite path '/work/all-oe-linux/phoronix-test-suite/9.2.1-r0/packages-split/ \ phoronix-test-suite/usr/share/mime/packages/openbenchmarking-mime.xml' [mime] " Signed-off-by: Tim Orling Signed-off-by: Khem Raj --- .../recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb index 6525b8e..4a8e5b5 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "675e7ca96719e2f3b42a6c13421213a398f04da0f8e78f4691fa9261fd S = "${WORKDIR}/phoronix-test-suite" -inherit systemd allarch +inherit systemd allarch mime mime-xdg do_install() { DESTDIR=${D} ./install-sh ${exec_prefix} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:15 +0000 Subject: [oe-commits] [meta-openembedded] 30/30: libmimetic: Fix ordrered comparision between pointer and zero In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011647.0741B232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 37bef418d8037963e2c6051c073fd83536397435 Author: Khem Raj AuthorDate: Fri Feb 14 17:10:35 2020 -0800 libmimetic: Fix ordrered comparision between pointer and zero Found with clang Signed-off-by: Khem Raj Cc: asmitha --- ...ic-Check-for-MMAP_FAILED-return-from-mmap.patch | 49 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch new file mode 100644 index 0000000..c7c8d62 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch @@ -0,0 +1,49 @@ +From f8ab2b1aaa37f6ba9d527a99cb37b6ac2171e122 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 17:03:12 -0800 +Subject: [PATCH] mimetic: Check for MMAP_FAILED return from mmap() + +Avoids using greater than zero comparision on pointers + +Fixes +mimetic/os/mmfile.cxx:60:14: error: ordered comparison between pointer and zero ('char *' and 'int') + +if(m_beg > 0) +~~~~ ^ ~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mimetic/os/mmfile.cxx | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..ed4ff55 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,15 +57,13 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) +- { +- m_end = m_beg + m_st.st_size; +- #if HAVE_MADVISE +- madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); +- #endif +- return true; +- } +- return false; ++ if(m_beg == MAP_FAILED) ++ return false; ++ m_end = m_beg + m_st.st_size; ++ #if HAVE_MADVISE ++ madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); ++ #endif ++ return true; + } + + MMFile::~MMFile() +-- +2.25.0 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index fd65db2..d0fe498 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ + file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:17:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:17:14 +0000 Subject: [oe-commits] [meta-openembedded] 29/30: x265: add x265 recipe In-Reply-To: <158172940539.22614.1306210393488482718@git.openembedded.org> References: <158172940539.22614.1306210393488482718@git.openembedded.org> Message-ID: <20200215011646.F055A23280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3d83bae5e4a03311fea74ccf50ce935d724464c7 Author: William A. Kennington III via Openembedded-devel AuthorDate: Fri Feb 14 16:54:02 2020 -0800 x265: add x265 recipe Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../recipes-multimedia/x265/x265_3.2.1.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb new file mode 100644 index 0000000..21ae596 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre" + +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" + +S = "${WORKDIR}/x265_${PV}/source" + +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:27:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:27:00 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (37bef41 -> ebdcce6) Message-ID: <158173002078.31730.1921452006207914634@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 37bef41 libmimetic: Fix ordrered comparision between pointer and zero discard 3d83bae x265: add x265 recipe new 719ff63 libmimetic: Fix ordrered comparision between pointer and zero new a80f76c x265: add x265 recipe new 48442b1 python3-et-xmlfile: add initial recipe version 1.0.1 new 6a15ca9 python3-jdcal: add initial recipe version 1.4.1 new ebdcce6 python3-openpyxl: Add initial version 2.6.3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (37bef41) \ N -- N -- N refs/heads/master-next (ebdcce6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../python/python3-et-xmlfile_1.0.1.bb | 20 ++++++++++++++++++++ .../recipes-devtools/python/python3-jdcal_1.4.1.bb | 15 +++++++++++++++ .../python/python3-openpyxl_2.6.3.bb | 15 +++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:27:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:27:02 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: x265: add x265 recipe In-Reply-To: <158173002078.31730.1921452006207914634@git.openembedded.org> References: <158173002078.31730.1921452006207914634@git.openembedded.org> Message-ID: <20200215012701.279E523280B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a80f76c5121132369b5ab5d03027fd195c103b28 Author: Scott Branden via Openembedded-devel AuthorDate: Fri Feb 14 16:54:02 2020 -0800 x265: add x265 recipe Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../recipes-multimedia/x265/x265_3.2.1.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb new file mode 100644 index 0000000..21ae596 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre" + +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" + +S = "${WORKDIR}/x265_${PV}/source" + +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:27:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:27:03 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: python3-et-xmlfile: add initial recipe version 1.0.1 In-Reply-To: <158173002078.31730.1921452006207914634@git.openembedded.org> References: <158173002078.31730.1921452006207914634@git.openembedded.org> Message-ID: <20200215012701.3240023280C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 48442b126994b6262aab251a4e18f7c3accedcb6 Author: Jonathan Richardson via Openembedded-devel AuthorDate: Fri Feb 14 17:18:09 2020 -0800 python3-et-xmlfile: add initial recipe version 1.0.1 Signed-off-by: Khem Raj --- .../python/python3-et-xmlfile_1.0.1.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb b/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb new file mode 100644 index 0000000..cfff150 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "et_xmlfile is a low memory library for creating large XML files" +DESCRIPTION = "It is based upon the xmlfile module from lxml with the aim of allowing code \ +to be developed that will work with both libraries. It was developed initially for \ +the openpyxl project but is now a standalone module." + +HOMEPAGE = "https://bitbucket.org/openpyxl/et_xmlfile/src/default/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b3d89cae66f26c3a0799be8a96f3178b" + +SRC_URI[md5sum] = "f47940fd9d556375420b2e276476cfaf" +SRC_URI[sha256sum] = "614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" + +inherit setuptools3 +PYPI_PACKAGE ?= "et_xmlfile" +PYPI_SRC_URI ?= "https://files.pythonhosted.org/packages/source/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz" +SECTION = "devel/python" +SRC_URI += "${PYPI_SRC_URI}" +S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:27:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:27:04 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: python3-jdcal: add initial recipe version 1.4.1 In-Reply-To: <158173002078.31730.1921452006207914634@git.openembedded.org> References: <158173002078.31730.1921452006207914634@git.openembedded.org> Message-ID: <20200215012701.3E1B423280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6a15ca91ad16de7335edcf92fd4535af819051d8 Author: Jonathan Richardson via Openembedded-devel AuthorDate: Fri Feb 14 17:18:35 2020 -0800 python3-jdcal: add initial recipe version 1.4.1 Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-jdcal_1.4.1.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb b/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb new file mode 100644 index 0000000..c8b5c95 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "This module contains functions for converting between Julian dates and calendar dates" +DESCRIPTION = "A function for converting Gregorian calendar dates to Julian dates, \ +and another function for converting Julian calendar dates to Julian dates are defined. \ +Two functions for the reverse calculations are also defined." + +HOMEPAGE = "https://github.com/phn/jdcal" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bd236e1f590973467a427bb354be0f46" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "e05bdb60fa80f25bc60e73e0c6b7c5dc" +SRC_URI[sha256sum] = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:27:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:27:01 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: libmimetic: Fix ordrered comparision between pointer and zero In-Reply-To: <158173002078.31730.1921452006207914634@git.openembedded.org> References: <158173002078.31730.1921452006207914634@git.openembedded.org> Message-ID: <20200215012701.1EE0523280A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 719ff633d1c0f25a22489a1e3c3c03044d5a5ab5 Author: Khem Raj AuthorDate: Fri Feb 14 17:10:35 2020 -0800 libmimetic: Fix ordrered comparision between pointer and zero Found with clang Signed-off-by: Khem Raj Cc: asmitha --- ...ic-Check-for-MMAP_FAILED-return-from-mmap.patch | 49 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch new file mode 100644 index 0000000..c7c8d62 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch @@ -0,0 +1,49 @@ +From f8ab2b1aaa37f6ba9d527a99cb37b6ac2171e122 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 17:03:12 -0800 +Subject: [PATCH] mimetic: Check for MMAP_FAILED return from mmap() + +Avoids using greater than zero comparision on pointers + +Fixes +mimetic/os/mmfile.cxx:60:14: error: ordered comparison between pointer and zero ('char *' and 'int') + +if(m_beg > 0) +~~~~ ^ ~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mimetic/os/mmfile.cxx | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..ed4ff55 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,15 +57,13 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) +- { +- m_end = m_beg + m_st.st_size; +- #if HAVE_MADVISE +- madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); +- #endif +- return true; +- } +- return false; ++ if(m_beg == MAP_FAILED) ++ return false; ++ m_end = m_beg + m_st.st_size; ++ #if HAVE_MADVISE ++ madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); ++ #endif ++ return true; + } + + MMFile::~MMFile() +-- +2.25.0 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index fd65db2..d0fe498 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ + file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 01:27:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 01:27:05 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: python3-openpyxl: Add initial version 2.6.3 In-Reply-To: <158173002078.31730.1921452006207914634@git.openembedded.org> References: <158173002078.31730.1921452006207914634@git.openembedded.org> Message-ID: <20200215012701.4947723280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ebdcce63b5bfbf25438c6812b3d7edb15a967bfb Author: Jonathan Richardson via Openembedded-devel AuthorDate: Fri Feb 14 17:19:07 2020 -0800 python3-openpyxl: Add initial version 2.6.3 openpyxl depends on et-xmlfile and jdcal. Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-openpyxl_2.6.3.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb b/meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb new file mode 100644 index 0000000..87cb46e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "openpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files" +DESCRIPTION = "It was born from lack of existing library to read/write natively \ +from Python the Office Open XML format. All kudos to the PHPExcel team as openpyxl \ +was initially based on PHPExcel." + +HOMEPAGE = "http://www.python-excel.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=3baf26d8abf08632beaf913ea973cb8a" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "b067750e51f17a1a9cc6bacfdd668218" +SRC_URI[sha256sum] = "72d1ed243972cad0b3c236230083cac00d9c72804e64a2ae93d7901aec1a8f1c" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:09 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (921da19 -> 47aff2f) Message-ID: <158175408909.28911.16751626506250815951@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 921da19 db: Fix timespec length assumptions discard 1f43871 qemuriscv64: Set the Xvisor platform discard 3dd8a65 populate_sdk_ext: We now require python3, not python discard fa34471 python3-pycairo: upgrade 1.18.2 -> 1.19.0 discard 2080cc5 libgpg-error: upgrade 1.36 -> 1.37 discard f6a39c1 icu: upgrade 64.2 -> 65.1 discard f65989a ell: upgrade 0.27 -> 0.28 discard e80cf26 gdb: Upgrade to 9.1 release discard e3a84da musl: Update to latest tip discard 0263532 busybox: Backport patches to support removal of __NR_clock_gettime discard 51fba6a ruby: upgrade 2.6.5 -> 2.7.0 discard 7f6ef47 wic: Honor APPEND new e75b114 ruby: upgrade 2.6.5 -> 2.7.0 new 6fad0eb busybox: Backport patches to support removal of __NR_clock_gettime new 4aaf868 musl: Update to latest tip new 0b5782b gdb: Upgrade to 9.1 release new fc0eabe ell: upgrade 0.27 -> 0.28 new 0391fd4 python3-pycairo: upgrade 1.18.2 -> 1.19.0 new 7f2bbfa populate_sdk_ext: We now require python3, not python new b3eb356 qemuriscv64: Set the Xvisor platform new 47aff2f db: Fix timespec length assumptions This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (921da19) \ N -- N -- N refs/heads/master-next (47aff2f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/image_types_wic.bbclass | 2 +- .../icu/{icu_65.1.bb => icu_64.2.bb} | 4 +- .../libgpg-error-1.36-gawk5-support.patch | 144 +++++++++++++++++++++ .../{libgpg-error_1.37.bb => libgpg-error_1.36.bb} | 5 +- scripts/lib/wic/ksparser.py | 5 - 5 files changed, 150 insertions(+), 10 deletions(-) rename meta/recipes-support/icu/{icu_65.1.bb => icu_64.2.bb} (88%) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.37.bb => libgpg-error_1.36.bb} (92%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:12 +0000 Subject: [oe-commits] [openembedded-core] 03/09: musl: Update to latest tip In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.92E4323280C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4aaf868edd3be9ca27330affb31289df1dcd304b Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:10 +0000 Subject: [oe-commits] [openembedded-core] 01/09: ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.789E523280A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e75b114d5b23be214d922914fa09d57724fa53a2 Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:06 2020 -0800 ruby: upgrade 2.6.5 -> 2.7.0 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f..a38b3fe 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000..f316bed --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8b..b31dee1 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3..0000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee..c796318 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:11 +0000 Subject: [oe-commits] [openembedded-core] 02/09: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.861F323280B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6fad0ebd31551d17a884053238bf3460a32357a7 Author: Khem Raj AuthorDate: Fri Feb 14 10:00:07 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 120 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + 5 files changed, 266 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..0c7f9b8 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,120 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] +Signed-off-by: Denys Vlasenko +--- + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); +-#elif __TIMESIZE == 64 +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..4760570 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,46 @@ +From 8c7419649d6e6fda8fa7d0e863084c78ac728628 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 28 Aug 2019 10:54:15 -0700 +Subject: [PATCH 3/3] runsv: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Signed-off-by: Alistair Francis +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=ad27d44ebe950335616f37e36863469dc181b455] +--- + runit/runsv.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/runit/runsv.c b/runit/runsv.c +index ccc762d78..737909b0e 100644 +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++#elif __TIMESIZE == 64 ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + } + #else + static void gettimeofday_ns(struct timespec *ts) +-- +2.22.0 + diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..ec5b580 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -42,6 +42,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-check-uudecode-before-using-it.patch \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ file://0001-Remove-stime-function-calls.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:13 +0000 Subject: [oe-commits] [openembedded-core] 04/09: gdb: Upgrade to 9.1 release In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.A803D23280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0b5782bf6401cd041124bd4356826d204a7fb8dd Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:14 +0000 Subject: [oe-commits] [openembedded-core] 05/09: ell: upgrade 0.27 -> 0.28 In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.B653923280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fc0eabe5f4aaf91859f5a1f3aa7610779aacb97b Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:26 2020 -0800 ell: upgrade 0.27 -> 0.28 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.27.bb rename to meta/recipes-core/ell/ell_0.28.bb index 503f1e2..464bf63 100644 --- a/meta/recipes-core/ell/ell_0.27.bb +++ b/meta/recipes-core/ell/ell_0.28.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2" -SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96" +SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9" +SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b" do_configure_prepend () { mkdir -p ${S}/build-aux -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:15 +0000 Subject: [oe-commits] [openembedded-core] 06/09: python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.C151123280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0391fd452f1f222e5f5070ae391d2afabf720c3a Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:29 2020 -0800 python3-pycairo: upgrade 1.18.2 -> 1.19.0 -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" is added Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb similarity index 77% rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb index 3aedf3d..8f60834 100644 --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "python-devel" LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz" UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" S = "${WORKDIR}/pycairo-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:16 +0000 Subject: [oe-commits] [openembedded-core] 07/09: populate_sdk_ext: We now require python3, not python In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.CD6DE232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7f2bbfa6dab5298e0dcfbe7867a882521ab81d9a Author: Richard Purdie AuthorDate: Fri Feb 14 18:13:14 2020 +0000 populate_sdk_ext: We now require python3, not python Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9511e55..57fd29b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -613,8 +613,8 @@ sdk_ext_preinst() { exit 1 fi # The relocation script used by buildtools installer requires python - if ! command -v python > /dev/null; then - echo "ERROR: The installer requires python, please install it first" + if ! command -v python3 > /dev/null; then + echo "ERROR: The installer requires python3, please install it first" exit 1 fi missing_utils="" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:17 +0000 Subject: [oe-commits] [openembedded-core] 08/09: qemuriscv64: Set the Xvisor platform In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.D99ED232814@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b3eb35642936e5effb7755ce14e141fef9342b3e Author: Alistair Francis AuthorDate: Fri Feb 14 11:42:30 2020 -0800 qemuriscv64: Set the Xvisor platform Set the platform information required to build Xvisor. https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-extended/xvisor Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/machine/qemuriscv64.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index b45fdd5..a753af0 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -4,6 +4,8 @@ require conf/machine/include/riscv/qemuriscv.inc +XVISOR_PLAT = "riscv/virt64" + EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE = "qemu-riscv64_smode_defconfig" UBOOT_ELF = "u-boot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:08:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:08:18 +0000 Subject: [oe-commits] [openembedded-core] 09/09: db: Fix timespec length assumptions In-Reply-To: <158175408909.28911.16751626506250815951@git.openembedded.org> References: <158175408909.28911.16751626506250815951@git.openembedded.org> Message-ID: <20200215080809.E5FF4232815@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 47aff2f64e4454ee72fc0e113fb12f49e1126582 Author: Khem Raj AuthorDate: Fri Feb 14 14:33:34 2020 -0800 db: Fix timespec length assumptions This should fix the vdso crashes seen with kernel 5.0+ python3[11312] general protection fault ip:b7e966b0 sp:bf8175cc error:0 in libc.so[b7e8b000+6b000] Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- .../db/0001-clock-Do-not-define-own-timespec.patch | 45 ++++++++++++++++++++++ meta/recipes-support/db/db_5.3.28.bb | 1 + 2 files changed, 46 insertions(+) diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch new file mode 100644 index 0000000..9d51a44 --- /dev/null +++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch @@ -0,0 +1,45 @@ +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 14:12:59 -0800 +Subject: [PATCH] clock: Do not define own timespec + +timespec is provided by libc and its best left to libc +os_gettime takes a db_timespec and passed its address to clock_gettime +which assumes that db_timespec and timespec are same but actually +its 12-bytes here and libc has 16-bytes + +This can cause problems especially with 64bit time_t + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/dbinc/clock.h | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +--- a/src/dbinc/clock.h ++++ b/src/dbinc/clock.h +@@ -44,22 +44,8 @@ + extern "C" { + #endif + +-/* +- * This declaration is POSIX-compatible. Because there are lots of different +- * time.h include file patterns out there, it's easier to declare our own name +- * in all cases than to try and discover if a system has a struct timespec. +- * For the same reason, and because we'd have to #include in db.h, +- * we don't export any timespec structures in the DB API, even in places where +- * it would make sense, like the replication statistics information. +- */ +-typedef struct { +- time_t tv_sec; /* seconds */ +-#ifdef HAVE_MIXED_SIZE_ADDRESSING +- int32_t tv_nsec; +-#else +- long tv_nsec; /* nanoseconds */ +-#endif +-} db_timespec; ++#include ++#define db_timespec struct timespec + + /* Operations on timespecs */ + #undef timespecclear diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index a296905..badb79f 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -26,6 +26,7 @@ SRC_URI += "file://fix-parallel-build.patch \ file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ file://sequence-type.patch \ file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ + file://0001-clock-Do-not-define-own-timespec.patch \ " # We are not interested in official latest 6.x versions; # let's track what debian is using. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 08:12:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 08:12:56 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: HACK: extra debug Message-ID: <158175437639.30391.84077517404924061@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 890e5a9 HACK: extra debug 890e5a9 is described below commit 890e5a913c7dd8b0a16cb832689726546e031082 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:09 +0000 Subject: [oe-commits] [openembedded-core] 03/18: libxml2: Fix CVE-2019-20388 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.42C4D23280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 12a5eb0ea6f530ad7be2e58d4091b4edadbf461b Author: Lee Chee Yang AuthorDate: Fri Feb 14 19:28:10 2020 +0800 libxml2: Fix CVE-2019-20388 see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 38 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..4ee2d4f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 6a4097c..097aceb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:10 +0000 Subject: [oe-commits] [openembedded-core] 04/18: squashfs-tools: Enable on musl In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.4AAE823280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2de44715a15880bb4a9f78e7ff5814b75938b27c Author: Khem Raj AuthorDate: Thu Feb 13 23:03:52 2020 -0800 squashfs-tools: Enable on musl Upstream has a patch [1] to fix musl builds, Prior to this it would not build on musl due to missing GNU extentions for fnmatch [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4fd33f8..9bcf026 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -12,9 +12,6 @@ SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ S = "${WORKDIR}/git/squashfs-tools" -# needs FNM_EXTMATCH -COMPATIBLE_HOST_libc-musl = 'null' - EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr reproducible" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:06 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (7331062 -> 946ce21) Message-ID: <158176248670.31260.7654152103178704127@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 7331062 librepo: upgrade 1.11.1 -> 1.11.2 new 29d17fe staging: Handle races between binaries and their libs new 10907c6 bash: include patch 12-16 new 12a5eb0 libxml2: Fix CVE-2019-20388 new 2de4471 squashfs-tools: Enable on musl new 2b51252 glibc-testsuite: Remove the do_install task new eadbe01 glibc-testsuite: Exclude this recipe from world builds new 3e1e8d2 strace: Update to 5.5 new 8267419 ffmpeg: add PACKAGECONFIG support for x265 new e521393 python3-pip: upgrade 19.3.1 -> 20.0.2 new 3cdf5da ruby: upgrade 2.6.5 -> 2.7.0 new 8c3a220 busybox: Backport patches to support removal of __NR_clock_gettime new e8d52c2 musl: Update to latest tip new 4c1c01e gdb: Upgrade to 9.1 release new 05e94ea ell: upgrade 0.27 -> 0.28 new 79c940c python3-pycairo: upgrade 1.18.2 -> 1.19.0 new bd22910 qemuriscv64: Set the Xvisor platform new a85afec db: Fix timespec length assumptions new 946ce21 populate_sdk_ext: We now require python3, not python The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/populate_sdk_ext.bbclass | 4 +- meta/classes/staging.bbclass | 12 +- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/qemuriscv64.conf | 2 + ...all-wrappers-around-clock_gettime-closes-.patch | 120 +++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 +++++++ ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 +++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 +- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 3 + .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + meta/recipes-core/musl/musl_git.bb | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 ...python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 +- ...pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 ---------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- .../squashfs-tools/squashfs-tools_git.bb | 3 - .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 -------- .../strace/strace/Makefile-ptest.patch | 6 +- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 ------- .../strace/strace/ptest-spacesave.patch | 17 ++- .../strace/strace/sys_headers.patch | 25 ---- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 +- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 +- meta/recipes-extended/bash/bash_5.0.bb | 15 +++ meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + .../db/0001-clock-Do-not-define-own-timespec.patch | 45 +++++++ meta/recipes-support/db/db_5.3.28.bb | 1 + 55 files changed, 599 insertions(+), 534 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch rename meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} (83%) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) create mode 100644 meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) rename meta/recipes-devtools/python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} (81%) rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} (77%) create mode 100644 meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch rename meta/recipes-devtools/ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} (91%) delete mode 100644 meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch delete mode 100644 meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) create mode 100644 meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:08 +0000 Subject: [oe-commits] [openembedded-core] 02/18: bash: include patch 12-16 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.393BE23280C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 10907c6ea3665e0cacb05e7120c8726ed5790a3c Author: Lee Chee Yang AuthorDate: Fri Feb 14 19:28:09 2020 +0800 bash: include patch 12-16 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash_5.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 0c7b234..8ff9e6e 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -16,6 +16,11 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -50,6 +55,16 @@ SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" +SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" +SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" +SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" +SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" +SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" +SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" +SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" +SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" +SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" +SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:07 +0000 Subject: [oe-commits] [openembedded-core] 01/18: staging: Handle races between binaries and their libs In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.3069E23280B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 29d17fe23265bf0c7defa14ffc0f677af15c6818 Author: Richard Purdie AuthorDate: Fri Feb 14 12:50:18 2020 +0000 staging: Handle races between binaries and their libs There is a long standing issue where a binary could be installed into the sysroot before its library dependencies. We've always argued nothing should use the binary until it has been installed by a dependency but there are issues around binaries which conflict with the host system, for example patch, python3, gzip and more. With the recent patch changes we've seen issues like: ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0009-Change-order-of-CFLAGS.patch patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required by patch) Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce with -f) which is a symptom of this issue (libattr-native is a dependency of patch-native). There are other ways to fix this such as disabling libattr in patch, installing patch to a subdirectory and requiring PATH manipulation and so on. We can simply fix the staging code to handle /bin/ after everything else so do that and avoid all these other complications. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 4dd2ed0..5dab427 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -470,6 +470,7 @@ python extend_recipe_sysroot() { elif os.path.lexists(depdir + "/" + c): os.unlink(depdir + "/" + c) + binfiles = {} # Now handle installs for dep in configuredeps: c = setscenedeps[dep][0] @@ -562,7 +563,16 @@ python extend_recipe_sysroot() { if l.endswith("/"): staging_copydir(l, targetdir, dest, seendirs) continue - staging_copyfile(l, targetdir, dest, postinsts, seendirs) + if "/bin/" in l or "/sbin/" in l: + # defer /*bin/* files until last in case they need libs + binfiles[l] = (targetdir, dest) + else: + staging_copyfile(l, targetdir, dest, postinsts, seendirs) + + # Handle deferred binfiles + for l in binfiles: + (targetdir, dest) = binfiles[l] + staging_copyfile(l, targetdir, dest, postinsts, seendirs) bb.note("Installed into sysroot: %s" % str(msg_adding)) bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:11 +0000 Subject: [oe-commits] [openembedded-core] 05/18: glibc-testsuite: Remove the do_install task In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.54C7523280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2b51252cb8bd9badfa28794f9ef9431b48752e3d Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Remove the do_install task This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:12 +0000 Subject: [oe-commits] [openembedded-core] 06/18: glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.5F7F9232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eadbe01bb8232de79e0827e6c6b3411f69ea7303 Author: Nathan Rossi AuthorDate: Fri Feb 14 05:59:43 2020 +0000 glibc-testsuite: Exclude this recipe from world builds This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:14 +0000 Subject: [oe-commits] [openembedded-core] 08/18: ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.70D80232815@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 826741986d5a67e5f1ddfa02c737cc0045da906e Author: Scott Branden via Openembedded-core AuthorDate: Thu Feb 13 08:25:33 2020 -0800 ffmpeg: add PACKAGECONFIG support for x265 Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1..20a8249 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:15 +0000 Subject: [oe-commits] [openembedded-core] 09/18: python3-pip: upgrade 19.3.1 -> 20.0.2 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.7D619232816@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e521393136f94a7cafbee33f5992b31a6fef3b7e Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:05 2020 -0800 python3-pip: upgrade 19.3.1 -> 20.0.2 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pip_19.3.1.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb similarity index 81% rename from meta/recipes-devtools/python/python3-pip_19.3.1.bb rename to meta/recipes-devtools/python/python3-pip_20.0.2.bb index d27e6fc..08738fb 100644 --- a/meta/recipes-devtools/python/python3-pip_19.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" -SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" +SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" +SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" inherit pypi distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:13 +0000 Subject: [oe-commits] [openembedded-core] 07/18: strace: Update to 5.5 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.68315232814@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3e1e8d24ce122ddb5897418d1bae123051e1f450 Author: Alistair Francis AuthorDate: Thu Feb 13 15:25:28 2020 -0800 strace: Update to 5.5 Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...ace_syscall_info-to-__ptrace_syscall_info.patch | 52 ---------------------- .../strace/strace/Makefile-ptest.patch | 6 ++- .../strace/strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...-robust-test-for-m32-mx32-compile-support.patch | 43 ------------------ .../strace/strace/ptest-spacesave.patch | 17 +++++-- .../strace/strace/sys_headers.patch | 25 ----------- .../recipes-devtools/strace/strace/uintptr_t.patch | 12 ++++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdc..235e803 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a..0000000 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ ---- a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif ---- a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef7..42c1893 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff3..e8dbd7f 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b..e86da97 100644 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Aug 2016 23:47:57 -0700 Subject: [PATCH] strace: Fix build with mips/mips64 on musl diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index ae22105..0000000 --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy - ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -103,6 +103,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -110,6 +111,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc3..c5d8ff9 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + If the test is successful, remove the log and exp files. This stops strace using around 600MB of disk space and running our ptest images out of space. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh @@ -62,6 +62,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index d1b704e..0000000 --- a/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6f..088d685 100644 --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition fixes do_compile_ptest_base tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -18,6 +18,7 @@ diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048..d46b147 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb similarity index 80% rename from meta/recipes-devtools/strace/strace_5.4.bb rename to meta/recipes-devtools/strace/strace_5.5.bb index 1e428cc..6e7d639 100644 --- a/meta/recipes-devtools/strace/strace_5.4.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ - file://sys_headers.patch \ - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ " -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:18 +0000 Subject: [oe-commits] [openembedded-core] 12/18: musl: Update to latest tip In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.9BBBD23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e8d52c24ee217d7ba69fe24fa7ef8b533a274c2d Author: Khem Raj AuthorDate: Fri Feb 14 07:42:38 2020 -0800 musl: Update to latest tip Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4..b6ec6fe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:20 +0000 Subject: [oe-commits] [openembedded-core] 14/18: ell: upgrade 0.27 -> 0.28 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.B572323281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 05e94ea4b05c65dfb57f0c3c61c1f8369e144932 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:26 2020 -0800 ell: upgrade 0.27 -> 0.28 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.27.bb rename to meta/recipes-core/ell/ell_0.28.bb index 503f1e2..464bf63 100644 --- a/meta/recipes-core/ell/ell_0.27.bb +++ b/meta/recipes-core/ell/ell_0.28.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2" -SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96" +SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9" +SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b" do_configure_prepend () { mkdir -p ${S}/build-aux -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:16 +0000 Subject: [oe-commits] [openembedded-core] 10/18: ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.8622D232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3cdf5da514b424a6d78ba4e1412331b6cf2b3bff Author: Wang Mingyu AuthorDate: Wed Feb 12 10:35:06 2020 -0800 ruby: upgrade 2.6.5 -> 2.7.0 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...bang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 ++++++++ ...0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...c-check-finite-isinf-isnan-as-macros-firs.patch | 103 --------------------- .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f..a38b3fe 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000..f316bed --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8b..b31dee1 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3..0000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee..c796318 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:17 +0000 Subject: [oe-commits] [openembedded-core] 11/18: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.938B8232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8c3a220a91f90202233765a3b4eb1697c8be18f7 Author: Khem Raj AuthorDate: Fri Feb 14 10:00:07 2020 -0800 busybox: Backport patches to support removal of __NR_clock_gettime This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...all-wrappers-around-clock_gettime-closes-.patch | 120 +++++++++++++++++++++ ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 ++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + 5 files changed, 266 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000..0c7f9b8 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,120 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] +Signed-off-by: Denys Vlasenko +--- + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); +-#elif __TIMESIZE == 64 +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..944526b --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..58a6c0d --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000..4760570 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,46 @@ +From 8c7419649d6e6fda8fa7d0e863084c78ac728628 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 28 Aug 2019 10:54:15 -0700 +Subject: [PATCH 3/3] runsv: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Signed-off-by: Alistair Francis +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=ad27d44ebe950335616f37e36863469dc181b455] +--- + runit/runsv.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/runit/runsv.c b/runit/runsv.c +index ccc762d78..737909b0e 100644 +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++#elif __TIMESIZE == 64 ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + } + #else + static void gettimeofday_ns(struct timespec *ts) +-- +2.22.0 + diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102e..ec5b580 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -42,6 +42,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-check-uudecode-before-using-it.patch \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ file://0001-Remove-stime-function-calls.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:19 +0000 Subject: [oe-commits] [openembedded-core] 13/18: gdb: Upgrade to 9.1 release In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.A8A6D23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4c1c01e023b123c86a418fdeddb69be097deef86 Author: Khem Raj AuthorDate: Fri Feb 14 07:42:39 2020 -0800 gdb: Upgrade to 9.1 release Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 ---- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 ++++ ...canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...001-make-man-install-relative-to-DESTDIR.patch} | 9 +- ...-linux-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...efine-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...-support-for-Renesas-SH-sh4-architecture.patch} | 41 +++---- ...-libreadline.a-when-using-disable-static.patch} | 13 +- ...gidefs.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...0007-Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...AGS.patch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...> 0009-resolve-restrict-keyword-conflict.patch} | 17 ++- ...tch => 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++-- .../gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 --------------------- .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce9..82530f5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f..0000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000..d019e6b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f8..0000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5..82287ea 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74..6067caf 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512..c4bab7b 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840caf..fd165d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee6..d0360da 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bf..d222d01 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5f..0989661 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26..18168c6 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f..8f15c49 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c..5209c00 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000..eedd94c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a..0000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:22 +0000 Subject: [oe-commits] [openembedded-core] 16/18: qemuriscv64: Set the Xvisor platform In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.CC7B723280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bd229106ffdb97a2d7e570a3b69147786569a29b Author: Alistair Francis AuthorDate: Fri Feb 14 11:42:30 2020 -0800 qemuriscv64: Set the Xvisor platform Set the platform information required to build Xvisor. https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-extended/xvisor Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/machine/qemuriscv64.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index b45fdd5..a753af0 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -4,6 +4,8 @@ require conf/machine/include/riscv/qemuriscv.inc +XVISOR_PLAT = "riscv/virt64" + EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE = "qemu-riscv64_smode_defconfig" UBOOT_ELF = "u-boot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:21 +0000 Subject: [oe-commits] [openembedded-core] 15/18: python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.C1E1C23280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 79c940c4df9891932367186c76652887f5aa881b Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:29 2020 -0800 python3-pycairo: upgrade 1.18.2 -> 1.19.0 -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" is added Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb similarity index 77% rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb index 3aedf3d..8f60834 100644 --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "python-devel" LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz" UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" S = "${WORKDIR}/pycairo-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:23 +0000 Subject: [oe-commits] [openembedded-core] 17/18: db: Fix timespec length assumptions In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.D90C623280A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a85afec1115f2a09cd750a4554f44fb8af96975c Author: Khem Raj AuthorDate: Fri Feb 14 14:33:34 2020 -0800 db: Fix timespec length assumptions This should fix the vdso crashes seen with kernel 5.0+ python3[11312] general protection fault ip:b7e966b0 sp:bf8175cc error:0 in libc.so[b7e8b000+6b000] Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- .../db/0001-clock-Do-not-define-own-timespec.patch | 45 ++++++++++++++++++++++ meta/recipes-support/db/db_5.3.28.bb | 1 + 2 files changed, 46 insertions(+) diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch new file mode 100644 index 0000000..9d51a44 --- /dev/null +++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch @@ -0,0 +1,45 @@ +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 14:12:59 -0800 +Subject: [PATCH] clock: Do not define own timespec + +timespec is provided by libc and its best left to libc +os_gettime takes a db_timespec and passed its address to clock_gettime +which assumes that db_timespec and timespec are same but actually +its 12-bytes here and libc has 16-bytes + +This can cause problems especially with 64bit time_t + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/dbinc/clock.h | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +--- a/src/dbinc/clock.h ++++ b/src/dbinc/clock.h +@@ -44,22 +44,8 @@ + extern "C" { + #endif + +-/* +- * This declaration is POSIX-compatible. Because there are lots of different +- * time.h include file patterns out there, it's easier to declare our own name +- * in all cases than to try and discover if a system has a struct timespec. +- * For the same reason, and because we'd have to #include in db.h, +- * we don't export any timespec structures in the DB API, even in places where +- * it would make sense, like the replication statistics information. +- */ +-typedef struct { +- time_t tv_sec; /* seconds */ +-#ifdef HAVE_MIXED_SIZE_ADDRESSING +- int32_t tv_nsec; +-#else +- long tv_nsec; /* nanoseconds */ +-#endif +-} db_timespec; ++#include ++#define db_timespec struct timespec + + /* Operations on timespecs */ + #undef timespecclear diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index a296905..badb79f 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -26,6 +26,7 @@ SRC_URI += "file://fix-parallel-build.patch \ file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ file://sequence-type.patch \ file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ + file://0001-clock-Do-not-define-own-timespec.patch \ " # We are not interested in official latest 6.x versions; # let's track what debian is using. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:24 +0000 Subject: [oe-commits] [openembedded-core] 18/18: populate_sdk_ext: We now require python3, not python In-Reply-To: <158176248670.31260.7654152103178704127@git.openembedded.org> References: <158176248670.31260.7654152103178704127@git.openembedded.org> Message-ID: <20200215102807.E20E023280B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 946ce21b10dcad506edcaadb4e4242c049e4c316 Author: Richard Purdie AuthorDate: Fri Feb 14 18:13:14 2020 +0000 populate_sdk_ext: We now require python3, not python We no longer expect a "python" binary in PATH so update the eSDK's expectations to match. This was the only failure on autobuilder test systems with python missing. Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9511e55..57fd29b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -613,8 +613,8 @@ sdk_ext_preinst() { exit 1 fi # The relocation script used by buildtools installer requires python - if ! command -v python > /dev/null; then - echo "ERROR: The installer requires python, please install it first" + if ! command -v python3 > /dev/null; then + echo "ERROR: The installer requires python3, please install it first" exit 1 fi missing_utils="" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:37 +0000 Subject: [oe-commits] [openembedded-core] 01/14: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.4925B23280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 63cf4992c22fd5dae4981239fb31d789e561a47a Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:36 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (890e5a9 -> b360ff4) Message-ID: <158176251615.32004.7830254091634942492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 890e5a9 HACK: extra debug discard 47aff2f db: Fix timespec length assumptions discard b3eb356 qemuriscv64: Set the Xvisor platform discard 7f2bbfa populate_sdk_ext: We now require python3, not python discard 0391fd4 python3-pycairo: upgrade 1.18.2 -> 1.19.0 discard fc0eabe ell: upgrade 0.27 -> 0.28 discard 0b5782b gdb: Upgrade to 9.1 release discard 4aaf868 musl: Update to latest tip discard 6fad0eb busybox: Backport patches to support removal of __NR_clock_gettime discard e75b114 ruby: upgrade 2.6.5 -> 2.7.0 discard 392c4aa python3-pip: upgrade 19.3.1 -> 20.0.2 discard 6a92209 ffmpeg: add PACKAGECONFIG support for x265 discard a286a07 strace: Update to 5.5 discard 06ae420 glibc-testsuite: Exclude this recipe from world builds discard c715d51 glibc-testsuite: Remove the do_install task discard 7eff2bb squashfs-tools: Enable on musl discard 0dab813 libxml2: Fix CVE-2019-20388 discard 340760e bash: include patch 12-16 discard 3c6530d staging: Handle races between binaries and their libs discard d95275e rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard a3f0055 sstatesig: Log timestamps for hashequiv in reprodubile builds discard f60139b HACK: signing: Add extra test debug discard 6aa2ab5 glew/curl: specify exclusive package configs discard 2dd86b1 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 4b801a7 oescripts.py: use unittest.SkipUnless for class skip add 29d17fe staging: Handle races between binaries and their libs add 10907c6 bash: include patch 12-16 add 12a5eb0 libxml2: Fix CVE-2019-20388 add 2de4471 squashfs-tools: Enable on musl add 2b51252 glibc-testsuite: Remove the do_install task add eadbe01 glibc-testsuite: Exclude this recipe from world builds add 3e1e8d2 strace: Update to 5.5 add 8267419 ffmpeg: add PACKAGECONFIG support for x265 add e521393 python3-pip: upgrade 19.3.1 -> 20.0.2 add 3cdf5da ruby: upgrade 2.6.5 -> 2.7.0 add 8c3a220 busybox: Backport patches to support removal of __NR_clock_gettime add e8d52c2 musl: Update to latest tip add 4c1c01e gdb: Upgrade to 9.1 release add 05e94ea ell: upgrade 0.27 -> 0.28 add 79c940c python3-pycairo: upgrade 1.18.2 -> 1.19.0 add bd22910 qemuriscv64: Set the Xvisor platform add a85afec db: Fix timespec length assumptions add 946ce21 populate_sdk_ext: We now require python3, not python new 63cf499 oescripts.py: use unittest.SkipUnless for class skip new b9faa73 base.bbclass: extend PACKAGECONFIG for conflict package configs new cdec571 glew/curl: specify exclusive package configs new b7b60ba HACK: signing: Add extra test debug new de6a58b sstatesig: Log timestamps for hashequiv in reprodubile builds new 466d8ef rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new fcac23e HACK: extra debug new b4f8351 bind: add mulitlib_header for platform.h new 6096266 libxslt: multilib_header xsltconfig.h new ceb10cf libsndfile1: mutlilibize sndfile.h new 3cd5ff0 libassuan: multilib header for assuan.h new 072c6df subversion: move pkgconfig files in to libdir new def59e8 x11perf: make x11perfcomp a mulitlib script new b360ff4 tcf-agent: Mangle arch for armeb This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (890e5a9) \ N -- N -- N refs/heads/master-next (b360ff4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +++- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++ meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++ meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++- 7 files changed, 25 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:40 +0000 Subject: [oe-commits] [openembedded-core] 04/14: HACK: signing: Add extra test debug In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.62571232814@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b7b60ba39baf254e691349d850850dec0bbf706d Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:38 +0000 Subject: [oe-commits] [openembedded-core] 02/14: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.5291923280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b9faa73a5cdbfa150afda905f56e186c08469227 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:39 +0000 Subject: [oe-commits] [openembedded-core] 03/14: glew/curl: specify exclusive package configs In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.5AC15232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cdec571ca43bc18c23505739d819badad740efb5 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:41 +0000 Subject: [oe-commits] [openembedded-core] 05/14: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.6A5F1232815@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit de6a58bf4ae2fdbf006c695c6e66f5e550c4c9cf Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:43 +0000 Subject: [oe-commits] [openembedded-core] 07/14: HACK: extra debug In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.7E849232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fcac23e11d0615882405093b5937214f55d38da8 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:44 +0000 Subject: [oe-commits] [openembedded-core] 08/14: bind: add mulitlib_header for platform.h In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.88A6B232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b4f8351fde1e3c05edf7d36055a06e9f508050bc Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:48 2020 -0800 bind: add mulitlib_header for platform.h Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.11.13.bb index 338d6c7..4e64171 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.11.13.bb @@ -31,7 +31,7 @@ UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" # don't report it here since dhcpd is already recent enough. CVE_CHECK_WHITELIST += "CVE-2019-6470" -inherit autotools update-rc.d systemd useradd pkgconfig multilib_script +inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -105,6 +105,8 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf fi + + oe_multilib_header isc/platform.h } CONFFILES_${PN} = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:46 +0000 Subject: [oe-commits] [openembedded-core] 10/14: libsndfile1: mutlilibize sndfile.h In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.9C7BD23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ceb10cf579d910e9b2d3bbedf9e9313a342bac80 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:50 2020 -0800 libsndfile1: mutlilibize sndfile.h sndfile.h can differ depending on the combined architectures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 7855008..b100108 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -32,7 +32,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig multilib_header + +do_install_append() { + oe_multilib_header sndfile.h +} # This can't be replicated and is just a memory leak. # https://github.com/erikd/libsndfile/issues/398 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:45 +0000 Subject: [oe-commits] [openembedded-core] 09/14: libxslt: multilib_header xsltconfig.h In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.921D723281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 60962668ebbff4f9733158e843c1d2394d9845c0 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:49 2020 -0800 libxslt: multilib_header xsltconfig.h xsltconfig.h is generated and can be different between multilibs Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb index ad37b5a..1961bb5 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header do_configure_prepend () { # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. @@ -43,6 +43,10 @@ do_install_append_class-native () { create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } +do_install_append () { + oe_multilib_header libxslt/xsltconfig.h +} + FILES_${PN} += "${libdir}/libxslt-plugins" FILES_${PN}-dev += "${libdir}/xsltConf.sh" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:42 +0000 Subject: [oe-commits] [openembedded-core] 06/14: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.738C9232816@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 466d8ef3e63272b8d04725d9516163d10a313d04 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:48 +0000 Subject: [oe-commits] [openembedded-core] 12/14: subversion: move pkgconfig files in to libdir In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.B038723281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 072c6df6a56d60c7b91e0b7ece3db112862d11b1 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:52 2020 -0800 subversion: move pkgconfig files in to libdir All of the .pc files contain the path to ${libdir} which fails in a multilib rpm image. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/subversion/subversion_1.13.0.bb b/meta/recipes-devtools/subversion/subversion_1.13.0.bb index 9c1281a..6879f12 100644 --- a/meta/recipes-devtools/subversion/subversion_1.13.0.bb +++ b/meta/recipes-devtools/subversion/subversion_1.13.0.bb @@ -37,6 +37,8 @@ EXTRA_OECONF = " \ ac_cv_path_RUBY=none \ " +EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" + acpaths = "-I build/ -I build/ac-macros/" CPPFLAGS += "-P" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:47 +0000 Subject: [oe-commits] [openembedded-core] 11/14: libassuan: multilib header for assuan.h In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.A632223281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3cd5ff031fe4afacb93880dc976bccdeda0a9ef7 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:51 2020 -0800 libassuan: multilib header for assuan.h assuan.h is generated and can differ between mutlilibs. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libassuan/libassuan_2.5.3.bb b/meta/recipes-support/libassuan/libassuan_2.5.3.bb index 6fb3d2f..52b4c0f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.3.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.3.bb @@ -22,11 +22,15 @@ SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f7 BINCONFIG = "${bindir}/libassuan-config" -inherit autotools texinfo binconfig-disabled pkgconfig +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } +do_install_append () { + oe_multilib_header assuan.h +} + BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:49 +0000 Subject: [oe-commits] [openembedded-core] 13/14: x11perf: make x11perfcomp a mulitlib script In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.BA158232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit def59e8e0e913275081c38506326c231ea2a4573 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:53 2020 -0800 x11perf: make x11perfcomp a mulitlib script x11perfcomp encodes the library paths in the script. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb index 33c0c8a..c4d443b 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ PE = "1" +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/x11perfcomp" + do_install_append_class-target () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:28:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:28:50 +0000 Subject: [oe-commits] [openembedded-core] 14/14: tcf-agent: Mangle arch for armeb In-Reply-To: <158176251615.32004.7830254091634942492@git.openembedded.org> References: <158176251615.32004.7830254091634942492@git.openembedded.org> Message-ID: <20200215102836.C58BE23280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b360ff4940719a90a3ed1caad1c027aa7d7c8af6 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:44:16 2020 -0800 tcf-agent: Mangle arch for armeb Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index e0a07a9..ed14fe6 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -29,7 +29,7 @@ INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." # mangling needed for make -MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64,`" +MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64, | sed s,armeb,arm,`" MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:29:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:29:16 +0000 Subject: [oe-commits] [bitbake] branch master updated: bitbake: layerindex: use branch when specified Message-ID: <158176255688.487.17123848407037870857@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new 4ec49f4 bitbake: layerindex: use branch when specified 4ec49f4 is described below commit 4ec49f42f327068890e7aad8553d7f282e2ffaa1 Author: Jon Mason AuthorDate: Thu Dec 19 11:39:08 2019 -0600 bitbake: layerindex: use branch when specified When currently specified, the branch is used to verify the versioning of the meta layer, but the master branch is checked out. This change allows for the branch to be specified. Now it is easy to specify all of the meta layers being added are of the same version, without having to do it in each individual git tree. Also, it will error if there are branches without a matching version. Finally, this allows for meta layer git trees without a master branch. Signed-off-by: Jon Mason Minor rework of the patch to use the layerBranch actual_branch since the layerindex referenced branch may be different then the overall release branch. Also adjust the patch to use the default git checkout branch instead of master if no branch was specified. (Some repositories don't have a master branch.) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- lib/bblayers/layerindex.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/bblayers/layerindex.py b/lib/bblayers/layerindex.py index 57cd902..aa3b682 100644 --- a/lib/bblayers/layerindex.py +++ b/lib/bblayers/layerindex.py @@ -24,7 +24,7 @@ class LayerIndexPlugin(ActionPlugin): This class inherits ActionPlugin to get do_add_layer. """ - def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer): + def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch): layername = self.get_layer_name(url) if os.path.splitext(layername)[1] == '.git': layername = os.path.splitext(layername)[0] @@ -32,9 +32,13 @@ class LayerIndexPlugin(ActionPlugin): layerdir = os.path.join(repodir, subdir) if not os.path.exists(repodir): if fetch_layer: - result = subprocess.call(['git', 'clone', url, repodir]) + cmd = ['git', 'clone', '-b' , branch, url, repodir] + if not branch: + # Branch really shouldn't be empty, but use the repo default if it is + cmd = ['git', 'clone', url, repodir] + result = subprocess.call(cmd) if result: - logger.error("Failed to download %s" % url) + logger.error("Failed to download %s (%s)" % (url, branch)) return None, None, None else: return subdir, layername, layerdir @@ -171,7 +175,8 @@ class LayerIndexPlugin(ActionPlugin): subdir, name, layerdir = self.get_fetch_layer(fetchdir, layerBranch.layer.vcs_url, layerBranch.vcs_subdir, - not args.show_only) + not args.show_only, + layerBranch.actual_branch) if not name: # Error already shown return 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:29:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:29:21 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (acb962a -> 44f8fca) Message-ID: <158176256191.707.197793038329554323@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard acb962a bitbake: layerindex: use branch when specified discard 341708c runqueue: Possible tid handling optimisation add 4ec49f4 bitbake: layerindex: use branch when specified new 44f8fca runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (acb962a) \ N -- N -- N refs/heads/master-next (44f8fca) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:29:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:29:22 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158176256191.707.197793038329554323@git.openembedded.org> References: <158176256191.707.197793038329554323@git.openembedded.org> Message-ID: <20200215102922.0771D23280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 44f8fca9539e87675b3df3de66da334902e1480d Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. The following commit(s) were added to refs/heads/master by this push: new aca3900 libxml2: Update patch upstream status aca3900 is described below commit aca3900b9302e619fa6cd3b8a7b3fcae3b2ffe8d Author: Richard Purdie AuthorDate: Sat Feb 15 10:32:53 2020 +0000 libxml2: Update patch upstream status Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch index 4ee2d4f..88eb65a 100644 --- a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -11,7 +11,7 @@ can not be freed anymore. Found with libFuzzer. -Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] CVE: CVE-2019-20388 Signed-off-by: Zhipeng Xie -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:03 +0000 Subject: [oe-commits] [openembedded-core] 01/18: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.681D223280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4157cd3d98f96eab2eb10b58968f468accfeba6d Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:02 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b360ff4 -> 3c1eabb) Message-ID: <158176290222.2070.13540078303136784343@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard b360ff4 tcf-agent: Mangle arch for armeb discard def59e8 x11perf: make x11perfcomp a mulitlib script discard 072c6df subversion: move pkgconfig files in to libdir discard 3cd5ff0 libassuan: multilib header for assuan.h discard ceb10cf libsndfile1: mutlilibize sndfile.h discard 6096266 libxslt: multilib_header xsltconfig.h discard b4f8351 bind: add mulitlib_header for platform.h discard fcac23e HACK: extra debug discard 466d8ef rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard de6a58b sstatesig: Log timestamps for hashequiv in reprodubile builds discard b7b60ba HACK: signing: Add extra test debug discard cdec571 glew/curl: specify exclusive package configs discard b9faa73 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 63cf499 oescripts.py: use unittest.SkipUnless for class skip add aca3900 libxml2: Update patch upstream status new 4157cd3 oescripts.py: use unittest.SkipUnless for class skip new aeedb9b base.bbclass: extend PACKAGECONFIG for conflict package configs new 69fa2d6 glew/curl: specify exclusive package configs new 5171c2d HACK: signing: Add extra test debug new 4217768 sstatesig: Log timestamps for hashequiv in reprodubile builds new d131e72 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 09d594b HACK: extra debug new 7a9c1cb bind: add mulitlib_header for platform.h new ecd4817 libxslt: multilib_header xsltconfig.h new 023f5ee libsndfile1: mutlilibize sndfile.h new 636e1fc libassuan: multilib header for assuan.h new b8e1e69 subversion: move pkgconfig files in to libdir new 73e3be1 x11perf: make x11perfcomp a mulitlib script new 5840326 tcf-agent: Mangle arch for armeb new 4e5c525 image.bbclass, package-index.bb: Delete do_populate_lic task new a2aec6b tclibc-baremetal: Include qemu on the SDK new 2ad2725 tclibc-newlib: Include qemu on the SDK new 3c1eabb newlib: Move syscalls from newlib to libgloss This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b360ff4) \ N -- N -- N refs/heads/master-next (3c1eabb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/image.bbclass | 1 + meta/conf/distro/include/tclibc-baremetal.inc | 2 +- meta/conf/distro/include/tclibc-newlib.inc | 2 +- meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch | 2 +- meta/recipes-core/meta/package-index.bb | 1 + meta/recipes-core/newlib/newlib.inc | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:06 +0000 Subject: [oe-commits] [openembedded-core] 04/18: HACK: signing: Add extra test debug In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.87F6E232815@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5171c2df15113dfbf2317d45b0d587527a13b58d Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:04 +0000 Subject: [oe-commits] [openembedded-core] 02/18: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.73306232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aeedb9b1d5a3ca0caf9797d4366fcdce1ab13976 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:05 +0000 Subject: [oe-commits] [openembedded-core] 03/18: glew/curl: specify exclusive package configs In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.7DD04232814@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 69fa2d69bda3d1f2ab6217f7e3c6a69ce5de198f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:07 +0000 Subject: [oe-commits] [openembedded-core] 05/18: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.95253232816@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4217768b754bf6ed3466f374c67688b7863ee37b Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:09 +0000 Subject: [oe-commits] [openembedded-core] 07/18: HACK: extra debug In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.AF388232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 09d594bd919d420dca92b699c266289dc31cb2ff Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:10 +0000 Subject: [oe-commits] [openembedded-core] 08/18: bind: add mulitlib_header for platform.h In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.BD33F23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a9c1cb5277e0e6555e58219ae67d5e4ff357c86 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:48 2020 -0800 bind: add mulitlib_header for platform.h Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.11.13.bb index 338d6c7..4e64171 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.11.13.bb @@ -31,7 +31,7 @@ UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" # don't report it here since dhcpd is already recent enough. CVE_CHECK_WHITELIST += "CVE-2019-6470" -inherit autotools update-rc.d systemd useradd pkgconfig multilib_script +inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -105,6 +105,8 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf fi + + oe_multilib_header isc/platform.h } CONFFILES_${PN} = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:11 +0000 Subject: [oe-commits] [openembedded-core] 09/18: libxslt: multilib_header xsltconfig.h In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.CA74623281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ecd48174502e487038ff2a06d1f0998e75768c7e Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:49 2020 -0800 libxslt: multilib_header xsltconfig.h xsltconfig.h is generated and can be different between multilibs Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb index ad37b5a..1961bb5 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header do_configure_prepend () { # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. @@ -43,6 +43,10 @@ do_install_append_class-native () { create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } +do_install_append () { + oe_multilib_header libxslt/xsltconfig.h +} + FILES_${PN} += "${libdir}/libxslt-plugins" FILES_${PN}-dev += "${libdir}/xsltConf.sh" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:08 +0000 Subject: [oe-commits] [openembedded-core] 06/18: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.A3688232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d131e726771f0030564e756c1023cc550c4d2bd8 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:12 +0000 Subject: [oe-commits] [openembedded-core] 10/18: libsndfile1: mutlilibize sndfile.h In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.D631823281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 023f5ee216ad41754bd3e4008a271f1b82567dea Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:50 2020 -0800 libsndfile1: mutlilibize sndfile.h sndfile.h can differ depending on the combined architectures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 7855008..b100108 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -32,7 +32,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig multilib_header + +do_install_append() { + oe_multilib_header sndfile.h +} # This can't be replicated and is just a memory leak. # https://github.com/erikd/libsndfile/issues/398 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:13 +0000 Subject: [oe-commits] [openembedded-core] 11/18: libassuan: multilib header for assuan.h In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.E1DC523281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 636e1fcfa979e10010df57baca9ad64eeafce92f Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:51 2020 -0800 libassuan: multilib header for assuan.h assuan.h is generated and can differ between mutlilibs. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libassuan/libassuan_2.5.3.bb b/meta/recipes-support/libassuan/libassuan_2.5.3.bb index 6fb3d2f..52b4c0f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.3.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.3.bb @@ -22,11 +22,15 @@ SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f7 BINCONFIG = "${bindir}/libassuan-config" -inherit autotools texinfo binconfig-disabled pkgconfig +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } +do_install_append () { + oe_multilib_header assuan.h +} + BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:14 +0000 Subject: [oe-commits] [openembedded-core] 12/18: subversion: move pkgconfig files in to libdir In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103502.EF85C23280F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b8e1e69ff81ed700e4f4118087abd755ce64a784 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:52 2020 -0800 subversion: move pkgconfig files in to libdir All of the .pc files contain the path to ${libdir} which fails in a multilib rpm image. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/subversion/subversion_1.13.0.bb b/meta/recipes-devtools/subversion/subversion_1.13.0.bb index 9c1281a..6879f12 100644 --- a/meta/recipes-devtools/subversion/subversion_1.13.0.bb +++ b/meta/recipes-devtools/subversion/subversion_1.13.0.bb @@ -37,6 +37,8 @@ EXTRA_OECONF = " \ ac_cv_path_RUBY=none \ " +EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" + acpaths = "-I build/ -I build/ac-macros/" CPPFLAGS += "-P" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:15 +0000 Subject: [oe-commits] [openembedded-core] 13/18: x11perf: make x11perfcomp a mulitlib script In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103503.075B323280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 73e3be1a4bebede03ebc9ac6e645f11e7e2b4af3 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:53 2020 -0800 x11perf: make x11perfcomp a mulitlib script x11perfcomp encodes the library paths in the script. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb index 33c0c8a..c4d443b 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ PE = "1" +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/x11perfcomp" + do_install_append_class-target () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:16 +0000 Subject: [oe-commits] [openembedded-core] 14/18: tcf-agent: Mangle arch for armeb In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103503.15DA9232815@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 58403266677a358bd6b9a23cf0914223099eac6f Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:44:16 2020 -0800 tcf-agent: Mangle arch for armeb Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index e0a07a9..ed14fe6 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -29,7 +29,7 @@ INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." # mangling needed for make -MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64,`" +MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64, | sed s,armeb,arm,`" MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:17 +0000 Subject: [oe-commits] [openembedded-core] 15/18: image.bbclass, package-index.bb: Delete do_populate_lic task In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103503.22390232813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4e5c52585aef5c642ee7bf58fc675da4660dd66c Author: Khem Raj AuthorDate: Fri Feb 14 15:29:01 2020 -0800 image.bbclass, package-index.bb: Delete do_populate_lic task These are meta packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 1 + meta/recipes-core/meta/package-index.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c282439..07aa1f1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -609,6 +609,7 @@ do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" +deltask do_populate_lic deltask do_populate_sysroot do_package[noexec] = "1" deltask do_package_qa diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index a4123b7..98c5bcb 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -12,6 +12,7 @@ deltask do_patch deltask do_configure deltask do_compile deltask do_install +deltask do_populate_lic deltask do_populate_sysroot do_package_index[nostamp] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:19 +0000 Subject: [oe-commits] [openembedded-core] 17/18: tclibc-newlib: Include qemu on the SDK In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103503.40C51232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ad272544a5fbf7375281109c74f1de13500a46b Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Feb 14 10:13:49 2020 -0800 tclibc-newlib: Include qemu on the SDK Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the newlib based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-newlib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-newlib.inc b/meta/conf/distro/include/tclibc-newlib.inc index 8338003..bf89b11 100644 --- a/meta/conf/distro/include/tclibc-newlib.inc +++ b/meta/conf/distro/include/tclibc-newlib.inc @@ -38,7 +38,7 @@ BASE_DEFAULT_DEPS_append_class-target = " ${NEWLIB_EXTENDED}" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_TARGET_TASK ?= "${LIBC_DEPENDENCIES}" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "zlib ncurses" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:20 +0000 Subject: [oe-commits] [openembedded-core] 18/18: newlib: Move syscalls from newlib to libgloss In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103503.4CCAD232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c1eabbc23db4edbfca1111e8dc3fc68cdb06215 Author: Mark Hatle AuthorDate: Fri Feb 14 12:34:14 2020 -0600 newlib: Move syscalls from newlib to libgloss By passing --disabled-newlib-supplied-syscalls, newlib will disable the generation of builtin syscalls and move this to libgloss. (This also affects the generation of crt0.o.) libgloss SHOULD then provide the syscalls, crt0.o and other functions that are no longer part of newlib itself. This now means that you must link with both newlib and libgloss, whereas before newlib would run in many configurations by itself. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index d7ac8bf..5edea8a 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -42,6 +42,7 @@ EXTRA_OECONF = " \ --with-gnu-as \ --with-gnu-ld \ --disable-multilib \ + --disable-newlib-supplied-syscalls \ " do_configure[cleandirs] = "${B}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:35:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:35:18 +0000 Subject: [oe-commits] [openembedded-core] 16/18: tclibc-baremetal: Include qemu on the SDK In-Reply-To: <158176290222.2070.13540078303136784343@git.openembedded.org> References: <158176290222.2070.13540078303136784343@git.openembedded.org> Message-ID: <20200215103503.325C2232814@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a2aec6b224fcbee62e3a55fa1d771ada8687b031 Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Feb 14 10:13:48 2020 -0800 tclibc-baremetal: Include qemu on the SDK Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the baremetal based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-baremetal.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/meta/conf/distro/include/tclibc-baremetal.inc index e04f8c8..31d132e 100644 --- a/meta/conf/distro/include/tclibc-baremetal.inc +++ b/meta/conf/distro/include/tclibc-baremetal.inc @@ -27,7 +27,7 @@ BASEDEPENDS_remove_class-target = "virtual/${TARGET_PREFIX}compilerlibs" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_TARGET_TASK ?= "libgcc-dev" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "virtual/${MLPREFIX}libc zlib ncurses" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 10:37:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 10:37:33 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: gnupg: Read GNUPG_BINDIR from environment variables for nativesdk Message-ID: <158176305310.3218.9451741616185074654@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 3b44c16 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk 3b44c16 is described below commit 3b44c16ce8f4641b7c06a6a4da6ace2d5842411e Author: Robert Yang AuthorDate: Mon Jan 6 18:30:32 2020 +0800 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk There is already a relocate.patch for native which is used for reading GNUPG_BINDIR from environment variables, now also enable it for nativesdk. Otherwise, command like the following one doesn't work for nativesdk: $ gpg-connect-agent --homedir ../keys/ reloadagent /bye gpg-connect-agent: no running gpg-agent - starting '/opt/path/to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent' gpg-connect-agent: failed to start agent '/opt/path/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent': No such file or directory Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-support/gnupg/gnupg_2.2.19.bb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/gnupg/gnupg_2.2.19.bb b/meta/recipes-support/gnupg/gnupg_2.2.19.bb index 76c09ff..c07bff1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.19.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.19.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" +SRC_URI_append_class-nativesdk = " file://relocate.patch" SRC_URI[md5sum] = "cb3b373d08ba078c325299945a7f2818" SRC_URI[sha256sum] = "242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0" @@ -60,10 +61,17 @@ do_install_append() { } do_install_append_class-native() { - create_wrapper ${D}${bindir}/gpg2 GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpgconf GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpg-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpg-connect-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} + create_wrappers ${STAGING_BINDIR_NATIVE} +} + +do_install_append_class-nativesdk() { + create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} +} + +create_wrappers() { + for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 + done } PACKAGECONFIG ??= "gnutls" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 15:57:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 15:57:36 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (ebdcce6 -> 6e98f09) Message-ID: <158178225656.15084.5707735094904266942@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from ebdcce6 python3-openpyxl: Add initial version 2.6.3 new 6bed9ca mpv: Fix build with python3 new dd641fd python-pytest: Fix typo in SUMMARY new d2c5a23 nmap: make ndiff support python3 new 6e98f09 lirc: build and deploy with python3 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb | 10 +- .../recipes-multimedia/mplayer/mpv/python3.patch | 12 - meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 15 +- .../files/0001-Make-ndiff-support-python3.patch | 1720 ++++++++++++++++++++ ...configure.ac-make-ndiff-depend-on-python3.patch | 48 + meta-oe/recipes-security/nmap/nmap_7.80.bb | 12 +- .../recipes-devtools/python/python-pytest.inc | 2 +- 7 files changed, 1790 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/python3.patch create mode 100644 meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch create mode 100644 meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 15:57:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 15:57:37 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: mpv: Fix build with python3 In-Reply-To: <158178225656.15084.5707735094904266942@git.openembedded.org> References: <158178225656.15084.5707735094904266942@git.openembedded.org> Message-ID: <20200215155736.DA95D232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6bed9ca8a57b879d9ddb358440b5710ef5bded9f Author: Khem Raj AuthorDate: Sat Feb 15 00:06:47 2020 -0800 mpv: Fix build with python3 Use bootstrap.py to download right waf version turn the python3 patch into a sed command Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/mplayer/mpv/python3.patch | 12 ------------ meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 15 +++++++-------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch deleted file mode 100644 index df208cf..0000000 --- a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch +++ /dev/null @@ -1,12 +0,0 @@ -Use Python 3 instead of Python 2. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -diff --git a/waf b/waf -index 6ce2a24..de3c898 100755 ---- a/waf -+++ b/waf -@@ -1 +1 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index bd2e389..066e18a 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -17,11 +17,7 @@ LICENSE_FLAGS = "commercial" SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" SRC_URI = " \ git://github.com/mpv-player/mpv;name=mpv \ - https://www.freehackers.org/~tnagy/release/waf-2.0.19;name=waf;downloadfilename=waf;subdir=git \ - file://python3.patch \ " -SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" -SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" S = "${WORKDIR}/git" @@ -102,11 +98,14 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -adjust_waf_perms() { - chmod +x ${S}/waf -} +do_patch[postfuncs] += "get_waf" -do_patch[postfuncs] += "adjust_waf_perms" +get_waf() { + cd ${S} + ./bootstrap.py + sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/waf + cd - +} FILES_${PN} += " \ ${datadir}/icons \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 15:57:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 15:57:38 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: python-pytest: Fix typo in SUMMARY In-Reply-To: <158178225656.15084.5707735094904266942@git.openembedded.org> References: <158178225656.15084.5707735094904266942@git.openembedded.org> Message-ID: <20200215155736.E50EB23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dd641fd786c74dd643945d52018937729ec1c606 Author: Jeremy Puhlman AuthorDate: Fri Feb 14 18:01:45 2020 -0800 python-pytest: Fix typo in SUMMARY Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pytest.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-pytest.inc b/meta-python/recipes-devtools/python/python-pytest.inc index 4021263..40ca9c2 100644 --- a/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-python/recipes-devtools/python/python-pytest.inc @@ -1,4 +1,4 @@ -SUMMARY = "Simple powerful teting with python" +SUMMARY = "Simple powerful testing with python" HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 15:57:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 15:57:40 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: lirc: build and deploy with python3 In-Reply-To: <158178225656.15084.5707735094904266942@git.openembedded.org> References: <158178225656.15084.5707735094904266942@git.openembedded.org> Message-ID: <20200215155737.085C023281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6e98f09ab108006e7ec4a146a27a54ac189eea60 Author: Max Krummenacher AuthorDate: Sat Feb 15 16:52:59 2020 +0100 lirc: build and deploy with python3 lirc already uses python3 for the build, reflect that in the recipe. Add the relevant python modules used in the scripts to RDEPENDS. Deploy all python scripts in the lirc-python package. Signed-off-by: Max Krummenacher Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb index 606caee..f599696 100644 --- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb +++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb @@ -6,8 +6,7 @@ DESCRIPTION_append_lirc-nslu2example = " This package contains a working config HOMEPAGE = "http://www.lirc.org" SECTION = "console/network" LICENSE = "GPLv2" -DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19" - +DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 python3-pyyaml" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -61,9 +60,9 @@ PACKAGES =+ "${PN}-contrib ${PN}-exec ${PN}-plugins ${PN}-python" RDEPENDS_${PN} = "bash" RDEPENDS_${PN}-exec = "${PN}" -RDEPENDS_${PN}-python = "python" +RDEPENDS_${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" -RRECOMMENDS_lirc = "${PN}-exec ${PN}-plugins" +RRECOMMENDS_${PN} = "${PN}-exec ${PN}-plugins" FILES_${PN}-plugins = "${libdir}/lirc/plugins/*.so ${datadir}/lirc/configs" FILES_${PN}-contrib = "${datadir}/lirc/contrib" @@ -73,8 +72,7 @@ FILES_${PN} += "${systemd_unitdir}/system/lircd.service" FILES_${PN} += "${systemd_unitdir}/system/lircd.socket" FILES_${PN} += "${libdir}/tmpfiles.d/lirc.conf" FILES_${PN}-dbg += "${libdir}/lirc/plugins/.debug" -FILES_${PN}-python += "${libdir}/python*/site-packages" - +FILES_${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${libdir}/python*/site-packages" INITSCRIPT_PACKAGES = "lirc lirc-exec" INITSCRIPT_NAME_lirc-exec = "lircexec" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 15:57:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 15:57:39 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: nmap: make ndiff support python3 In-Reply-To: <158178225656.15084.5707735094904266942@git.openembedded.org> References: <158178225656.15084.5707735094904266942@git.openembedded.org> Message-ID: <20200215155736.F0ECB23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d2c5a23dadc16b6965a0facb7f9e0027c55233b3 Author: Mingli Yu AuthorDate: Sat Feb 15 10:52:20 2020 +0800 nmap: make ndiff support python3 The ndiff is python2 compatible now, backport a patch from debian to make ndiff port to python3. Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../files/0001-Make-ndiff-support-python3.patch | 1720 ++++++++++++++++++++ ...configure.ac-make-ndiff-depend-on-python3.patch | 48 + meta-oe/recipes-security/nmap/nmap_7.80.bb | 12 +- 3 files changed, 1778 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch new file mode 100644 index 0000000..2ca18b0 --- /dev/null +++ b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch @@ -0,0 +1,1720 @@ +From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 14 Feb 2020 10:09:55 +0000 +Subject: [PATCH] Make ndiff support python3 + +Backport a patch from debian to make ndiff support +python3. + +Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + Makefile.in | 12 +- + ndiff/ndiff.py | 495 +++++++++++++++++----------------- + ndiff/ndifftest.py | 94 +++---- + ndiff/scripts/ndiff | 14 +- + ndiff/setup.py | 34 +-- + ndiff/test-scans/anonymize.py | 18 +- + 6 files changed, 333 insertions(+), 334 deletions(-) + mode change 100644 => 100755 ndiff/setup.py + +diff --git a/Makefile.in b/Makefile.in +index eee8863..32f86ba 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ + NDIFFDIR = @NDIFFDIR@ + NPINGDIR = @NPINGDIR@ + PYTHON = @PYTHON@ ++PYTHON3 = /usr/bin/env python3 + DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" + # With GCC, add extra security checks to source code. + # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html +@@ -260,7 +261,7 @@ clean-zenmap: + rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc + + clean-ndiff: +- -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all ++ -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all + + clean-nping: + -cd $(NPINGDIR) && $(MAKE) clean +@@ -368,6 +369,7 @@ tests/check_dns: $(OBJS) + # this as the location of the interpreter whenever we're not doing a + # local installation. + DEFAULT_PYTHON_PATH = /usr/bin/env python ++DEFAULT_PYTHON3_PATH = /usr/bin/env python3 + + build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py + # When DESTDIR is defined, assume we're building an executable +@@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py + ln -sf zenmap $(DESTDIR)$(bindir)/xnmap + + build-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)") + + build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@ + @cd $(NPINGDIR) && $(MAKE) + + install-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") + + NSE_FILES = scripts/script.db scripts/*.nse + NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc +@@ -443,7 +445,7 @@ uninstall-zenmap: + rm -f $(DESTDIR)$(bindir)/xnmap + + uninstall-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall + + uninstall-ncat: + @cd $(NCATDIR) && $(MAKE) uninstall +@@ -458,7 +460,7 @@ check-ncat: + @cd $(NCATDIR) && $(MAKE) check + + check-ndiff: +- @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py ++ @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py + + check-nsock: + @cd $(NSOCKDIR)/src && $(MAKE) check +diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py +index 043273f..abbd1c5 100755 +--- a/ndiff/ndiff.py ++++ b/ndiff/ndiff.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Ndiff + # +@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] + import xml.sax + import xml.sax.saxutils + import xml.dom.minidom +-from StringIO import StringIO ++from io import StringIO + + verbose = False + +-NDIFF_XML_VERSION = u"1" ++NDIFF_XML_VERSION = "1" + + + class OverrideEntityResolver(xml.sax.handler.EntityResolver): +@@ -78,35 +78,35 @@ class Scan(object): + def write_nmaprun_open(self, writer): + attrs = {} + if self.scanner is not None: +- attrs[u"scanner"] = self.scanner ++ attrs["scanner"] = self.scanner + if self.args is not None: +- attrs[u"args"] = self.args ++ attrs["args"] = self.args + if self.start_date is not None: +- attrs[u"start"] = "%d" % time.mktime(self.start_date.timetuple()) +- attrs[u"startstr"] = self.start_date.strftime( ++ attrs["start"] = "%d" % time.mktime(self.start_date.timetuple()) ++ attrs["startstr"] = self.start_date.strftime( + "%a %b %d %H:%M:%S %Y") + if self.version is not None: +- attrs[u"version"] = self.version +- writer.startElement(u"nmaprun", attrs) ++ attrs["version"] = self.version ++ writer.startElement("nmaprun", attrs) + + def write_nmaprun_close(self, writer): +- writer.endElement(u"nmaprun") ++ writer.endElement("nmaprun") + + def nmaprun_to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"nmaprun") ++ elem = document.createElement("nmaprun") + if self.scanner is not None: +- elem.setAttribute(u"scanner", self.scanner) ++ elem.setAttribute("scanner", self.scanner) + if self.args is not None: +- elem.setAttribute(u"args", self.args) ++ elem.setAttribute("args", self.args) + if self.start_date is not None: + elem.setAttribute( +- u"start", "%d" % time.mktime(self.start_date.timetuple())) ++ "start", "%d" % time.mktime(self.start_date.timetuple())) + elem.setAttribute( +- u"startstr", ++ "startstr", + self.start_date.strftime("%a %b %d %H:%M:%S %Y")) + if self.version is not None: +- elem.setAttribute(u"version", self.version) ++ elem.setAttribute("version", self.version) + frag.appendChild(elem) + return frag + +@@ -136,17 +136,17 @@ class Host(object): + + def format_name(self): + """Return a human-readable identifier for this host.""" +- address_s = u", ".join(a.s for a in sorted(self.addresses)) +- hostname_s = u", ".join(sorted(self.hostnames)) ++ address_s = ", ".join(a.s for a in sorted(self.addresses)) ++ hostname_s = ", ".join(sorted(self.hostnames)) + if len(hostname_s) > 0: + if len(address_s) > 0: +- return u"%s (%s)" % (hostname_s, address_s) ++ return "%s (%s)" % (hostname_s, address_s) + else: + return hostname_s + elif len(address_s) > 0: + return address_s + else: +- return u"" ++ return "" + + def add_port(self, port): + self.ports[port.spec] = port +@@ -163,46 +163,46 @@ class Host(object): + return state is None or state in self.extraports + + def extraports_string(self): +- list = [(count, state) for (state, count) in self.extraports.items()] ++ locallist = [(count, state) for (state, count) in list(self.extraports.items())] + # Reverse-sort by count. +- list.sort(reverse=True) +- return u", ".join( +- [u"%d %s ports" % (count, state) for (count, state) in list]) ++ locallist.sort(reverse=True) ++ return ", ".join( ++ ["%d %s ports" % (count, state) for (count, state) in locallist]) + + def state_to_dom_fragment(self, document): + frag = document.createDocumentFragment() + if self.state is not None: +- elem = document.createElement(u"status") +- elem.setAttribute(u"state", self.state) ++ elem = document.createElement("status") ++ elem.setAttribute("state", self.state) + frag.appendChild(elem) + return frag + + def hostname_to_dom_fragment(self, document, hostname): + frag = document.createDocumentFragment() +- elem = document.createElement(u"hostname") +- elem.setAttribute(u"name", hostname) ++ elem = document.createElement("hostname") ++ elem.setAttribute("name", hostname) + frag.appendChild(elem) + return frag + + def extraports_to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- for state, count in self.extraports.items(): +- elem = document.createElement(u"extraports") +- elem.setAttribute(u"state", state) +- elem.setAttribute(u"count", unicode(count)) ++ for state, count in list(self.extraports.items()): ++ elem = document.createElement("extraports") ++ elem.setAttribute("state", state) ++ elem.setAttribute("count", str(count)) + frag.appendChild(elem) + return frag + + def os_to_dom_fragment(self, document, os): + frag = document.createDocumentFragment() +- elem = document.createElement(u"osmatch") +- elem.setAttribute(u"name", os) ++ elem = document.createElement("osmatch") ++ elem.setAttribute("name", os) + frag.appendChild(elem) + return frag + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"host") ++ elem = document.createElement("host") + + if self.state is not None: + elem.appendChild(self.state_to_dom_fragment(document)) +@@ -211,13 +211,13 @@ class Host(object): + elem.appendChild(addr.to_dom_fragment(document)) + + if len(self.hostnames) > 0: +- hostnames_elem = document.createElement(u"hostnames") ++ hostnames_elem = document.createElement("hostnames") + for hostname in self.hostnames: + hostnames_elem.appendChild( + self.hostname_to_dom_fragment(document, hostname)) + elem.appendChild(hostnames_elem) + +- ports_elem = document.createElement(u"ports") ++ ports_elem = document.createElement("ports") + ports_elem.appendChild(self.extraports_to_dom_fragment(document)) + for port in sorted(self.ports.values()): + if not self.is_extraports(port.state): +@@ -226,13 +226,13 @@ class Host(object): + elem.appendChild(ports_elem) + + if len(self.os) > 0: +- os_elem = document.createElement(u"os") ++ os_elem = document.createElement("os") + for os in self.os: + os_elem.appendChild(self.os_to_dom_fragment(document, os)) + elem.appendChild(os_elem) + + if len(self.script_results) > 0: +- hostscript_elem = document.createElement(u"hostscript") ++ hostscript_elem = document.createElement("hostscript") + for sr in self.script_results: + hostscript_elem.appendChild(sr.to_dom_fragment(document)) + elem.appendChild(hostscript_elem) +@@ -246,7 +246,7 @@ class Address(object): + self.s = s + + def __eq__(self, other): +- return self.__cmp__(other) == 0 ++ return self.sort_key() == other.sort_key() + + def __ne__(self, other): + return not self.__eq__(other) +@@ -254,8 +254,8 @@ class Address(object): + def __hash__(self): + return hash(self.sort_key()) + +- def __cmp__(self, other): +- return cmp(self.sort_key(), other.sort_key()) ++ def __lt__(self, other): ++ return self.sort_key() < other.sort_key() + + def __str__(self): + return str(self.s) +@@ -264,21 +264,21 @@ class Address(object): + return self.s + + def new(type, s): +- if type == u"ipv4": ++ if type == "ipv4": + return IPv4Address(s) +- elif type == u"ipv6": ++ elif type == "ipv6": + return IPv6Address(s) +- elif type == u"mac": ++ elif type == "mac": + return MACAddress(s) + else: +- raise ValueError(u"Unknown address type %s." % type) ++ raise ValueError("Unknown address type %s." % type) + new = staticmethod(new) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"address") +- elem.setAttribute(u"addr", self.s) +- elem.setAttribute(u"addrtype", self.type) ++ elem = document.createElement("address") ++ elem.setAttribute("addr", self.s) ++ elem.setAttribute("addrtype", self.type) + frag.appendChild(elem) + return frag + +@@ -287,21 +287,21 @@ class Address(object): + + + class IPv4Address(Address): +- type = property(lambda self: u"ipv4") ++ type = property(lambda self: "ipv4") + + def sort_key(self): + return (0, self.s) + + + class IPv6Address(Address): +- type = property(lambda self: u"ipv6") ++ type = property(lambda self: "ipv6") + + def sort_key(self): + return (1, self.s) + + + class MACAddress(Address): +- type = property(lambda self: u"mac") ++ type = property(lambda self: "mac") + + def sort_key(self): + return (2, self.s) +@@ -320,28 +320,25 @@ class Port(object): + + def state_string(self): + if self.state is None: +- return u"unknown" ++ return "unknown" + else: +- return unicode(self.state) ++ return str(self.state) + + def spec_string(self): +- return u"%d/%s" % self.spec ++ return "%d/%s" % self.spec + +- def __cmp__(self, other): +- d = cmp(self.spec, other.spec) +- if d != 0: +- return d +- return cmp((self.spec, self.service, self.script_results), +- (other.spec, other.service, other.script_results)) ++ def __lt__(self, other): ++ return (self.spec, self.service, self.script_results) < ( ++ other.spec, other.service, other.script_results) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"port") +- elem.setAttribute(u"portid", unicode(self.spec[0])) +- elem.setAttribute(u"protocol", self.spec[1]) ++ elem = document.createElement("port") ++ elem.setAttribute("portid", str(self.spec[0])) ++ elem.setAttribute("protocol", self.spec[1]) + if self.state is not None: +- state_elem = document.createElement(u"state") +- state_elem.setAttribute(u"state", self.state) ++ state_elem = document.createElement("state") ++ state_elem.setAttribute("state", self.state) + elem.appendChild(state_elem) + elem.appendChild(self.service.to_dom_fragment(document)) + for sr in self.script_results: +@@ -385,7 +382,7 @@ class Service(object): + if len(parts) == 0: + return None + else: +- return u"/".join(parts) ++ return "/".join(parts) + + def version_string(self): + """Get a string like in the VERSION column of Nmap output.""" +@@ -395,17 +392,17 @@ class Service(object): + if self.version is not None: + parts.append(self.version) + if self.extrainfo is not None: +- parts.append(u"(%s)" % self.extrainfo) ++ parts.append("(%s)" % self.extrainfo) + + if len(parts) == 0: + return None + else: +- return u" ".join(parts) ++ return " ".join(parts) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"service") +- for attr in (u"name", u"product", u"version", u"extrainfo", u"tunnel"): ++ elem = document.createElement("service") ++ for attr in ("name", "product", "version", "extrainfo", "tunnel"): + v = getattr(self, attr) + if v is None: + continue +@@ -435,53 +432,53 @@ class ScriptResult(object): + result = [] + lines = self.output.splitlines() + if len(lines) > 0: +- lines[0] = self.id + u": " + lines[0] ++ lines[0] = self.id + ": " + lines[0] + for line in lines[:-1]: +- result.append(u"| " + line) ++ result.append("| " + line) + if len(lines) > 0: +- result.append(u"|_ " + lines[-1]) ++ result.append("|_ " + lines[-1]) + return result + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"script") +- elem.setAttribute(u"id", self.id) +- elem.setAttribute(u"output", self.output) ++ elem = document.createElement("script") ++ elem.setAttribute("id", self.id) ++ elem.setAttribute("output", self.output) + frag.appendChild(elem) + return frag + + + def format_banner(scan): + """Format a startup banner more or less like Nmap does.""" +- scanner = u"Nmap" +- if scan.scanner is not None and scan.scanner != u"nmap": ++ scanner = "Nmap" ++ if scan.scanner is not None and scan.scanner != "nmap": + scanner = scan.scanner + parts = [scanner] + if scan.version is not None: + parts.append(scan.version) +- parts.append(u"scan") ++ parts.append("scan") + if scan.start_date is not None: +- parts.append(u"initiated %s" % scan.start_date.strftime( ++ parts.append("initiated %s" % scan.start_date.strftime( + "%a %b %d %H:%M:%S %Y")) + if scan.args is not None: +- parts.append(u"as: %s" % scan.args) +- return u" ".join(parts) ++ parts.append("as: %s" % scan.args) ++ return " ".join(parts) + + + def print_script_result_diffs_text(title, script_results_a, script_results_b, + script_result_diffs, f=sys.stdout): +- table = Table(u"*") ++ table = Table("*") + for sr_diff in script_result_diffs: + sr_diff.append_to_port_table(table) + if len(table) > 0: +- print >> f ++ print(file=f) + if len(script_results_b) == 0: +- print >> f, u"-%s:" % title ++ print("-%s:" % title, file=f) + elif len(script_results_a) == 0: +- print >> f, u"+%s:" % title ++ print("+%s:" % title, file=f) + else: +- print >> f, u" %s:" % title +- print >> f, table ++ print(" %s:" % title, file=f) ++ print(table, file=f) + + + def script_result_diffs_to_dom_fragment(elem, script_results_a, +@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a, + if len(script_results_a) == 0 and len(script_results_b) == 0: + return document.createDocumentFragment() + elif len(script_results_b) == 0: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for sr in script_results_a: + elem.appendChild(sr.to_dom_fragment(document)) + a_elem.appendChild(elem) + return a_elem + elif len(script_results_a) == 0: +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for sr in script_results_b: + elem.appendChild(sr.to_dom_fragment(document)) + b_elem.appendChild(elem) +@@ -581,10 +578,10 @@ class ScanDiffText(ScanDiff): + banner_a = format_banner(self.scan_a) + banner_b = format_banner(self.scan_b) + if banner_a != banner_b: +- print >> self.f, u"-%s" % banner_a +- print >> self.f, u"+%s" % banner_b ++ print("-%s" % banner_a, file=self.f) ++ print("+%s" % banner_b, file=self.f) + elif verbose: +- print >> self.f, u" %s" % banner_a ++ print(" %s" % banner_a, file=self.f) + + def output_pre_scripts(self, pre_script_result_diffs): + print_script_result_diffs_text("Pre-scan script results", +@@ -597,7 +594,7 @@ class ScanDiffText(ScanDiff): + post_script_result_diffs, self.f) + + def output_host_diff(self, h_diff): +- print >> self.f ++ print(file=self.f) + h_diff.print_text(self.f) + + def output_ending(self): +@@ -622,8 +619,8 @@ class ScanDiffXML(ScanDiff): + + def output_beginning(self): + self.writer.startDocument() +- self.writer.startElement(u"nmapdiff", {u"version": NDIFF_XML_VERSION}) +- self.writer.startElement(u"scandiff", {}) ++ self.writer.startElement("nmapdiff", {"version": NDIFF_XML_VERSION}) ++ self.writer.startElement("scandiff", {}) + + if self.nmaprun_differs(): + self.writer.frag_a( +@@ -636,7 +633,7 @@ class ScanDiffXML(ScanDiff): + + def output_pre_scripts(self, pre_script_result_diffs): + if len(pre_script_result_diffs) > 0 or verbose: +- prescript_elem = self.document.createElement(u"prescript") ++ prescript_elem = self.document.createElement("prescript") + frag = script_result_diffs_to_dom_fragment( + prescript_elem, self.scan_a.pre_script_results, + self.scan_b.pre_script_results, pre_script_result_diffs, +@@ -646,7 +643,7 @@ class ScanDiffXML(ScanDiff): + + def output_post_scripts(self, post_script_result_diffs): + if len(post_script_result_diffs) > 0 or verbose: +- postscript_elem = self.document.createElement(u"postscript") ++ postscript_elem = self.document.createElement("postscript") + frag = script_result_diffs_to_dom_fragment( + postscript_elem, self.scan_a.post_script_results, + self.scan_b.post_script_results, post_script_result_diffs, +@@ -660,8 +657,8 @@ class ScanDiffXML(ScanDiff): + frag.unlink() + + def output_ending(self): +- self.writer.endElement(u"scandiff") +- self.writer.endElement(u"nmapdiff") ++ self.writer.endElement("scandiff") ++ self.writer.endElement("nmapdiff") + self.writer.endDocument() + + +@@ -719,9 +716,9 @@ class HostDiff(object): + self.cost += os_cost + + extraports_a = tuple((count, state) +- for (state, count) in self.host_a.extraports.items()) ++ for (state, count) in list(self.host_a.extraports.items())) + extraports_b = tuple((count, state) +- for (state, count) in self.host_b.extraports.items()) ++ for (state, count) in list(self.host_b.extraports.items())) + if extraports_a != extraports_b: + self.extraports_changed = True + self.cost += 1 +@@ -747,69 +744,69 @@ class HostDiff(object): + # Names and addresses. + if self.id_changed: + if host_a.state is not None: +- print >> f, u"-%s:" % host_a.format_name() ++ print("-%s:" % host_a.format_name(), file=f) + if self.host_b.state is not None: +- print >> f, u"+%s:" % host_b.format_name() ++ print("+%s:" % host_b.format_name(), file=f) + else: +- print >> f, u" %s:" % host_a.format_name() ++ print(" %s:" % host_a.format_name(), file=f) + + # State. + if self.state_changed: + if host_a.state is not None: +- print >> f, u"-Host is %s." % host_a.state ++ print("-Host is %s." % host_a.state, file=f) + if host_b.state is not None: +- print >> f, u"+Host is %s." % host_b.state ++ print("+Host is %s." % host_b.state, file=f) + elif verbose: +- print >> f, u" Host is %s." % host_b.state ++ print(" Host is %s." % host_b.state, file=f) + + # Extraports. + if self.extraports_changed: + if len(host_a.extraports) > 0: +- print >> f, u"-Not shown: %s" % host_a.extraports_string() ++ print("-Not shown: %s" % host_a.extraports_string(), file=f) + if len(host_b.extraports) > 0: +- print >> f, u"+Not shown: %s" % host_b.extraports_string() ++ print("+Not shown: %s" % host_b.extraports_string(), file=f) + elif verbose: + if len(host_a.extraports) > 0: +- print >> f, u" Not shown: %s" % host_a.extraports_string() ++ print(" Not shown: %s" % host_a.extraports_string(), file=f) + + # Port table. +- port_table = Table(u"** * * *") ++ port_table = Table("** * * *") + if host_a.state is None: +- mark = u"+" ++ mark = "+" + elif host_b.state is None: +- mark = u"-" ++ mark = "-" + else: +- mark = u" " +- port_table.append((mark, u"PORT", u"STATE", u"SERVICE", u"VERSION")) ++ mark = " " ++ port_table.append((mark, "PORT", "STATE", "SERVICE", "VERSION")) + + for port in self.ports: + port_diff = self.port_diffs[port] + port_diff.append_to_port_table(port_table, host_a, host_b) + + if len(port_table) > 1: +- print >> f, port_table ++ print(port_table, file=f) + + # OS changes. + if self.os_changed or verbose: + if len(host_a.os) > 0: + if len(host_b.os) > 0: +- print >> f, u" OS details:" ++ print(" OS details:", file=f) + else: +- print >> f, u"-OS details:" ++ print("-OS details:", file=f) + elif len(host_b.os) > 0: +- print >> f, u"+OS details:" ++ print("+OS details:", file=f) + # os_diffs is a list of 5-tuples returned by + # difflib.SequenceMatcher. + for op, i1, i2, j1, j2 in self.os_diffs: + if op == "replace" or op == "delete": + for i in range(i1, i2): +- print >> f, "- %s" % host_a.os[i] ++ print("- %s" % host_a.os[i], file=f) + if op == "replace" or op == "insert": + for i in range(j1, j2): +- print >> f, "+ %s" % host_b.os[i] ++ print("+ %s" % host_b.os[i], file=f) + if op == "equal": + for i in range(i1, i2): +- print >> f, " %s" % host_a.os[i] ++ print(" %s" % host_a.os[i], file=f) + + print_script_result_diffs_text("Host script results", + host_a.script_results, host_b.script_results, +@@ -820,32 +817,32 @@ class HostDiff(object): + host_b = self.host_b + + frag = document.createDocumentFragment() +- hostdiff_elem = document.createElement(u"hostdiff") ++ hostdiff_elem = document.createElement("hostdiff") + frag.appendChild(hostdiff_elem) + + if host_a.state is None or host_b.state is None: + # The host is missing in one scan. Output the whole thing. + if host_a.state is not None: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(host_a.to_dom_fragment(document)) + hostdiff_elem.appendChild(a_elem) + elif host_b.state is not None: +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(host_b.to_dom_fragment(document)) + hostdiff_elem.appendChild(b_elem) + return frag + +- host_elem = document.createElement(u"host") ++ host_elem = document.createElement("host") + + # State. + if host_a.state == host_b.state: + if verbose: + host_elem.appendChild(host_a.state_to_dom_fragment(document)) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(host_a.state_to_dom_fragment(document)) + host_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(host_b.state_to_dom_fragment(document)) + host_elem.appendChild(b_elem) + +@@ -854,31 +851,31 @@ class HostDiff(object): + addrset_b = set(host_b.addresses) + for addr in sorted(addrset_a.intersection(addrset_b)): + host_elem.appendChild(addr.to_dom_fragment(document)) +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for addr in sorted(addrset_a - addrset_b): + a_elem.appendChild(addr.to_dom_fragment(document)) + if a_elem.hasChildNodes(): + host_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for addr in sorted(addrset_b - addrset_a): + b_elem.appendChild(addr.to_dom_fragment(document)) + if b_elem.hasChildNodes(): + host_elem.appendChild(b_elem) + + # Host names. +- hostnames_elem = document.createElement(u"hostnames") ++ hostnames_elem = document.createElement("hostnames") + hostnameset_a = set(host_a.hostnames) + hostnameset_b = set(host_b.hostnames) + for hostname in sorted(hostnameset_a.intersection(hostnameset_b)): + hostnames_elem.appendChild( + host_a.hostname_to_dom_fragment(document, hostname)) +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for hostname in sorted(hostnameset_a - hostnameset_b): + a_elem.appendChild( + host_a.hostname_to_dom_fragment(document, hostname)) + if a_elem.hasChildNodes(): + hostnames_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for hostname in sorted(hostnameset_b - hostnameset_a): + b_elem.appendChild( + host_b.hostname_to_dom_fragment(document, hostname)) +@@ -887,15 +884,15 @@ class HostDiff(object): + if hostnames_elem.hasChildNodes(): + host_elem.appendChild(hostnames_elem) + +- ports_elem = document.createElement(u"ports") ++ ports_elem = document.createElement("ports") + # Extraports. + if host_a.extraports == host_b.extraports: + ports_elem.appendChild(host_a.extraports_to_dom_fragment(document)) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(host_a.extraports_to_dom_fragment(document)) + ports_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(host_b.extraports_to_dom_fragment(document)) + ports_elem.appendChild(b_elem) + # Port list. +@@ -911,18 +908,18 @@ class HostDiff(object): + + # OS changes. + if self.os_changed or verbose: +- os_elem = document.createElement(u"os") ++ os_elem = document.createElement("os") + # os_diffs is a list of 5-tuples returned by + # difflib.SequenceMatcher. + for op, i1, i2, j1, j2 in self.os_diffs: + if op == "replace" or op == "delete": +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for i in range(i1, i2): + a_elem.appendChild(host_a.os_to_dom_fragment( + document, host_a.os[i])) + os_elem.appendChild(a_elem) + if op == "replace" or op == "insert": +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for i in range(j1, j2): + b_elem.appendChild(host_b.os_to_dom_fragment( + document, host_b.os[i])) +@@ -936,7 +933,7 @@ class HostDiff(object): + + # Host script changes. + if len(self.script_result_diffs) > 0 or verbose: +- hostscript_elem = document.createElement(u"hostscript") ++ hostscript_elem = document.createElement("hostscript") + host_elem.appendChild(script_result_diffs_to_dom_fragment( + hostscript_elem, host_a.script_results, + host_b.script_results, self.script_result_diffs, +@@ -989,38 +986,38 @@ class PortDiff(object): + self.port_b.service.version_string()] + if a_columns == b_columns: + if verbose or self.script_result_diffs > 0: +- table.append([u" "] + a_columns) ++ table.append([" "] + a_columns) + else: + if not host_a.is_extraports(self.port_a.state): +- table.append([u"-"] + a_columns) ++ table.append(["-"] + a_columns) + if not host_b.is_extraports(self.port_b.state): +- table.append([u"+"] + b_columns) ++ table.append(["+"] + b_columns) + + for sr_diff in self.script_result_diffs: + sr_diff.append_to_port_table(table) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- portdiff_elem = document.createElement(u"portdiff") ++ portdiff_elem = document.createElement("portdiff") + frag.appendChild(portdiff_elem) + if (self.port_a.spec == self.port_b.spec and + self.port_a.state == self.port_b.state): +- port_elem = document.createElement(u"port") +- port_elem.setAttribute(u"portid", unicode(self.port_a.spec[0])) +- port_elem.setAttribute(u"protocol", self.port_a.spec[1]) ++ port_elem = document.createElement("port") ++ port_elem.setAttribute("portid", str(self.port_a.spec[0])) ++ port_elem.setAttribute("protocol", self.port_a.spec[1]) + if self.port_a.state is not None: +- state_elem = document.createElement(u"state") +- state_elem.setAttribute(u"state", self.port_a.state) ++ state_elem = document.createElement("state") ++ state_elem.setAttribute("state", self.port_a.state) + port_elem.appendChild(state_elem) + if self.port_a.service == self.port_b.service: + port_elem.appendChild( + self.port_a.service.to_dom_fragment(document)) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild( + self.port_a.service.to_dom_fragment(document)) + port_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild( + self.port_b.service.to_dom_fragment(document)) + port_elem.appendChild(b_elem) +@@ -1028,10 +1025,10 @@ class PortDiff(object): + port_elem.appendChild(sr_diff.to_dom_fragment(document)) + portdiff_elem.appendChild(port_elem) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(self.port_a.to_dom_fragment(document)) + portdiff_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(self.port_b.to_dom_fragment(document)) + portdiff_elem.appendChild(b_elem) + +@@ -1086,13 +1083,13 @@ class ScriptResultDiff(object): + for op, i1, i2, j1, j2 in diffs.get_opcodes(): + if op == "replace" or op == "delete": + for k in range(i1, i2): +- table.append_raw(u"-" + a_lines[k]) ++ table.append_raw("-" + a_lines[k]) + if op == "replace" or op == "insert": + for k in range(j1, j2): +- table.append_raw(u"+" + b_lines[k]) ++ table.append_raw("+" + b_lines[k]) + if op == "equal": + for k in range(i1, i2): +- table.append_raw(u" " + a_lines[k]) ++ table.append_raw(" " + a_lines[k]) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +@@ -1102,11 +1099,11 @@ class ScriptResultDiff(object): + frag.appendChild(self.sr_a.to_dom_fragment(document)) + else: + if self.sr_a is not None: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(self.sr_a.to_dom_fragment(document)) + frag.appendChild(a_elem) + if self.sr_b is not None: +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(self.sr_b.to_dom_fragment(document)) + frag.appendChild(b_elem) + return frag +@@ -1120,7 +1117,7 @@ class Table(object): + copied to the output.""" + self.widths = [] + self.rows = [] +- self.prefix = u"" ++ self.prefix = "" + self.padding = [] + j = 0 + while j < len(template) and template[j] != "*": +@@ -1145,7 +1142,7 @@ class Table(object): + + for i in range(len(row)): + if row[i] is None: +- s = u"" ++ s = "" + else: + s = str(row[i]) + if i == len(self.widths): +@@ -1167,7 +1164,7 @@ class Table(object): + for row in self.rows: + parts = [self.prefix] + i = 0 +- if isinstance(row, basestring): ++ if isinstance(row, str): + # A raw string. + lines.append(row) + else: +@@ -1176,13 +1173,13 @@ class Table(object): + if i < len(self.padding): + parts.append(self.padding[i]) + i += 1 +- lines.append(u"".join(parts).rstrip()) +- return u"\n".join(lines) ++ lines.append("".join(parts).rstrip()) ++ return "\n".join(lines) + + + def warn(str): + """Print a warning to stderr.""" +- print >> sys.stderr, str ++ print(str, file=sys.stderr) + + + class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): + self.current_port = None + + self._start_elem_handlers = { +- u"nmaprun": self._start_nmaprun, +- u"host": self._start_host, +- u"status": self._start_status, +- u"address": self._start_address, +- u"hostname": self._start_hostname, +- u"extraports": self._start_extraports, +- u"port": self._start_port, +- u"state": self._start_state, +- u"service": self._start_service, +- u"script": self._start_script, +- u"osmatch": self._start_osmatch, +- u"finished": self._start_finished, ++ "nmaprun": self._start_nmaprun, ++ "host": self._start_host, ++ "status": self._start_status, ++ "address": self._start_address, ++ "hostname": self._start_hostname, ++ "extraports": self._start_extraports, ++ "port": self._start_port, ++ "state": self._start_state, ++ "service": self._start_service, ++ "script": self._start_script, ++ "osmatch": self._start_osmatch, ++ "finished": self._start_finished, + } + self._end_elem_handlers = { +- u'host': self._end_host, +- u'port': self._end_port, ++ 'host': self._end_host, ++ 'port': self._end_port, + } + + def parent_element(self): +@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): + def _start_nmaprun(self, name, attrs): + assert self.parent_element() is None + if "start" in attrs: +- start_timestamp = int(attrs.get(u"start")) ++ start_timestamp = int(attrs.get("start")) + self.scan.start_date = datetime.datetime.fromtimestamp( + start_timestamp) +- self.scan.scanner = attrs.get(u"scanner") +- self.scan.args = attrs.get(u"args") +- self.scan.version = attrs.get(u"version") ++ self.scan.scanner = attrs.get("scanner") ++ self.scan.args = attrs.get("args") ++ self.scan.version = attrs.get("version") + + def _start_host(self, name, attrs): +- assert self.parent_element() == u"nmaprun" ++ assert self.parent_element() == "nmaprun" + self.current_host = Host() + self.scan.hosts.append(self.current_host) + + def _start_status(self, name, attrs): +- assert self.parent_element() == u"host" ++ assert self.parent_element() == "host" + assert self.current_host is not None +- state = attrs.get(u"state") ++ state = attrs.get("state") + if state is None: + warn(u'%s element of host %s is missing the "state" attribute; ' +- 'assuming \unknown\.' % ( ++ r'assuming \unknown\.' % ( + name, self.current_host.format_name())) + return + self.current_host.state = state + + def _start_address(self, name, attrs): +- assert self.parent_element() == u"host" ++ assert self.parent_element() == "host" + assert self.current_host is not None +- addr = attrs.get(u"addr") ++ addr = attrs.get("addr") + if addr is None: +- warn(u'%s element of host %s is missing the "addr" ' ++ warn('%s element of host %s is missing the "addr" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return +- addrtype = attrs.get(u"addrtype", u"ipv4") ++ addrtype = attrs.get("addrtype", "ipv4") + self.current_host.add_address(Address.new(addrtype, addr)) + + def _start_hostname(self, name, attrs): +- assert self.parent_element() == u"hostnames" ++ assert self.parent_element() == "hostnames" + assert self.current_host is not None +- hostname = attrs.get(u"name") ++ hostname = attrs.get("name") + if hostname is None: +- warn(u'%s element of host %s is missing the "name" ' ++ warn('%s element of host %s is missing the "name" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return + self.current_host.add_hostname(hostname) + + def _start_extraports(self, name, attrs): +- assert self.parent_element() == u"ports" ++ assert self.parent_element() == "ports" + assert self.current_host is not None +- state = attrs.get(u"state") ++ state = attrs.get("state") + if state is None: +- warn(u'%s element of host %s is missing the "state" ' ++ warn('%s element of host %s is missing the "state" ' + 'attribute; assuming "unknown".' % ( + name, self.current_host.format_name())) + state = None + if state in self.current_host.extraports: +- warn(u'Duplicate extraports state "%s" in host %s.' % ( ++ warn('Duplicate extraports state "%s" in host %s.' % ( + state, self.current_host.format_name())) + +- count = attrs.get(u"count") ++ count = attrs.get("count") + if count is None: +- warn(u'%s element of host %s is missing the "count" ' ++ warn('%s element of host %s is missing the "count" ' + 'attribute; assuming 0.' % ( + name, self.current_host.format_name())) + count = 0 +@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): + try: + count = int(count) + except ValueError: +- warn(u"Can't convert extraports count \"%s\" " ++ warn("Can't convert extraports count \"%s\" " + "to an integer in host %s; assuming 0." % ( +- attrs[u"count"], self.current_host.format_name())) ++ attrs["count"], self.current_host.format_name())) + count = 0 + self.current_host.extraports[state] = count + + def _start_port(self, name, attrs): +- assert self.parent_element() == u"ports" ++ assert self.parent_element() == "ports" + assert self.current_host is not None +- portid_str = attrs.get(u"portid") ++ portid_str = attrs.get("portid") + if portid_str is None: +- warn(u'%s element of host %s missing the "portid" ' ++ warn('%s element of host %s missing the "portid" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return + try: + portid = int(portid_str) + except ValueError: +- warn(u"Can't convert portid \"%s\" to an integer " ++ warn("Can't convert portid \"%s\" to an integer " + "in host %s; skipping port." % ( + portid_str, self.current_host.format_name())) + return +- protocol = attrs.get(u"protocol") ++ protocol = attrs.get("protocol") + if protocol is None: +- warn(u'%s element of host %s missing the "protocol" ' ++ warn('%s element of host %s missing the "protocol" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return + self.current_port = Port((portid, protocol)) + + def _start_state(self, name, attrs): +- assert self.parent_element() == u"port" ++ assert self.parent_element() == "port" + assert self.current_host is not None + if self.current_port is None: + return + if "state" not in attrs: +- warn(u'%s element of port %s is missing the "state" ' ++ warn('%s element of port %s is missing the "state" ' + 'attribute; assuming "unknown".' % ( + name, self.current_port.spec_string())) + return +- self.current_port.state = attrs[u"state"] ++ self.current_port.state = attrs["state"] + self.current_host.add_port(self.current_port) + + def _start_service(self, name, attrs): +- assert self.parent_element() == u"port" ++ assert self.parent_element() == "port" + assert self.current_host is not None + if self.current_port is None: + return +- self.current_port.service.name = attrs.get(u"name") +- self.current_port.service.product = attrs.get(u"product") +- self.current_port.service.version = attrs.get(u"version") +- self.current_port.service.extrainfo = attrs.get(u"extrainfo") +- self.current_port.service.tunnel = attrs.get(u"tunnel") ++ self.current_port.service.name = attrs.get("name") ++ self.current_port.service.product = attrs.get("product") ++ self.current_port.service.version = attrs.get("version") ++ self.current_port.service.extrainfo = attrs.get("extrainfo") ++ self.current_port.service.tunnel = attrs.get("tunnel") + + def _start_script(self, name, attrs): + result = ScriptResult() +- result.id = attrs.get(u"id") ++ result.id = attrs.get("id") + if result.id is None: +- warn(u'%s element missing the "id" attribute; skipping.' % name) ++ warn('%s element missing the "id" attribute; skipping.' % name) + return + +- result.output = attrs.get(u"output") ++ result.output = attrs.get("output") + if result.output is None: +- warn(u'%s element missing the "output" attribute; skipping.' ++ warn('%s element missing the "output" attribute; skipping.' + % name) + return +- if self.parent_element() == u"prescript": ++ if self.parent_element() == "prescript": + self.scan.pre_script_results.append(result) +- elif self.parent_element() == u"postscript": ++ elif self.parent_element() == "postscript": + self.scan.post_script_results.append(result) +- elif self.parent_element() == u"hostscript": ++ elif self.parent_element() == "hostscript": + self.current_host.script_results.append(result) +- elif self.parent_element() == u"port": ++ elif self.parent_element() == "port": + self.current_port.script_results.append(result) + else: +- warn(u"%s element not inside prescript, postscript, hostscript, " ++ warn("%s element not inside prescript, postscript, hostscript, " + "or port element; ignoring." % name) + return + + def _start_osmatch(self, name, attrs): +- assert self.parent_element() == u"os" ++ assert self.parent_element() == "os" + assert self.current_host is not None + if "name" not in attrs: +- warn(u'%s element of host %s is missing the "name" ' ++ warn('%s element of host %s is missing the "name" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return +- self.current_host.os.append(attrs[u"name"]) ++ self.current_host.os.append(attrs["name"]) + + def _start_finished(self, name, attrs): +- assert self.parent_element() == u"runstats" ++ assert self.parent_element() == "runstats" + if "time" in attrs: +- end_timestamp = int(attrs.get(u"time")) ++ end_timestamp = int(attrs.get("time")) + self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp) + + def _end_host(self, name): +@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator): + + def frag(self, frag): + for node in frag.childNodes: +- node.writexml(self.f, newl=u"\n") ++ node.writexml(self.f, newl="\n") + + def frag_a(self, frag): +- self.startElement(u"a", {}) ++ self.startElement("a", {}) + for node in frag.childNodes: +- node.writexml(self.f, newl=u"\n") +- self.endElement(u"a") ++ node.writexml(self.f, newl="\n") ++ self.endElement("a") + + def frag_b(self, frag): +- self.startElement(u"b", {}) ++ self.startElement("b", {}) + for node in frag.childNodes: +- node.writexml(self.f, newl=u"\n") +- self.endElement(u"b") ++ node.writexml(self.f, newl="\n") ++ self.endElement("b") + + + def usage(): +- print u"""\ ++ print("""\ + Usage: %s [option] FILE1 FILE2 + Compare two Nmap XML files and display a list of their differences. + Differences include host state changes, port state changes, and changes to +@@ -1451,7 +1448,7 @@ service and OS detection. + -v, --verbose also show hosts and ports that haven't changed. + --text display output in text format (default) + --xml display output in XML format\ +-""" % sys.argv[0] ++""" % sys.argv[0]) + + EXIT_EQUAL = 0 + EXIT_DIFFERENT = 1 +@@ -1459,8 +1456,8 @@ EXIT_ERROR = 2 + + + def usage_error(msg): +- print >> sys.stderr, u"%s: %s" % (sys.argv[0], msg) +- print >> sys.stderr, u"Try '%s -h' for help." % sys.argv[0] ++ print("%s: %s" % (sys.argv[0], msg), file=sys.stderr) ++ print("Try '%s -h' for help." % sys.argv[0], file=sys.stderr) + sys.exit(EXIT_ERROR) + + +@@ -1471,7 +1468,7 @@ def main(): + try: + opts, input_filenames = getopt.gnu_getopt( + sys.argv[1:], "hv", ["help", "text", "verbose", "xml"]) +- except getopt.GetoptError, e: ++ except getopt.GetoptError as e: + usage_error(e.msg) + for o, a in opts: + if o == "-h" or o == "--help": +@@ -1481,15 +1478,15 @@ def main(): + verbose = True + elif o == "--text": + if output_format is not None and output_format != "text": +- usage_error(u"contradictory output format options.") ++ usage_error("contradictory output format options.") + output_format = "text" + elif o == "--xml": + if output_format is not None and output_format != "xml": +- usage_error(u"contradictory output format options.") ++ usage_error("contradictory output format options.") + output_format = "xml" + + if len(input_filenames) != 2: +- usage_error(u"need exactly two input filenames.") ++ usage_error("need exactly two input filenames.") + + if output_format is None: + output_format = "text" +@@ -1502,8 +1499,8 @@ def main(): + scan_a.load_from_file(filename_a) + scan_b = Scan() + scan_b.load_from_file(filename_b) +- except IOError, e: +- print >> sys.stderr, u"Can't open file: %s" % str(e) ++ except IOError as e: ++ print("Can't open file: %s" % str(e), file=sys.stderr) + sys.exit(EXIT_ERROR) + + if output_format == "text": +diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py +index 2fa4ae0..27fc525 100755 +--- a/ndiff/ndifftest.py ++++ b/ndiff/ndifftest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Unit tests for Ndiff. + +@@ -22,7 +22,7 @@ for x in dir(ndiff): + sys.dont_write_bytecode = dont_write_bytecode + del dont_write_bytecode + +-import StringIO ++import io + + + class scan_test(unittest.TestCase): +@@ -52,7 +52,7 @@ class scan_test(unittest.TestCase): + scan.load_from_file("test-scans/single.xml") + host = scan.hosts[0] + self.assertEqual(len(host.ports), 5) +- self.assertEqual(host.extraports.items(), [("filtered", 95)]) ++ self.assertEqual(list(host.extraports.items()), [("filtered", 95)]) + + def test_extraports_multi(self): + """Test that the correct number of known ports is returned when there +@@ -68,9 +68,9 @@ class scan_test(unittest.TestCase): + """Test that nmaprun information is recorded.""" + scan = Scan() + scan.load_from_file("test-scans/empty.xml") +- self.assertEqual(scan.scanner, u"nmap") +- self.assertEqual(scan.version, u"4.90RC2") +- self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100") ++ self.assertEqual(scan.scanner, "nmap") ++ self.assertEqual(scan.version, "4.90RC2") ++ self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100") + + def test_addresses(self): + """Test that addresses are recorded.""" +@@ -84,7 +84,7 @@ class scan_test(unittest.TestCase): + scan = Scan() + scan.load_from_file("test-scans/simple.xml") + host = scan.hosts[0] +- self.assertEqual(host.hostnames, [u"scanme.nmap.org"]) ++ self.assertEqual(host.hostnames, ["scanme.nmap.org"]) + + def test_os(self): + """Test that OS information is recorded.""" +@@ -99,7 +99,7 @@ class scan_test(unittest.TestCase): + scan.load_from_file("test-scans/complex.xml") + host = scan.hosts[0] + self.assertTrue(len(host.script_results) > 0) +- self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0) ++ self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0) + + # This test is commented out because Nmap XML doesn't store any information + # about down hosts, not even the fact that they are down. Recovering the list +@@ -128,16 +128,16 @@ class host_test(unittest.TestCase): + + def test_format_name(self): + h = Host() +- self.assertTrue(isinstance(h.format_name(), basestring)) +- h.add_address(IPv4Address(u"127.0.0.1")) +- self.assertTrue(u"127.0.0.1" in h.format_name()) ++ self.assertTrue(isinstance(h.format_name(), str)) ++ h.add_address(IPv4Address("127.0.0.1")) ++ self.assertTrue("127.0.0.1" in h.format_name()) + h.add_address(IPv6Address("::1")) +- self.assertTrue(u"127.0.0.1" in h.format_name()) +- self.assertTrue(u"::1" in h.format_name()) +- h.add_hostname(u"localhost") +- self.assertTrue(u"127.0.0.1" in h.format_name()) +- self.assertTrue(u"::1" in h.format_name()) +- self.assertTrue(u"localhost" in h.format_name()) ++ self.assertTrue("127.0.0.1" in h.format_name()) ++ self.assertTrue("::1" in h.format_name()) ++ h.add_hostname("localhost") ++ self.assertTrue("127.0.0.1" in h.format_name()) ++ self.assertTrue("::1" in h.format_name()) ++ self.assertTrue("localhost" in h.format_name()) + + def test_empty_get_port(self): + h = Host() +@@ -197,8 +197,8 @@ class host_test(unittest.TestCase): + h = s.hosts[0] + self.assertEqual(len(h.ports), 5) + self.assertEqual(len(h.extraports), 1) +- self.assertEqual(h.extraports.keys()[0], u"filtered") +- self.assertEqual(h.extraports.values()[0], 95) ++ self.assertEqual(list(h.extraports.keys())[0], "filtered") ++ self.assertEqual(list(h.extraports.values())[0], 95) + self.assertEqual(h.state, "up") + + +@@ -241,13 +241,13 @@ class port_test(unittest.TestCase): + """Test the Port class.""" + def test_spec_string(self): + p = Port((10, "tcp")) +- self.assertEqual(p.spec_string(), u"10/tcp") ++ self.assertEqual(p.spec_string(), "10/tcp") + p = Port((100, "ip")) +- self.assertEqual(p.spec_string(), u"100/ip") ++ self.assertEqual(p.spec_string(), "100/ip") + + def test_state_string(self): + p = Port((10, "tcp")) +- self.assertEqual(p.state_string(), u"unknown") ++ self.assertEqual(p.state_string(), "unknown") + + + class service_test(unittest.TestCase): +@@ -255,47 +255,47 @@ class service_test(unittest.TestCase): + def test_compare(self): + """Test that services with the same contents compare equal.""" + a = Service() +- a.name = u"ftp" +- a.product = u"FooBar FTP" +- a.version = u"1.1.1" +- a.tunnel = u"ssl" ++ a.name = "ftp" ++ a.product = "FooBar FTP" ++ a.version = "1.1.1" ++ a.tunnel = "ssl" + self.assertEqual(a, a) + b = Service() +- b.name = u"ftp" +- b.product = u"FooBar FTP" +- b.version = u"1.1.1" +- b.tunnel = u"ssl" ++ b.name = "ftp" ++ b.product = "FooBar FTP" ++ b.version = "1.1.1" ++ b.tunnel = "ssl" + self.assertEqual(a, b) +- b.name = u"http" ++ b.name = "http" + self.assertNotEqual(a, b) + c = Service() + self.assertNotEqual(a, c) + + def test_tunnel(self): + serv = Service() +- serv.name = u"http" +- serv.tunnel = u"ssl" +- self.assertEqual(serv.name_string(), u"ssl/http") ++ serv.name = "http" ++ serv.tunnel = "ssl" ++ self.assertEqual(serv.name_string(), "ssl/http") + + def test_version_string(self): + serv = Service() +- serv.product = u"FooBar" ++ serv.product = "FooBar" + self.assertTrue(len(serv.version_string()) > 0) + serv = Service() +- serv.version = u"1.2.3" ++ serv.version = "1.2.3" + self.assertTrue(len(serv.version_string()) > 0) + serv = Service() +- serv.extrainfo = u"misconfigured" ++ serv.extrainfo = "misconfigured" + self.assertTrue(len(serv.version_string()) > 0) + serv = Service() +- serv.product = u"FooBar" +- serv.version = u"1.2.3" ++ serv.product = "FooBar" ++ serv.version = "1.2.3" + # Must match Nmap output. + self.assertEqual(serv.version_string(), +- u"%s %s" % (serv.product, serv.version)) +- serv.extrainfo = u"misconfigured" ++ "%s %s" % (serv.product, serv.version)) ++ serv.extrainfo = "misconfigured" + self.assertEqual(serv.version_string(), +- u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) ++ "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) + + + class ScanDiffSub(ScanDiff): +@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase): + a.load_from_file("test-scans/empty.xml") + b = Scan() + b.load_from_file("test-scans/simple.xml") +- f = StringIO.StringIO() ++ f = io.StringIO() + self.scan_diff = ScanDiffXML(a, b, f) + self.scan_diff.output() + self.xml = f.getvalue() +@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase): + def test_well_formed(self): + try: + document = xml.dom.minidom.parseString(self.xml) +- except Exception, e: +- self.fail(u"Parsing XML diff output caused the exception: %s" ++ except Exception as e: ++ self.fail("Parsing XML diff output caused the exception: %s" + % str(e)) + + +@@ -739,8 +739,8 @@ def host_apply_diff(host, diff): + host.os = diff.host_b.os[:] + + if diff.extraports_changed: +- for state in host.extraports.keys(): +- for port in host.ports.values(): ++ for state in list(host.extraports.keys()): ++ for port in list(host.ports.values()): + if port.state == state: + del host.ports[port.spec] + host.extraports = diff.host_b.extraports.copy() +diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff +index 8517c07..4671e73 100755 +--- a/ndiff/scripts/ndiff ++++ b/ndiff/scripts/ndiff +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Ndiff + # +@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB): + + try: + import ndiff +-except ImportError, e: +- print >> sys.stderr, """\ ++except ImportError as e: ++ print("""\ + Could not import the ndiff module: %s. +-I checked in these directories:""" % repr(e.message) ++I checked in these directories:""" % repr(e), file=sys.stderr) + for dir in sys.path: +- print >> sys.stderr, " %s" % dir +- print >> sys.stderr, """\ ++ print(" %s" % dir, file=sys.stderr) ++ print("""\ + If you installed Ndiff in another directory, you may have to add the +-modules directory to the PYTHONPATH environment variable.""" ++modules directory to the PYTHONPATH environment variable.""", file=sys.stderr) + sys.exit(1) + + import ndiff +diff --git a/ndiff/setup.py b/ndiff/setup.py +old mode 100644 +new mode 100755 +index b5e254c..c49bcf3 +--- a/ndiff/setup.py ++++ b/ndiff/setup.py +@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install): + self.saved_prefix = sys.prefix + try: + distutils.command.install.install.finalize_options(self) +- except distutils.errors.DistutilsPlatformError, e: ++ except distutils.errors.DistutilsPlatformError as e: + raise distutils.errors.DistutilsPlatformError(str(e) + """ + Installing your distribution's python-dev package may solve this problem.""") + +@@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""") + #!/usr/bin/env python + import errno, os, os.path, sys + +-print 'Uninstall %(name)s' ++print('Uninstall %(name)s') + + answer = raw_input('Are you sure that you want to uninstall ' + '%(name)s (yes/no) ') + + if answer != 'yes' and answer != 'y': +- print 'Not uninstalling.' ++ print('Not uninstalling.') + sys.exit(0) + + """ % {'name': APP_NAME} +@@ -177,8 +177,8 @@ if answer != 'yes' and answer != 'y': + # This should never happen (everything gets installed + # inside the root), but if it does, be safe and don't + # delete anything. +- uninstaller += ("print '%s was not installed inside " +- "the root %s; skipping.'\n" % (output, self.root)) ++ uninstaller += ("print('%s was not installed inside " ++ "the root %s; skipping.')\n" % (output, self.root)) + continue + output = path_strip_prefix(output, self.root) + assert os.path.isabs(output) +@@ -202,24 +202,24 @@ for path in INSTALLED_FILES: + dirs.append(path) + # Delete the files. + for file in files: +- print "Removing '%s'." % file ++ print("Removing '%s'." % file) + try: + os.remove(file) +- except OSError, e: +- print >> sys.stderr, ' Error: %s.' % str(e) ++ except OSError as e: ++ print(' Error: %s.' % str(e), file=sys.stderr) + # Delete the directories. First reverse-sort the normalized paths by + # length so that child directories are deleted before their parents. + dirs = [os.path.normpath(dir) for dir in dirs] + dirs.sort(key = len, reverse = True) + for dir in dirs: + try: +- print "Removing the directory '%s'." % dir ++ print("Removing the directory '%s'." % dir) + os.rmdir(dir) +- except OSError, e: ++ except OSError as e: + if e.errno == errno.ENOTEMPTY: +- print "Directory '%s' not empty; not removing." % dir ++ print("Directory '%s' not empty; not removing." % dir) + else: +- print >> sys.stderr, str(e) ++ print(str(e), file=sys.stderr) + """ + + uninstaller_file = open(uninstaller_filename, 'w') +@@ -227,7 +227,7 @@ for dir in dirs: + uninstaller_file.close() + + # Set exec bit for uninstaller +- mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777 ++ mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777 + os.chmod(uninstaller_filename, mode) + + def write_installed_files(self): +@@ -242,7 +242,7 @@ for dir in dirs: + try: + for output in self.get_installed_files(): + assert "\n" not in output +- print >> f, output ++ print(output, file=f) + finally: + f.close() + +@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command): + # Read the list of installed files. + try: + f = open(INSTALLED_FILES_NAME, "r") +- except IOError, e: ++ except IOError as e: + if e.errno == errno.ENOENT: + log.error("Couldn't open the installation record '%s'. " + "Have you installed yet?" % INSTALLED_FILES_NAME) +@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command): + try: + if not self.dry_run: + os.remove(file) +- except OSError, e: ++ except OSError as e: + log.error(str(e)) + # Delete the directories. First reverse-sort the normalized paths by + # length so that child directories are deleted before their parents. +@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command): + log.info("Removing the directory '%s'." % dir) + if not self.dry_run: + os.rmdir(dir) +- except OSError, e: ++ except OSError as e: + if e.errno == errno.ENOTEMPTY: + log.info("Directory '%s' not empty; not removing." % dir) + else: +diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py +index 9ba612a..fd251fe 100755 +--- a/ndiff/test-scans/anonymize.py ++++ b/ndiff/test-scans/anonymize.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Anonymize an Nmap XML file, replacing host name and IP addresses with random + # anonymous ones. Anonymized names will be consistent between runs of the +@@ -20,20 +20,20 @@ r = random.Random() + + + def hash(s): +- digest = hashlib.sha512(s).hexdigest() ++ digest = hashlib.sha512(s.encode()).hexdigest() + return int(digest, 16) + + + def anonymize_mac_address(addr): + r.seed(hash(addr)) + nums = (0, 0, 0) + tuple(r.randrange(256) for i in range(3)) +- return u":".join(u"%02X" % x for x in nums) ++ return ":".join("%02X" % x for x in nums) + + + def anonymize_ipv4_address(addr): + r.seed(hash(addr)) + nums = (10,) + tuple(r.randrange(256) for i in range(3)) +- return u".".join(unicode(x) for x in nums) ++ return ".".join(str(x) for x in nums) + + + def anonymize_ipv6_address(addr): +@@ -41,7 +41,7 @@ def anonymize_ipv6_address(addr): + # RFC 4193. + nums = (0xFD00 + r.randrange(256),) + nums = nums + tuple(r.randrange(65536) for i in range(7)) +- return u":".join("%04X" % x for x in nums) ++ return ":".join("%04X" % x for x in nums) + + # Maps to memoize address and host name conversions. + hostname_map = {} +@@ -54,11 +54,11 @@ def anonymize_hostname(name): + LETTERS = "acbdefghijklmnopqrstuvwxyz" + r.seed(hash(name)) + length = r.randrange(5, 10) +- prefix = u"".join(r.sample(LETTERS, length)) ++ prefix = "".join(r.sample(LETTERS, length)) + num = r.randrange(1000) +- hostname_map[name] = u"%s-%d.example.com" % (prefix, num) ++ hostname_map[name] = "%s-%d.example.com" % (prefix, num) + if VERBOSE: +- print >> sys.stderr, "Replace %s with %s" % (name, hostname_map[name]) ++ print("Replace %s with %s" % (name, hostname_map[name]), file=sys.stderr) + return hostname_map[name] + + mac_re = re.compile(r'\b([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}\b') +@@ -78,7 +78,7 @@ def anonymize_address(addr): + else: + assert False + if VERBOSE: +- print >> sys.stderr, "Replace %s with %s" % (addr, address_map[addr]) ++ print("Replace %s with %s" % (addr, address_map[addr]), file=sys.stderr) + return address_map[addr] + + +-- +2.24.1 + diff --git a/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch b/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch new file mode 100644 index 0000000..c43ff9f --- /dev/null +++ b/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch @@ -0,0 +1,48 @@ +From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 14 Feb 2020 08:19:54 +0000 +Subject: [PATCH] configure.ac: make ndiff depend on python3 + +Python 2 ceased being maintained on the 1st January 2020. +We've already removed all users of it from oe-core, so +let ndiff depend on python3. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + .../nmap/7.80-r0/nmap-7.80/configure.ac | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9d2fff8..5ffdd55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then + HAVE_PYTHON2=true + fi + ++HAVE_PYTHON3=false ++if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then ++ HAVE_PYTHON3=true ++fi ++ + NDIFFDIR=ndiff + + # Do they want Ndiff? + AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check]) +-if $HAVE_PYTHON2 ; then : ; ++if $HAVE_PYTHON3 ; then : ; + else + if test "$with_ndiff" = "check" ; then +- AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found]) ++ AC_MSG_WARN([Not building Ndiff because Python3 was not found]) + elif test "$with_ndiff" = "yes"; then +- AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4]) ++ AC_MSG_FAILURE([--with-ndiff requires Python3]) + fi + with_ndiff=no + fi +-- +2.24.1 + diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.80.bb index 96af17e..c76d232 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -10,6 +10,8 @@ SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ file://0001-Include-time.h-header-to-pass-clang-compilation.patch \ file://0002-Fix-building-with-libc.patch \ + file://0001-Make-ndiff-support-python3.patch \ + file://0001-configure.ac-make-ndiff-depend-on-python3.patch \ " SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5" @@ -28,7 +30,7 @@ PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, z #disable/enable packages PACKAGECONFIG[nping] = ",--without-nping," PACKAGECONFIG[ncat] = ",--without-ncat," -PACKAGECONFIG[ndiff] = ",--without-ndiff,python3" +PACKAGECONFIG[ndiff] = "--with-ndiff=yes,--without-ndiff,python3" PACKAGECONFIG[update] = ",--without-nmap-update," EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included" @@ -47,6 +49,12 @@ do_configure() { oe_runconf } +do_install_append() { + if [ -f "${D}${bindir}/ndiff" ]; then + sed -i 's@^#!.*$@#!/usr/bin/env python3 at g' ${D}${bindir}/ndiff + fi +} + FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" -RDEPENDS_${PN} = "python3" +RDEPENDS_${PN} += "python3-core" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:14 +0000 Subject: [oe-commits] [meta-openembedded] 01/31: hwdata: upgrade 0.331 -> 0.332 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.190F2232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 58d4365df083f41cf962b82309ea3ff0c5c88abc Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:41 2020 -0800 hwdata: upgrade 0.331 -> 0.332 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index e63838f..77bb60a 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.331" -SRCREV = "337be5f6acbe15aa06063914e1fd25d49a05523b" +PV = "0.332" +SRCREV = "17cc5d636a559ae1073865846980e4db35f7989a" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:13 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (6e98f09 -> f23f2b9) Message-ID: <158178271364.21699.13624075628866367383@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 6e98f09 lirc: build and deploy with python3 discard d2c5a23 nmap: make ndiff support python3 discard dd641fd python-pytest: Fix typo in SUMMARY discard 6bed9ca mpv: Fix build with python3 discard ebdcce6 python3-openpyxl: Add initial version 2.6.3 discard 6a15ca9 python3-jdcal: add initial recipe version 1.4.1 discard 48442b1 python3-et-xmlfile: add initial recipe version 1.0.1 discard a80f76c x265: add x265 recipe discard 719ff63 libmimetic: Fix ordrered comparision between pointer and zero discard 85ac8a0 phoronix-test-suite: add missing mime and mime-xdg inherit discard e249b68 pytest-html: Add new package discard d009e51 pytest-metadata: Add new package discard 88fb8fb pytest-timeout: New package discard 3b03380 python3-cffi: consolidate inc and bb files into a single bb file discard 47336bb python3-cmd2: consolidate inc and bb files into a single bb file discard c600b31 python3-click: consolidate inc and bb files into a single bb file discard c99094d python3-chardet: consolidate inc and bb files into a single bb file discard a95be58 python3-certifi: consolidate inc and bb files into a single bb file discard bcb0373 python3-cassandra-driver: consolidate inc and bb files into a single bb file discard 236eaef python3-can: consolidate inc and bb files into a single bb file discard c02bc08 python3-cachetools: consolidate inc and bb files into a single bb file discard 291f288 spidev-test: Add initial version of recipe discard cd5b357 python3-booleanpy: consolidate inc and bb files into a single bb file discard db0438f python3-blinker: consolidate inc and bb files into a single bb file discard 62c8b8a pcimem: add initial version 2.0 discard 5254bc7 python3-behave: consolidate inc and bb files into a single bb file discard 2389125 python-beautifulsoup4: consolidate inc and bb files into a single bb file discard eec3ad0 python3-bcrypt: consolidate inc and bb files into a single bb file discard 492f913 libp11: upgrade 0.4.10 -> 11 discard ba534c6 libdbi-perl: upgrade 1.642 -> 1.643 discard 69ef87a hwdata: upgrade 0.331 -> 0.332 discard 07030ea fio: upgrade 3.17 -> 3.18 new 58d4365 hwdata: upgrade 0.331 -> 0.332 new 4dbe12d libdbi-perl: upgrade 1.642 -> 1.643 new 4990f80 libp11: upgrade 0.4.10 -> 11 new 6b2ad45 python3-bcrypt: consolidate inc and bb files into a single bb file new 747b6bd python-beautifulsoup4: consolidate inc and bb files into a single bb file new 48c61df python3-behave: consolidate inc and bb files into a single bb file new 116dc4f pcimem: add initial version 2.0 new 587a2ba python3-blinker: consolidate inc and bb files into a single bb file new abc2a85 python3-booleanpy: consolidate inc and bb files into a single bb file new 82eafcc spidev-test: Add initial version of recipe new 401bd65 python3-cachetools: consolidate inc and bb files into a single bb file new d3fdee8 python3-can: consolidate inc and bb files into a single bb file new e2e028c python3-cassandra-driver: consolidate inc and bb files into a single bb file new 1dbe0e2 python3-certifi: consolidate inc and bb files into a single bb file new c3d10cd python3-chardet: consolidate inc and bb files into a single bb file new d5df1fe python3-click: consolidate inc and bb files into a single bb file new 90ca842 python3-cmd2: consolidate inc and bb files into a single bb file new bbe7eb6 python3-cffi: consolidate inc and bb files into a single bb file new d4b54a9 pytest-timeout: New package new 701290f pytest-metadata: Add new package new d3dd0a5 pytest-html: Add new package new 16fd296 phoronix-test-suite: add missing mime and mime-xdg inherit new 25e8539 libmimetic: Fix ordrered comparision between pointer and zero new a939ec7 x265: add x265 recipe new 2b13589 python3-et-xmlfile: add initial recipe version 1.0.1 new 554e52a python3-jdcal: add initial recipe version 1.4.1 new 693ab66 python3-openpyxl: Add initial version 2.6.3 new 3dcfe32 mpv: Fix build with python3 new 056dbf5 python-pytest: Fix typo in SUMMARY new 51c6ea0 nmap: make ndiff support python3 new f23f2b9 lirc: build and deploy with python3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6e98f09) \ N -- N -- N refs/heads/master-next (f23f2b9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 31 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-benchmark/fio/{fio_3.18.bb => fio_3.17.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-benchmark/fio/{fio_3.18.bb => fio_3.17.bb} (96%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:15 +0000 Subject: [oe-commits] [meta-openembedded] 02/31: libdbi-perl: upgrade 1.642 -> 1.643 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.2B08B23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4dbe12d571f3d6194529a3d467888e1af79b6d80 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:42 2020 -0800 libdbi-perl: upgrade 1.642 -> 1.643 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../perl/{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb similarity index 92% rename from meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb rename to meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb index 7532b3f..75fad46 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb @@ -10,8 +10,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" -SRC_URI[md5sum] = "f2ba18b5cea1c8cb322a62be0a847f3d" -SRC_URI[sha256sum] = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d" +SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398" +SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa" S = "${WORKDIR}/DBI-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:16 +0000 Subject: [oe-commits] [meta-openembedded] 03/31: libp11: upgrade 0.4.10 -> 11 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.4092E23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4990f80ddbc984f2bed4e07005d22f937988827e Author: Wang Mingyu AuthorDate: Fri Feb 14 15:43:43 2020 -0800 libp11: upgrade 0.4.10 -> 11 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/libp11/{libp11_0.4.10.bb => libp11_11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-oe/recipes-support/libp11/libp11_11.bb similarity index 93% rename from meta-oe/recipes-support/libp11/libp11_0.4.10.bb rename to meta-oe/recipes-support/libp11/libp11_11.bb index 655db49..5a0951d 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-oe/recipes-support/libp11/libp11_11.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:17 +0000 Subject: [oe-commits] [meta-openembedded] 04/31: python3-bcrypt: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.5609423281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6b2ad450c16e94a562b44ae08b117f078a47235e Author: Derek Straka AuthorDate: Fri Feb 14 13:45:18 2020 -0500 python3-bcrypt: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-bcrypt.inc | 17 ----------------- .../recipes-devtools/python/python3-bcrypt_3.1.7.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-bcrypt.inc b/meta-python/recipes-devtools/python/python-bcrypt.inc deleted file mode 100644 index a264003..0000000 --- a/meta-python/recipes-devtools/python/python-bcrypt.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Modern password hashing for your software and your servers." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" - -DEPENDS += "${PYTHON_PN}-cffi-native" - -SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" -SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" - -inherit pypi - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-six \ -" diff --git a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb index d2ec9e3..0f2d31f 100644 --- a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb +++ b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-bcrypt.inc +DESCRIPTION = "Modern password hashing for your software and your servers." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" + +DEPENDS += "${PYTHON_PN}-cffi-native" + +SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" +SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-six \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:18 +0000 Subject: [oe-commits] [meta-openembedded] 05/31: python-beautifulsoup4: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.6646423281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 747b6bd61f20bb782ad5c38066893038717c35a7 Author: Derek Straka AuthorDate: Fri Feb 14 13:53:45 2020 -0500 python-beautifulsoup4: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-beautifulsoup4.inc | 17 ----------------- .../python/python3-beautifulsoup4_4.8.2.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-beautifulsoup4.inc b/meta-python/recipes-devtools/python/python-beautifulsoup4.inc deleted file mode 100644 index 3e95bb7..0000000 --- a/meta-python/recipes-devtools/python/python-beautifulsoup4.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Screen-scraping library" -HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" - -SRC_URI[md5sum] = "5dbdb56c009e4632bae7bed1b385804b" -SRC_URI[sha256sum] = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a" - -inherit pypi - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-html5lib \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-soupsieve \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb index d98df11..63fbd09 100644 --- a/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb +++ b/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.2.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-beautifulsoup4.inc +SUMMARY = "Screen-scraping library" +HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" + +SRC_URI[md5sum] = "5dbdb56c009e4632bae7bed1b385804b" +SRC_URI[sha256sum] = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-html5lib \ + ${PYTHON_PN}-lxml \ + ${PYTHON_PN}-soupsieve \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:19 +0000 Subject: [oe-commits] [meta-openembedded] 06/31: python3-behave: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.714E5232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 48c61dfe2385f6d3af78a8542d5ad30ed6c2f789 Author: Derek Straka AuthorDate: Fri Feb 14 13:57:24 2020 -0500 python3-behave: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-behave.inc | 15 --------------- .../recipes-devtools/python/python3-behave_1.2.6.bb | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-behave.inc b/meta-python/recipes-devtools/python/python-behave.inc deleted file mode 100644 index ded7580..0000000 --- a/meta-python/recipes-devtools/python/python-behave.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "A behavior-driven development framework, Python style" -HOMEPAGE = "https://github.com/behave/behave" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" - -SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" -SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-parse-type \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - " diff --git a/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb b/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb index 1c55871..a28e527 100644 --- a/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb +++ b/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb @@ -1,2 +1,15 @@ -inherit setuptools3 -require python-behave.inc +SUMMARY = "A behavior-driven development framework, Python style" +HOMEPAGE = "https://github.com/behave/behave" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" + +SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" +SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-parse-type \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:20 +0000 Subject: [oe-commits] [meta-openembedded] 07/31: pcimem: add initial version 2.0 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.7D98B232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 116dc4f9ca0ea3a7aa9f458150d153e23bee5133 Author: Randy Schacher AuthorDate: Fri Feb 14 11:07:46 2020 -0800 pcimem: add initial version 2.0 Initial revision from 09724edb1783a98da2b7ae53c5aaa87493aabc9b Reviewed-by: Jonathan Richardson Reviewed-by: Randy Schacher Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb new file mode 100644 index 0000000..107d5a8 --- /dev/null +++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Simple program to read & write to a pci device from userspace" +HOMEPAGE = "https://github.com/billfarrow/pcimem" +BUGTRACKER = "https://github.com/billfarrow/pcimem/issues" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +COMPATIBLE_HOST = "(x86_64|aarch64|arm)" + +SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" +SRC_URI = "git://github.com/billfarrow/pcimem.git " + +S = "${WORKDIR}/git" + +do_install() { + install -D -m 0755 ${B}/pcimem ${D}${bindir}/pcimem +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:22 +0000 Subject: [oe-commits] [meta-openembedded] 09/31: python3-booleanpy: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.97A4F232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit abc2a8515ab94befa75813937a68e86579d2c32b Author: Derek Straka AuthorDate: Fri Feb 14 14:44:14 2020 -0500 python3-booleanpy: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-booleanpy.inc | 14 -------------- .../recipes-devtools/python/python3-booleanpy_3.7.bb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-booleanpy.inc b/meta-python/recipes-devtools/python/python-booleanpy.inc deleted file mode 100644 index 335d7d3..0000000 --- a/meta-python/recipes-devtools/python/python-booleanpy.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" -HOMEPAGE = "https://github.com/bastikr/boolean.py" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319747a5eb94cddf646037c01ddba47" - -SRC_URI[md5sum] = "1189d115a38f84f5df743014926a9159" -SRC_URI[sha256sum] = "bd19b412435611ecc712603d0fd7d0e280e24698e7a6e3d5f610473870c5dd1e" - -PYPI_PACKAGE = "boolean.py" - -inherit pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb b/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb index 5f8602d..ebf7ba4 100644 --- a/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb +++ b/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb @@ -1,2 +1,14 @@ -inherit setuptools3 -require python-booleanpy.inc +SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" +HOMEPAGE = "https://github.com/bastikr/boolean.py" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319747a5eb94cddf646037c01ddba47" + +SRC_URI[md5sum] = "1189d115a38f84f5df743014926a9159" +SRC_URI[sha256sum] = "bd19b412435611ecc712603d0fd7d0e280e24698e7a6e3d5f610473870c5dd1e" + +PYPI_PACKAGE = "boolean.py" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:21 +0000 Subject: [oe-commits] [meta-openembedded] 08/31: python3-blinker: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.8B97D23282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 587a2ba4f1f3060d6164d81bc3e9c2f94e7d5219 Author: Derek Straka AuthorDate: Fri Feb 14 14:13:55 2020 -0500 python3-blinker: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-blinker.inc | 7 ------- meta-python/recipes-devtools/python/python3-blinker_1.4.bb | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-blinker.inc b/meta-python/recipes-devtools/python/python-blinker.inc deleted file mode 100644 index eaf3908..0000000 --- a/meta-python/recipes-devtools/python/python-blinker.inc +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=946d7e89af6f7733aeaebed5635d2682" - -SRC_URI[md5sum] = "8b3722381f83c2813c52de3016b68d33" -SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" - diff --git a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb index 924b3cf..e2f76c3 100644 --- a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb +++ b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb @@ -1,2 +1,8 @@ +DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=946d7e89af6f7733aeaebed5635d2682" + +SRC_URI[md5sum] = "8b3722381f83c2813c52de3016b68d33" +SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" + inherit pypi setuptools3 -require python-blinker.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:23 +0000 Subject: [oe-commits] [meta-openembedded] 10/31: spidev-test: Add initial version of recipe In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.A7B37232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 82eafcc41c11694474d8e7f6829d2d4c24842feb Author: Arun Parameswaran AuthorDate: Fri Feb 14 11:44:20 2020 -0800 spidev-test: Add initial version of recipe Allows for testing SPI interface using spidev driver and is part of the kernel tools. Signed-off-by: Arun Parameswaran Reviewed-by: Jonathan Richardson Tested-by: Jonathan Richardson Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb new file mode 100644 index 0000000..6626302 --- /dev/null +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -0,0 +1,29 @@ +SUMMARY = "Test SPI devices" +DESCRIPTION = "SPI testing utility using the spidev driver" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +PROVIDES = "virtual/spidev-test" + +inherit bash-completion kernelsrc kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +EXTRA_OEMAKE = "-C ${S}/tools/spi O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +python do_package_prepend() { + d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) +} + +B = "${WORKDIR}/${BPN}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:24 +0000 Subject: [oe-commits] [meta-openembedded] 11/31: python3-cachetools: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.B2AA823281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 401bd658536396dd2504de0a401c0aa74fd8c477 Author: Derek Straka AuthorDate: Fri Feb 14 14:47:39 2020 -0500 python3-cachetools: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-cachetools.inc | 16 ---------------- .../python/python3-cachetools_4.0.0.bb | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cachetools.inc b/meta-python/recipes-devtools/python/python-cachetools.inc deleted file mode 100644 index f3d3bc6..0000000 --- a/meta-python/recipes-devtools/python/python-cachetools.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Extensible memoizing collections and decorators" -HOMEPAGE = "https://github.com/tkem/cachetools" -DESCRIPTION = "This module provides various memoizing \ -collections and decorators, including variants of the \ -Python 3 Standard Library @lru_cache function decorator." -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5" - -inherit pypi - -SRC_URI[md5sum] = "6a88df13467e80eb61dd2bedad19b83c" -SRC_URI[sha256sum] = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb b/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb index 76b2f67..50d0f25 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_4.0.0.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-cachetools.inc +SUMMARY = "Extensible memoizing collections and decorators" +HOMEPAGE = "https://github.com/tkem/cachetools" +DESCRIPTION = "This module provides various memoizing \ +collections and decorators, including variants of the \ +Python 3 Standard Library @lru_cache function decorator." +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "6a88df13467e80eb61dd2bedad19b83c" +SRC_URI[sha256sum] = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:25 +0000 Subject: [oe-commits] [meta-openembedded] 12/31: python3-can: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.C34BA23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d3fdee897e9871e142f12efe8862e3341c0174e9 Author: Derek Straka AuthorDate: Fri Feb 14 14:56:19 2020 -0500 python3-can: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-can.inc | 18 ------------------ .../recipes-devtools/python/python3-can_3.3.2.bb | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-can.inc b/meta-python/recipes-devtools/python/python-can.inc deleted file mode 100644 index 7d0100d..0000000 --- a/meta-python/recipes-devtools/python/python-can.inc +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Controller Area Network (CAN) interface module for Python" -SECTION = "devel/python" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" -SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" - -PYPI_PACKAGE="python-can" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-wrapt \ -" diff --git a/meta-python/recipes-devtools/python/python3-can_3.3.2.bb b/meta-python/recipes-devtools/python/python3-can_3.3.2.bb index aaa9e81..4597795 100644 --- a/meta-python/recipes-devtools/python/python3-can_3.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-can_3.3.2.bb @@ -1,7 +1,22 @@ -require python-can.inc +SUMMARY = "Controller Area Network (CAN) interface module for Python" +SECTION = "devel/python" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI[md5sum] = "b724553a330478270267380b4888a18e" +SRC_URI[sha256sum] = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e" + +PYPI_PACKAGE="python-can" + inherit pypi setuptools3 RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-codecs \ ${PYTHON_PN}-compression \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-sqlite3 \ + ${PYTHON_PN}-wrapt \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:28 +0000 Subject: [oe-commits] [meta-openembedded] 15/31: python3-chardet: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.E9F4123282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c3d10cd377406fa3ce7286965bfe64c1b1c67a90 Author: Derek Straka AuthorDate: Fri Feb 14 17:48:02 2020 -0500 python3-chardet: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-chardet.inc | 23 ----------------- .../python/python3-chardet_3.0.4.bb | 29 +++++++++++++++++----- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-chardet.inc b/meta-python/recipes-devtools/python/python-chardet.inc deleted file mode 100644 index 6305299..0000000 --- a/meta-python/recipes-devtools/python/python-chardet.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Universal encoding detector for Python 2 and 3" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" - -inherit pypi - -# setup.py of chardet needs this. -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" -SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES =+ "${PN}-cli" -RDEPENDS_${PN}-cli = "${PN} " -FILES_${PN}-cli += " \ - ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ -" - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-logging \ -" diff --git a/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb b/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb index 38d8122..80785b8 100644 --- a/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb @@ -1,7 +1,24 @@ -inherit setuptools3 -require python-chardet.inc +SUMMARY = "Universal encoding detector for Python 2 and 3" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" -do_install_append () { - # rename scripts that would conflict with the Python 2 build of chardet - mv ${D}${bindir}/chardetect ${D}${bindir}/chardetect3 -} +SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" +SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" + +# setup.py of chardet needs this. +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-cli" +FILES_${PN}-cli += " \ + ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ +" + +RDEPENDS_${PN}-cli = "${PN} " + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-logging \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:30 +0000 Subject: [oe-commits] [meta-openembedded] 17/31: python3-cmd2: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.11AB8232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 90ca842c7a4f08e66cc3d1eb11fc0b3a1129526a Author: Derek Straka AuthorDate: Fri Feb 14 17:56:59 2020 -0500 python3-cmd2: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cmd2.inc | 13 ------------- .../recipes-devtools/python/python3-cmd2_0.9.23.bb | 20 ++++++++++++++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-python/recipes-devtools/python/python-cmd2.inc deleted file mode 100644 index 68381ad..0000000 --- a/meta-python/recipes-devtools/python/python-cmd2.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "http://packages.python.org/cmd2/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" - -SRC_URI[md5sum] = "6db66a06210d5f1edb44693b887ed62b" -SRC_URI[sha256sum] = "8ad12ef3cc46d03073c545b6e80a3f84a5921f6653073a60e7d9a7ff3b352c9e" - -inherit pypi - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb index f5c5c7e..a2bf0c4 100644 --- a/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb +++ b/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb @@ -1,9 +1,21 @@ -inherit setuptools3 -require python-cmd2.inc +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "http://packages.python.org/cmd2/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "6db66a06210d5f1edb44693b887ed62b" +SRC_URI[sha256sum] = "8ad12ef3cc46d03073c545b6e80a3f84a5921f6653073a60e7d9a7ff3b352c9e" + +inherit pypi setuptools3 RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-colorama \ ${PYTHON_PN}-pyperclip \ ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-attrs \ ${PYTHON_PN}-wcwidth \ - " +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:27 +0000 Subject: [oe-commits] [meta-openembedded] 14/31: python3-certifi: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.DDAC423282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1dbe0e298140bd549345f6a21371dea507d36434 Author: Derek Straka AuthorDate: Fri Feb 14 17:35:27 2020 -0500 python3-certifi: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-certifi.inc | 13 ------------- .../recipes-devtools/python/python3-certifi_2019.11.28.bb | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-certifi.inc b/meta-python/recipes-devtools/python/python-certifi.inc deleted file mode 100644 index 98fa1f2..0000000 --- a/meta-python/recipes-devtools/python/python-certifi.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Python package for providing Mozilla's CA Bundle." -DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ -Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ -which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." -HOMEPAGE = " http://certifi.io/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" - -SRC_URI[md5sum] = "4d5229c4d9f0a4a79106f9e2c2cfd381" -SRC_URI[sha256sum] = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb b/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb index 70f674b..c9e945f 100644 --- a/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb +++ b/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb @@ -1,2 +1,15 @@ +SUMMARY = "Python package for providing Mozilla's CA Bundle." +DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ +Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ +which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." +HOMEPAGE = " http://certifi.io/" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" + +SRC_URI[md5sum] = "4d5229c4d9f0a4a79106f9e2c2cfd381" +SRC_URI[sha256sum] = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + inherit pypi setuptools3 -require python-certifi.inc + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:31 +0000 Subject: [oe-commits] [meta-openembedded] 18/31: python3-cffi: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.2091B23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bbe7eb6c339611dc6d2686461476637e203fddc4 Author: Derek Straka AuthorDate: Fri Feb 14 18:08:19 2020 -0500 python3-cffi: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cffi.inc | 17 ----------------- .../recipes-devtools/python/python3-cffi_1.14.0.bb | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cffi.inc b/meta-python/recipes-devtools/python/python-cffi.inc deleted file mode 100644 index af10c5f..0000000 --- a/meta-python/recipes-devtools/python/python-cffi.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Foreign Function Interface for Python calling C code" -HOMEPAGE = "http://cffi.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" -DEPENDS += "libffi ${PYTHON_PN}-pycparser" - -SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" -SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" - -RDEPENDS_${PN}_class-target = " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb index e888084..53c8ee2 100644 --- a/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb @@ -1,2 +1,19 @@ +SUMMARY = "Foreign Function Interface for Python calling C code" +HOMEPAGE = "http://cffi.readthedocs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" +DEPENDS += "libffi ${PYTHON_PN}-pycparser" + +SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" +SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" + inherit pypi setuptools3 -require python-cffi.inc + +RDEPENDS_${PN}_class-target = " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pycparser \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:26 +0000 Subject: [oe-commits] [meta-openembedded] 13/31: python3-cassandra-driver: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160514.D24F423281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e2e028c216825aed94b65467ca950f84832e27ca Author: Derek Straka AuthorDate: Fri Feb 14 17:33:46 2020 -0500 python3-cassandra-driver: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-cassandra-driver.inc | 33 -------------------- .../python/python3-cassandra-driver_3.14.0.bb | 35 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-cassandra-driver.inc b/meta-python/recipes-devtools/python/python-cassandra-driver.inc deleted file mode 100644 index 53ebfec..0000000 --- a/meta-python/recipes-devtools/python/python-cassandra-driver.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "DataStax Python Driver for Apache Cassandra" -DESCRIPTION = "A modern, feature-rich and highly-tunable Python client \ -library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using \ -exclusively Cassandra's binary protocol and Cassandra Query Language v3." -HOMEPAGE = "https://github.com/datastax/python-driver" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -SRCNAME = "cassandra-driver" - -SRC_URI[md5sum] = "c5bed026bf48c821424c1f6296193908" -SRC_URI[sha256sum] = "b65218e2582277f5b77d1436e420db8616f63e3437a9e839cdcd7172d760e861" - -DISTUTILS_BUILD_ARGS += " \ - --no-libev \ -" -DISTUTILS_INSTALL_ARGS += " \ - --no-libev \ -" - -inherit pypi - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-cython \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-json \ - libevent \ -" - -DEPENDS += "\ - ${PYTHON_PN}-cython \ -" diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb index 34f149d..768e557 100644 --- a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.14.0.bb @@ -1,8 +1,35 @@ -inherit setuptools3 -require python-cassandra-driver.inc +SUMMARY = "DataStax Python Driver for Apache Cassandra" +DESCRIPTION = "A modern, feature-rich and highly-tunable Python client \ +library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using \ +exclusively Cassandra's binary protocol and Cassandra Query Language v3." +HOMEPAGE = "https://github.com/datastax/python-driver" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +SRCNAME = "cassandra-driver" -# Requires concurrent which is currently in -misc -RDEPENDS_${PN} += " \ +SRC_URI[md5sum] = "c5bed026bf48c821424c1f6296193908" +SRC_URI[sha256sum] = "b65218e2582277f5b77d1436e420db8616f63e3437a9e839cdcd7172d760e861" + +DISTUTILS_BUILD_ARGS += " \ + --no-libev \ +" +DISTUTILS_INSTALL_ARGS += " \ + --no-libev \ +" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-cython \ + ${PYTHON_PN}-json \ ${PYTHON_PN}-misc \ + ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-six \ + libevent \ +" + +DEPENDS += "\ + ${PYTHON_PN}-cython \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:32 +0000 Subject: [oe-commits] [meta-openembedded] 19/31: pytest-timeout: New package In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.30B53232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d4b54a9c612c20c2583410a22cb5d0d54958c5e8 Author: Jeremy Puhlman AuthorDate: Fri Feb 14 15:18:26 2020 -0800 pytest-timeout: New package Adds plugin for pytest to abort tests after a certain time out. Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-pytest-timeout_1.3.4.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb b/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb new file mode 100644 index 0000000..a359969 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb @@ -0,0 +1,13 @@ +SUMMARY = "py.test plugin to abort hanging tests" +HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" + +PYPI_PACKAGE = "pytest-timeout" + +SRC_URI[md5sum] = "1594762ae77ed7c6c2727aa8b4aa8bfb" +SRC_URI[sha256sum] = "80faa19cd245a42b87a51699d640c00d937c02b749052bfca6bae8bdbe12c48e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:29 +0000 Subject: [oe-commits] [meta-openembedded] 16/31: python3-click: consolidate inc and bb files into a single bb file In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.03D1F232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d5df1fe869a9a746438a6ad8c208a170357e7e5a Author: Derek Straka AuthorDate: Fri Feb 14 17:52:06 2020 -0500 python3-click: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-click.inc | 25 --------------------- .../recipes-devtools/python/python3-click_7.0.bb | 26 +++++++++++++++++++++- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-click.inc b/meta-python/recipes-devtools/python/python-click.inc deleted file mode 100644 index f9dfd56..0000000 --- a/meta-python/recipes-devtools/python/python-click.inc +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A simple wrapper around optparse for powerful command line utilities." -DESCRIPTION = "\ -Click is a Python package for creating beautiful command line interfaces \ -in a composable way with as little code as necessary. It's the "Command \ -Line Interface Creation Kit". It's highly configurable but comes with \ -sensible defaults out of the box." -HOMEPAGE = "http://click.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" - -SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" -SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" - -UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" - -CLEANBROKEN = "1" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-threading \ - " - -BBCLASSEXTEND = "native nativesdk" - -PYPI_PACKAGE = "Click" diff --git a/meta-python/recipes-devtools/python/python3-click_7.0.bb b/meta-python/recipes-devtools/python/python3-click_7.0.bb index 1920644..cfa3e0f 100644 --- a/meta-python/recipes-devtools/python/python3-click_7.0.bb +++ b/meta-python/recipes-devtools/python/python3-click_7.0.bb @@ -1,2 +1,26 @@ +SUMMARY = "A simple wrapper around optparse for powerful command line utilities." +DESCRIPTION = "\ +Click is a Python package for creating beautiful command line interfaces \ +in a composable way with as little code as necessary. It's the "Command \ +Line Interface Creation Kit". It's highly configurable but comes with \ +sensible defaults out of the box." +HOMEPAGE = "http://click.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c13ed890b210a882c1778216694c98c7" + +SRC_URI[md5sum] = "7f53d50f7b7373ebc7963f9ff697450a" +SRC_URI[sha256sum] = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" + +PYPI_PACKAGE = "Click" inherit pypi setuptools3 -require python-click.inc + +UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-threading \ + " + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:33 +0000 Subject: [oe-commits] [meta-openembedded] 20/31: pytest-metadata: Add new package In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.3D399232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 701290f6e4bbe70471e6f2be0a51540ac69f383b Author: Jeremy Puhlman AuthorDate: Fri Feb 14 15:18:27 2020 -0800 pytest-metadata: Add new package Adds plugin support for accessing pytest metadata. Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- .../python/python3-pytest-metadata_1.8.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb b/meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb new file mode 100644 index 0000000..807b0ce --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" +HOMEPAGE = "https://github.com/pytest-dev/pytest-metadata" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +PYPI_PACKAGE = "pytest-metadata" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "95674c2390b58e0138cabac5101d1908" +SRC_URI[sha256sum] = "2071a59285de40d7541fde1eb9f1ddea1c9db165882df82781367471238b66ba" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:34 +0000 Subject: [oe-commits] [meta-openembedded] 21/31: pytest-html: Add new package In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.4C00723281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d3dd0a52f3d6b9034effc110941b5adec630efb8 Author: Jeremy Puhlman AuthorDate: Fri Feb 14 15:18:28 2020 -0800 pytest-html: Add new package pytest-html add support for outputing html reports from ptest runs. Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- .../python/python3-pytest-html_1.6.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb b/meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb new file mode 100644 index 0000000..8ace29e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "pytest plugin for generating html reports from test results" +HOMEPAGE = "https://github.com/pytest-dev/pytest-html" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://../pytest-html.LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +# Per README.rst the license statement is fetched from +# https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE +SRC_URI += "https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE;name=license;downloadfilename=pytest-html.LICENSE" + +PYPI_PACKAGE = "pytest-html" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "ac956864a9b3392203dacd287ae450f0" +SRC_URI[sha256sum] = "a359de04273239587bd1a15b29b2266daeaf56b7a13f8224bc4fb3ae0ba72c3f" +SRC_URI[license.md5sum] = "5d425c8f3157dbf212db2ec53d9e5132" +SRC_URI[license.sha256sum] = "2bfdca60adf803108d4c7f009000bea76ad00e621e163197881b0eaae91b530e" + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:35 +0000 Subject: [oe-commits] [meta-openembedded] 22/31: phoronix-test-suite: add missing mime and mime-xdg inherit In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.5E35223281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 16fd296360f803a6a1644954ed53b632583eb3ca Author: Tim Orling AuthorDate: Fri Feb 14 15:28:51 2020 -0800 phoronix-test-suite: add missing mime and mime-xdg inherit Fixes: " WARNING: phoronix-test-suite-9.2.1-r0 do_package_qa: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: phoronix-test-suite path '/work/all-oe-linux/phoronix-test-suite/9.2.1-r0/packages-split/ \ phoronix-test-suite/usr/share/applications/phoronix-test-suite-launcher.desktop' [mime-xdg] WARNING: phoronix-test-suite-9.2.1-r0 do_package_qa: QA Issue: package contains mime types but does not inhert mime: phoronix-test-suite path '/work/all-oe-linux/phoronix-test-suite/9.2.1-r0/packages-split/ \ phoronix-test-suite/usr/share/mime/packages/openbenchmarking-mime.xml' [mime] " Signed-off-by: Tim Orling Signed-off-by: Khem Raj --- .../recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb index 6525b8e..4a8e5b5 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "675e7ca96719e2f3b42a6c13421213a398f04da0f8e78f4691fa9261fd S = "${WORKDIR}/phoronix-test-suite" -inherit systemd allarch +inherit systemd allarch mime mime-xdg do_install() { DESTDIR=${D} ./install-sh ${exec_prefix} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:37 +0000 Subject: [oe-commits] [meta-openembedded] 24/31: x265: add x265 recipe In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.7625C23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a939ec7cbb336b2ae1317e5863cf15f4c8157c9e Author: Scott Branden via Openembedded-devel AuthorDate: Fri Feb 14 16:54:02 2020 -0800 x265: add x265 recipe Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../recipes-multimedia/x265/x265_3.2.1.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb new file mode 100644 index 0000000..21ae596 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre" + +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" + +S = "${WORKDIR}/x265_${PV}/source" + +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:38 +0000 Subject: [oe-commits] [meta-openembedded] 25/31: python3-et-xmlfile: add initial recipe version 1.0.1 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.83834232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2b135892fafe92f28e0f1719c3ad5f952a4e30df Author: Jonathan Richardson via Openembedded-devel AuthorDate: Fri Feb 14 17:18:09 2020 -0800 python3-et-xmlfile: add initial recipe version 1.0.1 Signed-off-by: Khem Raj --- .../python/python3-et-xmlfile_1.0.1.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb b/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb new file mode 100644 index 0000000..cfff150 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "et_xmlfile is a low memory library for creating large XML files" +DESCRIPTION = "It is based upon the xmlfile module from lxml with the aim of allowing code \ +to be developed that will work with both libraries. It was developed initially for \ +the openpyxl project but is now a standalone module." + +HOMEPAGE = "https://bitbucket.org/openpyxl/et_xmlfile/src/default/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b3d89cae66f26c3a0799be8a96f3178b" + +SRC_URI[md5sum] = "f47940fd9d556375420b2e276476cfaf" +SRC_URI[sha256sum] = "614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" + +inherit setuptools3 +PYPI_PACKAGE ?= "et_xmlfile" +PYPI_SRC_URI ?= "https://files.pythonhosted.org/packages/source/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz" +SECTION = "devel/python" +SRC_URI += "${PYPI_SRC_URI}" +S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:36 +0000 Subject: [oe-commits] [meta-openembedded] 23/31: libmimetic: Fix ordrered comparision between pointer and zero In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.6B4E8232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 25e8539bfd754455513be12350967aa989c391c7 Author: Khem Raj AuthorDate: Fri Feb 14 17:10:35 2020 -0800 libmimetic: Fix ordrered comparision between pointer and zero Found with clang Signed-off-by: Khem Raj Cc: asmitha --- ...ic-Check-for-MMAP_FAILED-return-from-mmap.patch | 49 ++++++++++++++++++++++ .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch new file mode 100644 index 0000000..c7c8d62 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch @@ -0,0 +1,49 @@ +From f8ab2b1aaa37f6ba9d527a99cb37b6ac2171e122 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 17:03:12 -0800 +Subject: [PATCH] mimetic: Check for MMAP_FAILED return from mmap() + +Avoids using greater than zero comparision on pointers + +Fixes +mimetic/os/mmfile.cxx:60:14: error: ordered comparison between pointer and zero ('char *' and 'int') + +if(m_beg > 0) +~~~~ ^ ~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mimetic/os/mmfile.cxx | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..ed4ff55 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,15 +57,13 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) +- { +- m_end = m_beg + m_st.st_size; +- #if HAVE_MADVISE +- madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); +- #endif +- return true; +- } +- return false; ++ if(m_beg == MAP_FAILED) ++ return false; ++ m_end = m_beg + m_st.st_size; ++ #if HAVE_MADVISE ++ madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); ++ #endif ++ return true; + } + + MMFile::~MMFile() +-- +2.25.0 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index fd65db2..d0fe498 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ + file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:39 +0000 Subject: [oe-commits] [meta-openembedded] 26/31: python3-jdcal: add initial recipe version 1.4.1 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.91346232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 554e52a4aafdfb0da055116c3a141c6e576848ea Author: Jonathan Richardson via Openembedded-devel AuthorDate: Fri Feb 14 17:18:35 2020 -0800 python3-jdcal: add initial recipe version 1.4.1 Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-jdcal_1.4.1.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb b/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb new file mode 100644 index 0000000..c8b5c95 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "This module contains functions for converting between Julian dates and calendar dates" +DESCRIPTION = "A function for converting Gregorian calendar dates to Julian dates, \ +and another function for converting Julian calendar dates to Julian dates are defined. \ +Two functions for the reverse calculations are also defined." + +HOMEPAGE = "https://github.com/phn/jdcal" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bd236e1f590973467a427bb354be0f46" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "e05bdb60fa80f25bc60e73e0c6b7c5dc" +SRC_URI[sha256sum] = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:40 +0000 Subject: [oe-commits] [meta-openembedded] 27/31: python3-openpyxl: Add initial version 2.6.3 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.A003A23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 693ab66388122096a16c051d8ead0e7c4cd34cbc Author: Jonathan Richardson via Openembedded-devel AuthorDate: Fri Feb 14 17:19:07 2020 -0800 python3-openpyxl: Add initial version 2.6.3 openpyxl depends on et-xmlfile and jdcal. Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-openpyxl_2.6.3.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb b/meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb new file mode 100644 index 0000000..87cb46e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "openpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files" +DESCRIPTION = "It was born from lack of existing library to read/write natively \ +from Python the Office Open XML format. All kudos to the PHPExcel team as openpyxl \ +was initially based on PHPExcel." + +HOMEPAGE = "http://www.python-excel.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=3baf26d8abf08632beaf913ea973cb8a" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "b067750e51f17a1a9cc6bacfdd668218" +SRC_URI[sha256sum] = "72d1ed243972cad0b3c236230083cac00d9c72804e64a2ae93d7901aec1a8f1c" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:41 +0000 Subject: [oe-commits] [meta-openembedded] 28/31: mpv: Fix build with python3 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.AC84823281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3dcfe3269010de846e2a2b0cbc208e3634c5bf8f Author: Khem Raj AuthorDate: Sat Feb 15 00:06:47 2020 -0800 mpv: Fix build with python3 Use bootstrap.py to download right waf version turn the python3 patch into a sed command Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/mplayer/mpv/python3.patch | 12 ------------ meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 15 +++++++-------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch deleted file mode 100644 index df208cf..0000000 --- a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch +++ /dev/null @@ -1,12 +0,0 @@ -Use Python 3 instead of Python 2. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -diff --git a/waf b/waf -index 6ce2a24..de3c898 100755 ---- a/waf -+++ b/waf -@@ -1 +1 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index bd2e389..066e18a 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -17,11 +17,7 @@ LICENSE_FLAGS = "commercial" SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" SRC_URI = " \ git://github.com/mpv-player/mpv;name=mpv \ - https://www.freehackers.org/~tnagy/release/waf-2.0.19;name=waf;downloadfilename=waf;subdir=git \ - file://python3.patch \ " -SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" -SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" S = "${WORKDIR}/git" @@ -102,11 +98,14 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -adjust_waf_perms() { - chmod +x ${S}/waf -} +do_patch[postfuncs] += "get_waf" -do_patch[postfuncs] += "adjust_waf_perms" +get_waf() { + cd ${S} + ./bootstrap.py + sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/waf + cd - +} FILES_${PN} += " \ ${datadir}/icons \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:42 +0000 Subject: [oe-commits] [meta-openembedded] 29/31: python-pytest: Fix typo in SUMMARY In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.BB86423281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 056dbf5548a79486a41cfcd14f0aa8815c60dd7e Author: Jeremy Puhlman AuthorDate: Fri Feb 14 18:01:45 2020 -0800 python-pytest: Fix typo in SUMMARY Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pytest.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-pytest.inc b/meta-python/recipes-devtools/python/python-pytest.inc index 4021263..40ca9c2 100644 --- a/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-python/recipes-devtools/python/python-pytest.inc @@ -1,4 +1,4 @@ -SUMMARY = "Simple powerful teting with python" +SUMMARY = "Simple powerful testing with python" HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:44 +0000 Subject: [oe-commits] [meta-openembedded] 31/31: lirc: build and deploy with python3 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.E4425232818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f23f2b96b9cb31438171ed1489c37f6750a70801 Author: Max Krummenacher AuthorDate: Sat Feb 15 16:52:59 2020 +0100 lirc: build and deploy with python3 lirc already uses python3 for the build, reflect that in the recipe. Add the relevant python modules used in the scripts to RDEPENDS. Deploy all python scripts in the lirc-python package. Signed-off-by: Max Krummenacher Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb index 606caee..f599696 100644 --- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb +++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb @@ -6,8 +6,7 @@ DESCRIPTION_append_lirc-nslu2example = " This package contains a working config HOMEPAGE = "http://www.lirc.org" SECTION = "console/network" LICENSE = "GPLv2" -DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19" - +DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 python3-pyyaml" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -61,9 +60,9 @@ PACKAGES =+ "${PN}-contrib ${PN}-exec ${PN}-plugins ${PN}-python" RDEPENDS_${PN} = "bash" RDEPENDS_${PN}-exec = "${PN}" -RDEPENDS_${PN}-python = "python" +RDEPENDS_${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" -RRECOMMENDS_lirc = "${PN}-exec ${PN}-plugins" +RRECOMMENDS_${PN} = "${PN}-exec ${PN}-plugins" FILES_${PN}-plugins = "${libdir}/lirc/plugins/*.so ${datadir}/lirc/configs" FILES_${PN}-contrib = "${datadir}/lirc/contrib" @@ -73,8 +72,7 @@ FILES_${PN} += "${systemd_unitdir}/system/lircd.service" FILES_${PN} += "${systemd_unitdir}/system/lircd.socket" FILES_${PN} += "${libdir}/tmpfiles.d/lirc.conf" FILES_${PN}-dbg += "${libdir}/lirc/plugins/.debug" -FILES_${PN}-python += "${libdir}/python*/site-packages" - +FILES_${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${libdir}/python*/site-packages" INITSCRIPT_PACKAGES = "lirc lirc-exec" INITSCRIPT_NAME_lirc-exec = "lircexec" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:05:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:05:43 +0000 Subject: [oe-commits] [meta-openembedded] 30/31: nmap: make ndiff support python3 In-Reply-To: <158178271364.21699.13624075628866367383@git.openembedded.org> References: <158178271364.21699.13624075628866367383@git.openembedded.org> Message-ID: <20200215160515.D7845232817@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 51c6ea0bc08aecf89d013180de3b832cb20f0ecd Author: Mingli Yu AuthorDate: Sat Feb 15 10:52:20 2020 +0800 nmap: make ndiff support python3 The ndiff is python2 compatible now, backport a patch from debian to make ndiff port to python3. Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../files/0001-Make-ndiff-support-python3.patch | 1720 ++++++++++++++++++++ ...configure.ac-make-ndiff-depend-on-python3.patch | 48 + meta-oe/recipes-security/nmap/nmap_7.80.bb | 12 +- 3 files changed, 1778 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch new file mode 100644 index 0000000..2ca18b0 --- /dev/null +++ b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch @@ -0,0 +1,1720 @@ +From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 14 Feb 2020 10:09:55 +0000 +Subject: [PATCH] Make ndiff support python3 + +Backport a patch from debian to make ndiff support +python3. + +Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + Makefile.in | 12 +- + ndiff/ndiff.py | 495 +++++++++++++++++----------------- + ndiff/ndifftest.py | 94 +++---- + ndiff/scripts/ndiff | 14 +- + ndiff/setup.py | 34 +-- + ndiff/test-scans/anonymize.py | 18 +- + 6 files changed, 333 insertions(+), 334 deletions(-) + mode change 100644 => 100755 ndiff/setup.py + +diff --git a/Makefile.in b/Makefile.in +index eee8863..32f86ba 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ + NDIFFDIR = @NDIFFDIR@ + NPINGDIR = @NPINGDIR@ + PYTHON = @PYTHON@ ++PYTHON3 = /usr/bin/env python3 + DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" + # With GCC, add extra security checks to source code. + # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html +@@ -260,7 +261,7 @@ clean-zenmap: + rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc + + clean-ndiff: +- -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all ++ -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all + + clean-nping: + -cd $(NPINGDIR) && $(MAKE) clean +@@ -368,6 +369,7 @@ tests/check_dns: $(OBJS) + # this as the location of the interpreter whenever we're not doing a + # local installation. + DEFAULT_PYTHON_PATH = /usr/bin/env python ++DEFAULT_PYTHON3_PATH = /usr/bin/env python3 + + build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py + # When DESTDIR is defined, assume we're building an executable +@@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py + ln -sf zenmap $(DESTDIR)$(bindir)/xnmap + + build-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)") + + build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@ + @cd $(NPINGDIR) && $(MAKE) + + install-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") + + NSE_FILES = scripts/script.db scripts/*.nse + NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc +@@ -443,7 +445,7 @@ uninstall-zenmap: + rm -f $(DESTDIR)$(bindir)/xnmap + + uninstall-ndiff: +- cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall ++ cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall + + uninstall-ncat: + @cd $(NCATDIR) && $(MAKE) uninstall +@@ -458,7 +460,7 @@ check-ncat: + @cd $(NCATDIR) && $(MAKE) check + + check-ndiff: +- @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py ++ @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py + + check-nsock: + @cd $(NSOCKDIR)/src && $(MAKE) check +diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py +index 043273f..abbd1c5 100755 +--- a/ndiff/ndiff.py ++++ b/ndiff/ndiff.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Ndiff + # +@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] + import xml.sax + import xml.sax.saxutils + import xml.dom.minidom +-from StringIO import StringIO ++from io import StringIO + + verbose = False + +-NDIFF_XML_VERSION = u"1" ++NDIFF_XML_VERSION = "1" + + + class OverrideEntityResolver(xml.sax.handler.EntityResolver): +@@ -78,35 +78,35 @@ class Scan(object): + def write_nmaprun_open(self, writer): + attrs = {} + if self.scanner is not None: +- attrs[u"scanner"] = self.scanner ++ attrs["scanner"] = self.scanner + if self.args is not None: +- attrs[u"args"] = self.args ++ attrs["args"] = self.args + if self.start_date is not None: +- attrs[u"start"] = "%d" % time.mktime(self.start_date.timetuple()) +- attrs[u"startstr"] = self.start_date.strftime( ++ attrs["start"] = "%d" % time.mktime(self.start_date.timetuple()) ++ attrs["startstr"] = self.start_date.strftime( + "%a %b %d %H:%M:%S %Y") + if self.version is not None: +- attrs[u"version"] = self.version +- writer.startElement(u"nmaprun", attrs) ++ attrs["version"] = self.version ++ writer.startElement("nmaprun", attrs) + + def write_nmaprun_close(self, writer): +- writer.endElement(u"nmaprun") ++ writer.endElement("nmaprun") + + def nmaprun_to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"nmaprun") ++ elem = document.createElement("nmaprun") + if self.scanner is not None: +- elem.setAttribute(u"scanner", self.scanner) ++ elem.setAttribute("scanner", self.scanner) + if self.args is not None: +- elem.setAttribute(u"args", self.args) ++ elem.setAttribute("args", self.args) + if self.start_date is not None: + elem.setAttribute( +- u"start", "%d" % time.mktime(self.start_date.timetuple())) ++ "start", "%d" % time.mktime(self.start_date.timetuple())) + elem.setAttribute( +- u"startstr", ++ "startstr", + self.start_date.strftime("%a %b %d %H:%M:%S %Y")) + if self.version is not None: +- elem.setAttribute(u"version", self.version) ++ elem.setAttribute("version", self.version) + frag.appendChild(elem) + return frag + +@@ -136,17 +136,17 @@ class Host(object): + + def format_name(self): + """Return a human-readable identifier for this host.""" +- address_s = u", ".join(a.s for a in sorted(self.addresses)) +- hostname_s = u", ".join(sorted(self.hostnames)) ++ address_s = ", ".join(a.s for a in sorted(self.addresses)) ++ hostname_s = ", ".join(sorted(self.hostnames)) + if len(hostname_s) > 0: + if len(address_s) > 0: +- return u"%s (%s)" % (hostname_s, address_s) ++ return "%s (%s)" % (hostname_s, address_s) + else: + return hostname_s + elif len(address_s) > 0: + return address_s + else: +- return u"" ++ return "" + + def add_port(self, port): + self.ports[port.spec] = port +@@ -163,46 +163,46 @@ class Host(object): + return state is None or state in self.extraports + + def extraports_string(self): +- list = [(count, state) for (state, count) in self.extraports.items()] ++ locallist = [(count, state) for (state, count) in list(self.extraports.items())] + # Reverse-sort by count. +- list.sort(reverse=True) +- return u", ".join( +- [u"%d %s ports" % (count, state) for (count, state) in list]) ++ locallist.sort(reverse=True) ++ return ", ".join( ++ ["%d %s ports" % (count, state) for (count, state) in locallist]) + + def state_to_dom_fragment(self, document): + frag = document.createDocumentFragment() + if self.state is not None: +- elem = document.createElement(u"status") +- elem.setAttribute(u"state", self.state) ++ elem = document.createElement("status") ++ elem.setAttribute("state", self.state) + frag.appendChild(elem) + return frag + + def hostname_to_dom_fragment(self, document, hostname): + frag = document.createDocumentFragment() +- elem = document.createElement(u"hostname") +- elem.setAttribute(u"name", hostname) ++ elem = document.createElement("hostname") ++ elem.setAttribute("name", hostname) + frag.appendChild(elem) + return frag + + def extraports_to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- for state, count in self.extraports.items(): +- elem = document.createElement(u"extraports") +- elem.setAttribute(u"state", state) +- elem.setAttribute(u"count", unicode(count)) ++ for state, count in list(self.extraports.items()): ++ elem = document.createElement("extraports") ++ elem.setAttribute("state", state) ++ elem.setAttribute("count", str(count)) + frag.appendChild(elem) + return frag + + def os_to_dom_fragment(self, document, os): + frag = document.createDocumentFragment() +- elem = document.createElement(u"osmatch") +- elem.setAttribute(u"name", os) ++ elem = document.createElement("osmatch") ++ elem.setAttribute("name", os) + frag.appendChild(elem) + return frag + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"host") ++ elem = document.createElement("host") + + if self.state is not None: + elem.appendChild(self.state_to_dom_fragment(document)) +@@ -211,13 +211,13 @@ class Host(object): + elem.appendChild(addr.to_dom_fragment(document)) + + if len(self.hostnames) > 0: +- hostnames_elem = document.createElement(u"hostnames") ++ hostnames_elem = document.createElement("hostnames") + for hostname in self.hostnames: + hostnames_elem.appendChild( + self.hostname_to_dom_fragment(document, hostname)) + elem.appendChild(hostnames_elem) + +- ports_elem = document.createElement(u"ports") ++ ports_elem = document.createElement("ports") + ports_elem.appendChild(self.extraports_to_dom_fragment(document)) + for port in sorted(self.ports.values()): + if not self.is_extraports(port.state): +@@ -226,13 +226,13 @@ class Host(object): + elem.appendChild(ports_elem) + + if len(self.os) > 0: +- os_elem = document.createElement(u"os") ++ os_elem = document.createElement("os") + for os in self.os: + os_elem.appendChild(self.os_to_dom_fragment(document, os)) + elem.appendChild(os_elem) + + if len(self.script_results) > 0: +- hostscript_elem = document.createElement(u"hostscript") ++ hostscript_elem = document.createElement("hostscript") + for sr in self.script_results: + hostscript_elem.appendChild(sr.to_dom_fragment(document)) + elem.appendChild(hostscript_elem) +@@ -246,7 +246,7 @@ class Address(object): + self.s = s + + def __eq__(self, other): +- return self.__cmp__(other) == 0 ++ return self.sort_key() == other.sort_key() + + def __ne__(self, other): + return not self.__eq__(other) +@@ -254,8 +254,8 @@ class Address(object): + def __hash__(self): + return hash(self.sort_key()) + +- def __cmp__(self, other): +- return cmp(self.sort_key(), other.sort_key()) ++ def __lt__(self, other): ++ return self.sort_key() < other.sort_key() + + def __str__(self): + return str(self.s) +@@ -264,21 +264,21 @@ class Address(object): + return self.s + + def new(type, s): +- if type == u"ipv4": ++ if type == "ipv4": + return IPv4Address(s) +- elif type == u"ipv6": ++ elif type == "ipv6": + return IPv6Address(s) +- elif type == u"mac": ++ elif type == "mac": + return MACAddress(s) + else: +- raise ValueError(u"Unknown address type %s." % type) ++ raise ValueError("Unknown address type %s." % type) + new = staticmethod(new) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"address") +- elem.setAttribute(u"addr", self.s) +- elem.setAttribute(u"addrtype", self.type) ++ elem = document.createElement("address") ++ elem.setAttribute("addr", self.s) ++ elem.setAttribute("addrtype", self.type) + frag.appendChild(elem) + return frag + +@@ -287,21 +287,21 @@ class Address(object): + + + class IPv4Address(Address): +- type = property(lambda self: u"ipv4") ++ type = property(lambda self: "ipv4") + + def sort_key(self): + return (0, self.s) + + + class IPv6Address(Address): +- type = property(lambda self: u"ipv6") ++ type = property(lambda self: "ipv6") + + def sort_key(self): + return (1, self.s) + + + class MACAddress(Address): +- type = property(lambda self: u"mac") ++ type = property(lambda self: "mac") + + def sort_key(self): + return (2, self.s) +@@ -320,28 +320,25 @@ class Port(object): + + def state_string(self): + if self.state is None: +- return u"unknown" ++ return "unknown" + else: +- return unicode(self.state) ++ return str(self.state) + + def spec_string(self): +- return u"%d/%s" % self.spec ++ return "%d/%s" % self.spec + +- def __cmp__(self, other): +- d = cmp(self.spec, other.spec) +- if d != 0: +- return d +- return cmp((self.spec, self.service, self.script_results), +- (other.spec, other.service, other.script_results)) ++ def __lt__(self, other): ++ return (self.spec, self.service, self.script_results) < ( ++ other.spec, other.service, other.script_results) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"port") +- elem.setAttribute(u"portid", unicode(self.spec[0])) +- elem.setAttribute(u"protocol", self.spec[1]) ++ elem = document.createElement("port") ++ elem.setAttribute("portid", str(self.spec[0])) ++ elem.setAttribute("protocol", self.spec[1]) + if self.state is not None: +- state_elem = document.createElement(u"state") +- state_elem.setAttribute(u"state", self.state) ++ state_elem = document.createElement("state") ++ state_elem.setAttribute("state", self.state) + elem.appendChild(state_elem) + elem.appendChild(self.service.to_dom_fragment(document)) + for sr in self.script_results: +@@ -385,7 +382,7 @@ class Service(object): + if len(parts) == 0: + return None + else: +- return u"/".join(parts) ++ return "/".join(parts) + + def version_string(self): + """Get a string like in the VERSION column of Nmap output.""" +@@ -395,17 +392,17 @@ class Service(object): + if self.version is not None: + parts.append(self.version) + if self.extrainfo is not None: +- parts.append(u"(%s)" % self.extrainfo) ++ parts.append("(%s)" % self.extrainfo) + + if len(parts) == 0: + return None + else: +- return u" ".join(parts) ++ return " ".join(parts) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"service") +- for attr in (u"name", u"product", u"version", u"extrainfo", u"tunnel"): ++ elem = document.createElement("service") ++ for attr in ("name", "product", "version", "extrainfo", "tunnel"): + v = getattr(self, attr) + if v is None: + continue +@@ -435,53 +432,53 @@ class ScriptResult(object): + result = [] + lines = self.output.splitlines() + if len(lines) > 0: +- lines[0] = self.id + u": " + lines[0] ++ lines[0] = self.id + ": " + lines[0] + for line in lines[:-1]: +- result.append(u"| " + line) ++ result.append("| " + line) + if len(lines) > 0: +- result.append(u"|_ " + lines[-1]) ++ result.append("|_ " + lines[-1]) + return result + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- elem = document.createElement(u"script") +- elem.setAttribute(u"id", self.id) +- elem.setAttribute(u"output", self.output) ++ elem = document.createElement("script") ++ elem.setAttribute("id", self.id) ++ elem.setAttribute("output", self.output) + frag.appendChild(elem) + return frag + + + def format_banner(scan): + """Format a startup banner more or less like Nmap does.""" +- scanner = u"Nmap" +- if scan.scanner is not None and scan.scanner != u"nmap": ++ scanner = "Nmap" ++ if scan.scanner is not None and scan.scanner != "nmap": + scanner = scan.scanner + parts = [scanner] + if scan.version is not None: + parts.append(scan.version) +- parts.append(u"scan") ++ parts.append("scan") + if scan.start_date is not None: +- parts.append(u"initiated %s" % scan.start_date.strftime( ++ parts.append("initiated %s" % scan.start_date.strftime( + "%a %b %d %H:%M:%S %Y")) + if scan.args is not None: +- parts.append(u"as: %s" % scan.args) +- return u" ".join(parts) ++ parts.append("as: %s" % scan.args) ++ return " ".join(parts) + + + def print_script_result_diffs_text(title, script_results_a, script_results_b, + script_result_diffs, f=sys.stdout): +- table = Table(u"*") ++ table = Table("*") + for sr_diff in script_result_diffs: + sr_diff.append_to_port_table(table) + if len(table) > 0: +- print >> f ++ print(file=f) + if len(script_results_b) == 0: +- print >> f, u"-%s:" % title ++ print("-%s:" % title, file=f) + elif len(script_results_a) == 0: +- print >> f, u"+%s:" % title ++ print("+%s:" % title, file=f) + else: +- print >> f, u" %s:" % title +- print >> f, table ++ print(" %s:" % title, file=f) ++ print(table, file=f) + + + def script_result_diffs_to_dom_fragment(elem, script_results_a, +@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a, + if len(script_results_a) == 0 and len(script_results_b) == 0: + return document.createDocumentFragment() + elif len(script_results_b) == 0: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for sr in script_results_a: + elem.appendChild(sr.to_dom_fragment(document)) + a_elem.appendChild(elem) + return a_elem + elif len(script_results_a) == 0: +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for sr in script_results_b: + elem.appendChild(sr.to_dom_fragment(document)) + b_elem.appendChild(elem) +@@ -581,10 +578,10 @@ class ScanDiffText(ScanDiff): + banner_a = format_banner(self.scan_a) + banner_b = format_banner(self.scan_b) + if banner_a != banner_b: +- print >> self.f, u"-%s" % banner_a +- print >> self.f, u"+%s" % banner_b ++ print("-%s" % banner_a, file=self.f) ++ print("+%s" % banner_b, file=self.f) + elif verbose: +- print >> self.f, u" %s" % banner_a ++ print(" %s" % banner_a, file=self.f) + + def output_pre_scripts(self, pre_script_result_diffs): + print_script_result_diffs_text("Pre-scan script results", +@@ -597,7 +594,7 @@ class ScanDiffText(ScanDiff): + post_script_result_diffs, self.f) + + def output_host_diff(self, h_diff): +- print >> self.f ++ print(file=self.f) + h_diff.print_text(self.f) + + def output_ending(self): +@@ -622,8 +619,8 @@ class ScanDiffXML(ScanDiff): + + def output_beginning(self): + self.writer.startDocument() +- self.writer.startElement(u"nmapdiff", {u"version": NDIFF_XML_VERSION}) +- self.writer.startElement(u"scandiff", {}) ++ self.writer.startElement("nmapdiff", {"version": NDIFF_XML_VERSION}) ++ self.writer.startElement("scandiff", {}) + + if self.nmaprun_differs(): + self.writer.frag_a( +@@ -636,7 +633,7 @@ class ScanDiffXML(ScanDiff): + + def output_pre_scripts(self, pre_script_result_diffs): + if len(pre_script_result_diffs) > 0 or verbose: +- prescript_elem = self.document.createElement(u"prescript") ++ prescript_elem = self.document.createElement("prescript") + frag = script_result_diffs_to_dom_fragment( + prescript_elem, self.scan_a.pre_script_results, + self.scan_b.pre_script_results, pre_script_result_diffs, +@@ -646,7 +643,7 @@ class ScanDiffXML(ScanDiff): + + def output_post_scripts(self, post_script_result_diffs): + if len(post_script_result_diffs) > 0 or verbose: +- postscript_elem = self.document.createElement(u"postscript") ++ postscript_elem = self.document.createElement("postscript") + frag = script_result_diffs_to_dom_fragment( + postscript_elem, self.scan_a.post_script_results, + self.scan_b.post_script_results, post_script_result_diffs, +@@ -660,8 +657,8 @@ class ScanDiffXML(ScanDiff): + frag.unlink() + + def output_ending(self): +- self.writer.endElement(u"scandiff") +- self.writer.endElement(u"nmapdiff") ++ self.writer.endElement("scandiff") ++ self.writer.endElement("nmapdiff") + self.writer.endDocument() + + +@@ -719,9 +716,9 @@ class HostDiff(object): + self.cost += os_cost + + extraports_a = tuple((count, state) +- for (state, count) in self.host_a.extraports.items()) ++ for (state, count) in list(self.host_a.extraports.items())) + extraports_b = tuple((count, state) +- for (state, count) in self.host_b.extraports.items()) ++ for (state, count) in list(self.host_b.extraports.items())) + if extraports_a != extraports_b: + self.extraports_changed = True + self.cost += 1 +@@ -747,69 +744,69 @@ class HostDiff(object): + # Names and addresses. + if self.id_changed: + if host_a.state is not None: +- print >> f, u"-%s:" % host_a.format_name() ++ print("-%s:" % host_a.format_name(), file=f) + if self.host_b.state is not None: +- print >> f, u"+%s:" % host_b.format_name() ++ print("+%s:" % host_b.format_name(), file=f) + else: +- print >> f, u" %s:" % host_a.format_name() ++ print(" %s:" % host_a.format_name(), file=f) + + # State. + if self.state_changed: + if host_a.state is not None: +- print >> f, u"-Host is %s." % host_a.state ++ print("-Host is %s." % host_a.state, file=f) + if host_b.state is not None: +- print >> f, u"+Host is %s." % host_b.state ++ print("+Host is %s." % host_b.state, file=f) + elif verbose: +- print >> f, u" Host is %s." % host_b.state ++ print(" Host is %s." % host_b.state, file=f) + + # Extraports. + if self.extraports_changed: + if len(host_a.extraports) > 0: +- print >> f, u"-Not shown: %s" % host_a.extraports_string() ++ print("-Not shown: %s" % host_a.extraports_string(), file=f) + if len(host_b.extraports) > 0: +- print >> f, u"+Not shown: %s" % host_b.extraports_string() ++ print("+Not shown: %s" % host_b.extraports_string(), file=f) + elif verbose: + if len(host_a.extraports) > 0: +- print >> f, u" Not shown: %s" % host_a.extraports_string() ++ print(" Not shown: %s" % host_a.extraports_string(), file=f) + + # Port table. +- port_table = Table(u"** * * *") ++ port_table = Table("** * * *") + if host_a.state is None: +- mark = u"+" ++ mark = "+" + elif host_b.state is None: +- mark = u"-" ++ mark = "-" + else: +- mark = u" " +- port_table.append((mark, u"PORT", u"STATE", u"SERVICE", u"VERSION")) ++ mark = " " ++ port_table.append((mark, "PORT", "STATE", "SERVICE", "VERSION")) + + for port in self.ports: + port_diff = self.port_diffs[port] + port_diff.append_to_port_table(port_table, host_a, host_b) + + if len(port_table) > 1: +- print >> f, port_table ++ print(port_table, file=f) + + # OS changes. + if self.os_changed or verbose: + if len(host_a.os) > 0: + if len(host_b.os) > 0: +- print >> f, u" OS details:" ++ print(" OS details:", file=f) + else: +- print >> f, u"-OS details:" ++ print("-OS details:", file=f) + elif len(host_b.os) > 0: +- print >> f, u"+OS details:" ++ print("+OS details:", file=f) + # os_diffs is a list of 5-tuples returned by + # difflib.SequenceMatcher. + for op, i1, i2, j1, j2 in self.os_diffs: + if op == "replace" or op == "delete": + for i in range(i1, i2): +- print >> f, "- %s" % host_a.os[i] ++ print("- %s" % host_a.os[i], file=f) + if op == "replace" or op == "insert": + for i in range(j1, j2): +- print >> f, "+ %s" % host_b.os[i] ++ print("+ %s" % host_b.os[i], file=f) + if op == "equal": + for i in range(i1, i2): +- print >> f, " %s" % host_a.os[i] ++ print(" %s" % host_a.os[i], file=f) + + print_script_result_diffs_text("Host script results", + host_a.script_results, host_b.script_results, +@@ -820,32 +817,32 @@ class HostDiff(object): + host_b = self.host_b + + frag = document.createDocumentFragment() +- hostdiff_elem = document.createElement(u"hostdiff") ++ hostdiff_elem = document.createElement("hostdiff") + frag.appendChild(hostdiff_elem) + + if host_a.state is None or host_b.state is None: + # The host is missing in one scan. Output the whole thing. + if host_a.state is not None: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(host_a.to_dom_fragment(document)) + hostdiff_elem.appendChild(a_elem) + elif host_b.state is not None: +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(host_b.to_dom_fragment(document)) + hostdiff_elem.appendChild(b_elem) + return frag + +- host_elem = document.createElement(u"host") ++ host_elem = document.createElement("host") + + # State. + if host_a.state == host_b.state: + if verbose: + host_elem.appendChild(host_a.state_to_dom_fragment(document)) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(host_a.state_to_dom_fragment(document)) + host_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(host_b.state_to_dom_fragment(document)) + host_elem.appendChild(b_elem) + +@@ -854,31 +851,31 @@ class HostDiff(object): + addrset_b = set(host_b.addresses) + for addr in sorted(addrset_a.intersection(addrset_b)): + host_elem.appendChild(addr.to_dom_fragment(document)) +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for addr in sorted(addrset_a - addrset_b): + a_elem.appendChild(addr.to_dom_fragment(document)) + if a_elem.hasChildNodes(): + host_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for addr in sorted(addrset_b - addrset_a): + b_elem.appendChild(addr.to_dom_fragment(document)) + if b_elem.hasChildNodes(): + host_elem.appendChild(b_elem) + + # Host names. +- hostnames_elem = document.createElement(u"hostnames") ++ hostnames_elem = document.createElement("hostnames") + hostnameset_a = set(host_a.hostnames) + hostnameset_b = set(host_b.hostnames) + for hostname in sorted(hostnameset_a.intersection(hostnameset_b)): + hostnames_elem.appendChild( + host_a.hostname_to_dom_fragment(document, hostname)) +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for hostname in sorted(hostnameset_a - hostnameset_b): + a_elem.appendChild( + host_a.hostname_to_dom_fragment(document, hostname)) + if a_elem.hasChildNodes(): + hostnames_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for hostname in sorted(hostnameset_b - hostnameset_a): + b_elem.appendChild( + host_b.hostname_to_dom_fragment(document, hostname)) +@@ -887,15 +884,15 @@ class HostDiff(object): + if hostnames_elem.hasChildNodes(): + host_elem.appendChild(hostnames_elem) + +- ports_elem = document.createElement(u"ports") ++ ports_elem = document.createElement("ports") + # Extraports. + if host_a.extraports == host_b.extraports: + ports_elem.appendChild(host_a.extraports_to_dom_fragment(document)) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(host_a.extraports_to_dom_fragment(document)) + ports_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(host_b.extraports_to_dom_fragment(document)) + ports_elem.appendChild(b_elem) + # Port list. +@@ -911,18 +908,18 @@ class HostDiff(object): + + # OS changes. + if self.os_changed or verbose: +- os_elem = document.createElement(u"os") ++ os_elem = document.createElement("os") + # os_diffs is a list of 5-tuples returned by + # difflib.SequenceMatcher. + for op, i1, i2, j1, j2 in self.os_diffs: + if op == "replace" or op == "delete": +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + for i in range(i1, i2): + a_elem.appendChild(host_a.os_to_dom_fragment( + document, host_a.os[i])) + os_elem.appendChild(a_elem) + if op == "replace" or op == "insert": +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + for i in range(j1, j2): + b_elem.appendChild(host_b.os_to_dom_fragment( + document, host_b.os[i])) +@@ -936,7 +933,7 @@ class HostDiff(object): + + # Host script changes. + if len(self.script_result_diffs) > 0 or verbose: +- hostscript_elem = document.createElement(u"hostscript") ++ hostscript_elem = document.createElement("hostscript") + host_elem.appendChild(script_result_diffs_to_dom_fragment( + hostscript_elem, host_a.script_results, + host_b.script_results, self.script_result_diffs, +@@ -989,38 +986,38 @@ class PortDiff(object): + self.port_b.service.version_string()] + if a_columns == b_columns: + if verbose or self.script_result_diffs > 0: +- table.append([u" "] + a_columns) ++ table.append([" "] + a_columns) + else: + if not host_a.is_extraports(self.port_a.state): +- table.append([u"-"] + a_columns) ++ table.append(["-"] + a_columns) + if not host_b.is_extraports(self.port_b.state): +- table.append([u"+"] + b_columns) ++ table.append(["+"] + b_columns) + + for sr_diff in self.script_result_diffs: + sr_diff.append_to_port_table(table) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +- portdiff_elem = document.createElement(u"portdiff") ++ portdiff_elem = document.createElement("portdiff") + frag.appendChild(portdiff_elem) + if (self.port_a.spec == self.port_b.spec and + self.port_a.state == self.port_b.state): +- port_elem = document.createElement(u"port") +- port_elem.setAttribute(u"portid", unicode(self.port_a.spec[0])) +- port_elem.setAttribute(u"protocol", self.port_a.spec[1]) ++ port_elem = document.createElement("port") ++ port_elem.setAttribute("portid", str(self.port_a.spec[0])) ++ port_elem.setAttribute("protocol", self.port_a.spec[1]) + if self.port_a.state is not None: +- state_elem = document.createElement(u"state") +- state_elem.setAttribute(u"state", self.port_a.state) ++ state_elem = document.createElement("state") ++ state_elem.setAttribute("state", self.port_a.state) + port_elem.appendChild(state_elem) + if self.port_a.service == self.port_b.service: + port_elem.appendChild( + self.port_a.service.to_dom_fragment(document)) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild( + self.port_a.service.to_dom_fragment(document)) + port_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild( + self.port_b.service.to_dom_fragment(document)) + port_elem.appendChild(b_elem) +@@ -1028,10 +1025,10 @@ class PortDiff(object): + port_elem.appendChild(sr_diff.to_dom_fragment(document)) + portdiff_elem.appendChild(port_elem) + else: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(self.port_a.to_dom_fragment(document)) + portdiff_elem.appendChild(a_elem) +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(self.port_b.to_dom_fragment(document)) + portdiff_elem.appendChild(b_elem) + +@@ -1086,13 +1083,13 @@ class ScriptResultDiff(object): + for op, i1, i2, j1, j2 in diffs.get_opcodes(): + if op == "replace" or op == "delete": + for k in range(i1, i2): +- table.append_raw(u"-" + a_lines[k]) ++ table.append_raw("-" + a_lines[k]) + if op == "replace" or op == "insert": + for k in range(j1, j2): +- table.append_raw(u"+" + b_lines[k]) ++ table.append_raw("+" + b_lines[k]) + if op == "equal": + for k in range(i1, i2): +- table.append_raw(u" " + a_lines[k]) ++ table.append_raw(" " + a_lines[k]) + + def to_dom_fragment(self, document): + frag = document.createDocumentFragment() +@@ -1102,11 +1099,11 @@ class ScriptResultDiff(object): + frag.appendChild(self.sr_a.to_dom_fragment(document)) + else: + if self.sr_a is not None: +- a_elem = document.createElement(u"a") ++ a_elem = document.createElement("a") + a_elem.appendChild(self.sr_a.to_dom_fragment(document)) + frag.appendChild(a_elem) + if self.sr_b is not None: +- b_elem = document.createElement(u"b") ++ b_elem = document.createElement("b") + b_elem.appendChild(self.sr_b.to_dom_fragment(document)) + frag.appendChild(b_elem) + return frag +@@ -1120,7 +1117,7 @@ class Table(object): + copied to the output.""" + self.widths = [] + self.rows = [] +- self.prefix = u"" ++ self.prefix = "" + self.padding = [] + j = 0 + while j < len(template) and template[j] != "*": +@@ -1145,7 +1142,7 @@ class Table(object): + + for i in range(len(row)): + if row[i] is None: +- s = u"" ++ s = "" + else: + s = str(row[i]) + if i == len(self.widths): +@@ -1167,7 +1164,7 @@ class Table(object): + for row in self.rows: + parts = [self.prefix] + i = 0 +- if isinstance(row, basestring): ++ if isinstance(row, str): + # A raw string. + lines.append(row) + else: +@@ -1176,13 +1173,13 @@ class Table(object): + if i < len(self.padding): + parts.append(self.padding[i]) + i += 1 +- lines.append(u"".join(parts).rstrip()) +- return u"\n".join(lines) ++ lines.append("".join(parts).rstrip()) ++ return "\n".join(lines) + + + def warn(str): + """Print a warning to stderr.""" +- print >> sys.stderr, str ++ print(str, file=sys.stderr) + + + class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): + self.current_port = None + + self._start_elem_handlers = { +- u"nmaprun": self._start_nmaprun, +- u"host": self._start_host, +- u"status": self._start_status, +- u"address": self._start_address, +- u"hostname": self._start_hostname, +- u"extraports": self._start_extraports, +- u"port": self._start_port, +- u"state": self._start_state, +- u"service": self._start_service, +- u"script": self._start_script, +- u"osmatch": self._start_osmatch, +- u"finished": self._start_finished, ++ "nmaprun": self._start_nmaprun, ++ "host": self._start_host, ++ "status": self._start_status, ++ "address": self._start_address, ++ "hostname": self._start_hostname, ++ "extraports": self._start_extraports, ++ "port": self._start_port, ++ "state": self._start_state, ++ "service": self._start_service, ++ "script": self._start_script, ++ "osmatch": self._start_osmatch, ++ "finished": self._start_finished, + } + self._end_elem_handlers = { +- u'host': self._end_host, +- u'port': self._end_port, ++ 'host': self._end_host, ++ 'port': self._end_port, + } + + def parent_element(self): +@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): + def _start_nmaprun(self, name, attrs): + assert self.parent_element() is None + if "start" in attrs: +- start_timestamp = int(attrs.get(u"start")) ++ start_timestamp = int(attrs.get("start")) + self.scan.start_date = datetime.datetime.fromtimestamp( + start_timestamp) +- self.scan.scanner = attrs.get(u"scanner") +- self.scan.args = attrs.get(u"args") +- self.scan.version = attrs.get(u"version") ++ self.scan.scanner = attrs.get("scanner") ++ self.scan.args = attrs.get("args") ++ self.scan.version = attrs.get("version") + + def _start_host(self, name, attrs): +- assert self.parent_element() == u"nmaprun" ++ assert self.parent_element() == "nmaprun" + self.current_host = Host() + self.scan.hosts.append(self.current_host) + + def _start_status(self, name, attrs): +- assert self.parent_element() == u"host" ++ assert self.parent_element() == "host" + assert self.current_host is not None +- state = attrs.get(u"state") ++ state = attrs.get("state") + if state is None: + warn(u'%s element of host %s is missing the "state" attribute; ' +- 'assuming \unknown\.' % ( ++ r'assuming \unknown\.' % ( + name, self.current_host.format_name())) + return + self.current_host.state = state + + def _start_address(self, name, attrs): +- assert self.parent_element() == u"host" ++ assert self.parent_element() == "host" + assert self.current_host is not None +- addr = attrs.get(u"addr") ++ addr = attrs.get("addr") + if addr is None: +- warn(u'%s element of host %s is missing the "addr" ' ++ warn('%s element of host %s is missing the "addr" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return +- addrtype = attrs.get(u"addrtype", u"ipv4") ++ addrtype = attrs.get("addrtype", "ipv4") + self.current_host.add_address(Address.new(addrtype, addr)) + + def _start_hostname(self, name, attrs): +- assert self.parent_element() == u"hostnames" ++ assert self.parent_element() == "hostnames" + assert self.current_host is not None +- hostname = attrs.get(u"name") ++ hostname = attrs.get("name") + if hostname is None: +- warn(u'%s element of host %s is missing the "name" ' ++ warn('%s element of host %s is missing the "name" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return + self.current_host.add_hostname(hostname) + + def _start_extraports(self, name, attrs): +- assert self.parent_element() == u"ports" ++ assert self.parent_element() == "ports" + assert self.current_host is not None +- state = attrs.get(u"state") ++ state = attrs.get("state") + if state is None: +- warn(u'%s element of host %s is missing the "state" ' ++ warn('%s element of host %s is missing the "state" ' + 'attribute; assuming "unknown".' % ( + name, self.current_host.format_name())) + state = None + if state in self.current_host.extraports: +- warn(u'Duplicate extraports state "%s" in host %s.' % ( ++ warn('Duplicate extraports state "%s" in host %s.' % ( + state, self.current_host.format_name())) + +- count = attrs.get(u"count") ++ count = attrs.get("count") + if count is None: +- warn(u'%s element of host %s is missing the "count" ' ++ warn('%s element of host %s is missing the "count" ' + 'attribute; assuming 0.' % ( + name, self.current_host.format_name())) + count = 0 +@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): + try: + count = int(count) + except ValueError: +- warn(u"Can't convert extraports count \"%s\" " ++ warn("Can't convert extraports count \"%s\" " + "to an integer in host %s; assuming 0." % ( +- attrs[u"count"], self.current_host.format_name())) ++ attrs["count"], self.current_host.format_name())) + count = 0 + self.current_host.extraports[state] = count + + def _start_port(self, name, attrs): +- assert self.parent_element() == u"ports" ++ assert self.parent_element() == "ports" + assert self.current_host is not None +- portid_str = attrs.get(u"portid") ++ portid_str = attrs.get("portid") + if portid_str is None: +- warn(u'%s element of host %s missing the "portid" ' ++ warn('%s element of host %s missing the "portid" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return + try: + portid = int(portid_str) + except ValueError: +- warn(u"Can't convert portid \"%s\" to an integer " ++ warn("Can't convert portid \"%s\" to an integer " + "in host %s; skipping port." % ( + portid_str, self.current_host.format_name())) + return +- protocol = attrs.get(u"protocol") ++ protocol = attrs.get("protocol") + if protocol is None: +- warn(u'%s element of host %s missing the "protocol" ' ++ warn('%s element of host %s missing the "protocol" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return + self.current_port = Port((portid, protocol)) + + def _start_state(self, name, attrs): +- assert self.parent_element() == u"port" ++ assert self.parent_element() == "port" + assert self.current_host is not None + if self.current_port is None: + return + if "state" not in attrs: +- warn(u'%s element of port %s is missing the "state" ' ++ warn('%s element of port %s is missing the "state" ' + 'attribute; assuming "unknown".' % ( + name, self.current_port.spec_string())) + return +- self.current_port.state = attrs[u"state"] ++ self.current_port.state = attrs["state"] + self.current_host.add_port(self.current_port) + + def _start_service(self, name, attrs): +- assert self.parent_element() == u"port" ++ assert self.parent_element() == "port" + assert self.current_host is not None + if self.current_port is None: + return +- self.current_port.service.name = attrs.get(u"name") +- self.current_port.service.product = attrs.get(u"product") +- self.current_port.service.version = attrs.get(u"version") +- self.current_port.service.extrainfo = attrs.get(u"extrainfo") +- self.current_port.service.tunnel = attrs.get(u"tunnel") ++ self.current_port.service.name = attrs.get("name") ++ self.current_port.service.product = attrs.get("product") ++ self.current_port.service.version = attrs.get("version") ++ self.current_port.service.extrainfo = attrs.get("extrainfo") ++ self.current_port.service.tunnel = attrs.get("tunnel") + + def _start_script(self, name, attrs): + result = ScriptResult() +- result.id = attrs.get(u"id") ++ result.id = attrs.get("id") + if result.id is None: +- warn(u'%s element missing the "id" attribute; skipping.' % name) ++ warn('%s element missing the "id" attribute; skipping.' % name) + return + +- result.output = attrs.get(u"output") ++ result.output = attrs.get("output") + if result.output is None: +- warn(u'%s element missing the "output" attribute; skipping.' ++ warn('%s element missing the "output" attribute; skipping.' + % name) + return +- if self.parent_element() == u"prescript": ++ if self.parent_element() == "prescript": + self.scan.pre_script_results.append(result) +- elif self.parent_element() == u"postscript": ++ elif self.parent_element() == "postscript": + self.scan.post_script_results.append(result) +- elif self.parent_element() == u"hostscript": ++ elif self.parent_element() == "hostscript": + self.current_host.script_results.append(result) +- elif self.parent_element() == u"port": ++ elif self.parent_element() == "port": + self.current_port.script_results.append(result) + else: +- warn(u"%s element not inside prescript, postscript, hostscript, " ++ warn("%s element not inside prescript, postscript, hostscript, " + "or port element; ignoring." % name) + return + + def _start_osmatch(self, name, attrs): +- assert self.parent_element() == u"os" ++ assert self.parent_element() == "os" + assert self.current_host is not None + if "name" not in attrs: +- warn(u'%s element of host %s is missing the "name" ' ++ warn('%s element of host %s is missing the "name" ' + 'attribute; skipping.' % ( + name, self.current_host.format_name())) + return +- self.current_host.os.append(attrs[u"name"]) ++ self.current_host.os.append(attrs["name"]) + + def _start_finished(self, name, attrs): +- assert self.parent_element() == u"runstats" ++ assert self.parent_element() == "runstats" + if "time" in attrs: +- end_timestamp = int(attrs.get(u"time")) ++ end_timestamp = int(attrs.get("time")) + self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp) + + def _end_host(self, name): +@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator): + + def frag(self, frag): + for node in frag.childNodes: +- node.writexml(self.f, newl=u"\n") ++ node.writexml(self.f, newl="\n") + + def frag_a(self, frag): +- self.startElement(u"a", {}) ++ self.startElement("a", {}) + for node in frag.childNodes: +- node.writexml(self.f, newl=u"\n") +- self.endElement(u"a") ++ node.writexml(self.f, newl="\n") ++ self.endElement("a") + + def frag_b(self, frag): +- self.startElement(u"b", {}) ++ self.startElement("b", {}) + for node in frag.childNodes: +- node.writexml(self.f, newl=u"\n") +- self.endElement(u"b") ++ node.writexml(self.f, newl="\n") ++ self.endElement("b") + + + def usage(): +- print u"""\ ++ print("""\ + Usage: %s [option] FILE1 FILE2 + Compare two Nmap XML files and display a list of their differences. + Differences include host state changes, port state changes, and changes to +@@ -1451,7 +1448,7 @@ service and OS detection. + -v, --verbose also show hosts and ports that haven't changed. + --text display output in text format (default) + --xml display output in XML format\ +-""" % sys.argv[0] ++""" % sys.argv[0]) + + EXIT_EQUAL = 0 + EXIT_DIFFERENT = 1 +@@ -1459,8 +1456,8 @@ EXIT_ERROR = 2 + + + def usage_error(msg): +- print >> sys.stderr, u"%s: %s" % (sys.argv[0], msg) +- print >> sys.stderr, u"Try '%s -h' for help." % sys.argv[0] ++ print("%s: %s" % (sys.argv[0], msg), file=sys.stderr) ++ print("Try '%s -h' for help." % sys.argv[0], file=sys.stderr) + sys.exit(EXIT_ERROR) + + +@@ -1471,7 +1468,7 @@ def main(): + try: + opts, input_filenames = getopt.gnu_getopt( + sys.argv[1:], "hv", ["help", "text", "verbose", "xml"]) +- except getopt.GetoptError, e: ++ except getopt.GetoptError as e: + usage_error(e.msg) + for o, a in opts: + if o == "-h" or o == "--help": +@@ -1481,15 +1478,15 @@ def main(): + verbose = True + elif o == "--text": + if output_format is not None and output_format != "text": +- usage_error(u"contradictory output format options.") ++ usage_error("contradictory output format options.") + output_format = "text" + elif o == "--xml": + if output_format is not None and output_format != "xml": +- usage_error(u"contradictory output format options.") ++ usage_error("contradictory output format options.") + output_format = "xml" + + if len(input_filenames) != 2: +- usage_error(u"need exactly two input filenames.") ++ usage_error("need exactly two input filenames.") + + if output_format is None: + output_format = "text" +@@ -1502,8 +1499,8 @@ def main(): + scan_a.load_from_file(filename_a) + scan_b = Scan() + scan_b.load_from_file(filename_b) +- except IOError, e: +- print >> sys.stderr, u"Can't open file: %s" % str(e) ++ except IOError as e: ++ print("Can't open file: %s" % str(e), file=sys.stderr) + sys.exit(EXIT_ERROR) + + if output_format == "text": +diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py +index 2fa4ae0..27fc525 100755 +--- a/ndiff/ndifftest.py ++++ b/ndiff/ndifftest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Unit tests for Ndiff. + +@@ -22,7 +22,7 @@ for x in dir(ndiff): + sys.dont_write_bytecode = dont_write_bytecode + del dont_write_bytecode + +-import StringIO ++import io + + + class scan_test(unittest.TestCase): +@@ -52,7 +52,7 @@ class scan_test(unittest.TestCase): + scan.load_from_file("test-scans/single.xml") + host = scan.hosts[0] + self.assertEqual(len(host.ports), 5) +- self.assertEqual(host.extraports.items(), [("filtered", 95)]) ++ self.assertEqual(list(host.extraports.items()), [("filtered", 95)]) + + def test_extraports_multi(self): + """Test that the correct number of known ports is returned when there +@@ -68,9 +68,9 @@ class scan_test(unittest.TestCase): + """Test that nmaprun information is recorded.""" + scan = Scan() + scan.load_from_file("test-scans/empty.xml") +- self.assertEqual(scan.scanner, u"nmap") +- self.assertEqual(scan.version, u"4.90RC2") +- self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100") ++ self.assertEqual(scan.scanner, "nmap") ++ self.assertEqual(scan.version, "4.90RC2") ++ self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100") + + def test_addresses(self): + """Test that addresses are recorded.""" +@@ -84,7 +84,7 @@ class scan_test(unittest.TestCase): + scan = Scan() + scan.load_from_file("test-scans/simple.xml") + host = scan.hosts[0] +- self.assertEqual(host.hostnames, [u"scanme.nmap.org"]) ++ self.assertEqual(host.hostnames, ["scanme.nmap.org"]) + + def test_os(self): + """Test that OS information is recorded.""" +@@ -99,7 +99,7 @@ class scan_test(unittest.TestCase): + scan.load_from_file("test-scans/complex.xml") + host = scan.hosts[0] + self.assertTrue(len(host.script_results) > 0) +- self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0) ++ self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0) + + # This test is commented out because Nmap XML doesn't store any information + # about down hosts, not even the fact that they are down. Recovering the list +@@ -128,16 +128,16 @@ class host_test(unittest.TestCase): + + def test_format_name(self): + h = Host() +- self.assertTrue(isinstance(h.format_name(), basestring)) +- h.add_address(IPv4Address(u"127.0.0.1")) +- self.assertTrue(u"127.0.0.1" in h.format_name()) ++ self.assertTrue(isinstance(h.format_name(), str)) ++ h.add_address(IPv4Address("127.0.0.1")) ++ self.assertTrue("127.0.0.1" in h.format_name()) + h.add_address(IPv6Address("::1")) +- self.assertTrue(u"127.0.0.1" in h.format_name()) +- self.assertTrue(u"::1" in h.format_name()) +- h.add_hostname(u"localhost") +- self.assertTrue(u"127.0.0.1" in h.format_name()) +- self.assertTrue(u"::1" in h.format_name()) +- self.assertTrue(u"localhost" in h.format_name()) ++ self.assertTrue("127.0.0.1" in h.format_name()) ++ self.assertTrue("::1" in h.format_name()) ++ h.add_hostname("localhost") ++ self.assertTrue("127.0.0.1" in h.format_name()) ++ self.assertTrue("::1" in h.format_name()) ++ self.assertTrue("localhost" in h.format_name()) + + def test_empty_get_port(self): + h = Host() +@@ -197,8 +197,8 @@ class host_test(unittest.TestCase): + h = s.hosts[0] + self.assertEqual(len(h.ports), 5) + self.assertEqual(len(h.extraports), 1) +- self.assertEqual(h.extraports.keys()[0], u"filtered") +- self.assertEqual(h.extraports.values()[0], 95) ++ self.assertEqual(list(h.extraports.keys())[0], "filtered") ++ self.assertEqual(list(h.extraports.values())[0], 95) + self.assertEqual(h.state, "up") + + +@@ -241,13 +241,13 @@ class port_test(unittest.TestCase): + """Test the Port class.""" + def test_spec_string(self): + p = Port((10, "tcp")) +- self.assertEqual(p.spec_string(), u"10/tcp") ++ self.assertEqual(p.spec_string(), "10/tcp") + p = Port((100, "ip")) +- self.assertEqual(p.spec_string(), u"100/ip") ++ self.assertEqual(p.spec_string(), "100/ip") + + def test_state_string(self): + p = Port((10, "tcp")) +- self.assertEqual(p.state_string(), u"unknown") ++ self.assertEqual(p.state_string(), "unknown") + + + class service_test(unittest.TestCase): +@@ -255,47 +255,47 @@ class service_test(unittest.TestCase): + def test_compare(self): + """Test that services with the same contents compare equal.""" + a = Service() +- a.name = u"ftp" +- a.product = u"FooBar FTP" +- a.version = u"1.1.1" +- a.tunnel = u"ssl" ++ a.name = "ftp" ++ a.product = "FooBar FTP" ++ a.version = "1.1.1" ++ a.tunnel = "ssl" + self.assertEqual(a, a) + b = Service() +- b.name = u"ftp" +- b.product = u"FooBar FTP" +- b.version = u"1.1.1" +- b.tunnel = u"ssl" ++ b.name = "ftp" ++ b.product = "FooBar FTP" ++ b.version = "1.1.1" ++ b.tunnel = "ssl" + self.assertEqual(a, b) +- b.name = u"http" ++ b.name = "http" + self.assertNotEqual(a, b) + c = Service() + self.assertNotEqual(a, c) + + def test_tunnel(self): + serv = Service() +- serv.name = u"http" +- serv.tunnel = u"ssl" +- self.assertEqual(serv.name_string(), u"ssl/http") ++ serv.name = "http" ++ serv.tunnel = "ssl" ++ self.assertEqual(serv.name_string(), "ssl/http") + + def test_version_string(self): + serv = Service() +- serv.product = u"FooBar" ++ serv.product = "FooBar" + self.assertTrue(len(serv.version_string()) > 0) + serv = Service() +- serv.version = u"1.2.3" ++ serv.version = "1.2.3" + self.assertTrue(len(serv.version_string()) > 0) + serv = Service() +- serv.extrainfo = u"misconfigured" ++ serv.extrainfo = "misconfigured" + self.assertTrue(len(serv.version_string()) > 0) + serv = Service() +- serv.product = u"FooBar" +- serv.version = u"1.2.3" ++ serv.product = "FooBar" ++ serv.version = "1.2.3" + # Must match Nmap output. + self.assertEqual(serv.version_string(), +- u"%s %s" % (serv.product, serv.version)) +- serv.extrainfo = u"misconfigured" ++ "%s %s" % (serv.product, serv.version)) ++ serv.extrainfo = "misconfigured" + self.assertEqual(serv.version_string(), +- u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) ++ "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) + + + class ScanDiffSub(ScanDiff): +@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase): + a.load_from_file("test-scans/empty.xml") + b = Scan() + b.load_from_file("test-scans/simple.xml") +- f = StringIO.StringIO() ++ f = io.StringIO() + self.scan_diff = ScanDiffXML(a, b, f) + self.scan_diff.output() + self.xml = f.getvalue() +@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase): + def test_well_formed(self): + try: + document = xml.dom.minidom.parseString(self.xml) +- except Exception, e: +- self.fail(u"Parsing XML diff output caused the exception: %s" ++ except Exception as e: ++ self.fail("Parsing XML diff output caused the exception: %s" + % str(e)) + + +@@ -739,8 +739,8 @@ def host_apply_diff(host, diff): + host.os = diff.host_b.os[:] + + if diff.extraports_changed: +- for state in host.extraports.keys(): +- for port in host.ports.values(): ++ for state in list(host.extraports.keys()): ++ for port in list(host.ports.values()): + if port.state == state: + del host.ports[port.spec] + host.extraports = diff.host_b.extraports.copy() +diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff +index 8517c07..4671e73 100755 +--- a/ndiff/scripts/ndiff ++++ b/ndiff/scripts/ndiff +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Ndiff + # +@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB): + + try: + import ndiff +-except ImportError, e: +- print >> sys.stderr, """\ ++except ImportError as e: ++ print("""\ + Could not import the ndiff module: %s. +-I checked in these directories:""" % repr(e.message) ++I checked in these directories:""" % repr(e), file=sys.stderr) + for dir in sys.path: +- print >> sys.stderr, " %s" % dir +- print >> sys.stderr, """\ ++ print(" %s" % dir, file=sys.stderr) ++ print("""\ + If you installed Ndiff in another directory, you may have to add the +-modules directory to the PYTHONPATH environment variable.""" ++modules directory to the PYTHONPATH environment variable.""", file=sys.stderr) + sys.exit(1) + + import ndiff +diff --git a/ndiff/setup.py b/ndiff/setup.py +old mode 100644 +new mode 100755 +index b5e254c..c49bcf3 +--- a/ndiff/setup.py ++++ b/ndiff/setup.py +@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install): + self.saved_prefix = sys.prefix + try: + distutils.command.install.install.finalize_options(self) +- except distutils.errors.DistutilsPlatformError, e: ++ except distutils.errors.DistutilsPlatformError as e: + raise distutils.errors.DistutilsPlatformError(str(e) + """ + Installing your distribution's python-dev package may solve this problem.""") + +@@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""") + #!/usr/bin/env python + import errno, os, os.path, sys + +-print 'Uninstall %(name)s' ++print('Uninstall %(name)s') + + answer = raw_input('Are you sure that you want to uninstall ' + '%(name)s (yes/no) ') + + if answer != 'yes' and answer != 'y': +- print 'Not uninstalling.' ++ print('Not uninstalling.') + sys.exit(0) + + """ % {'name': APP_NAME} +@@ -177,8 +177,8 @@ if answer != 'yes' and answer != 'y': + # This should never happen (everything gets installed + # inside the root), but if it does, be safe and don't + # delete anything. +- uninstaller += ("print '%s was not installed inside " +- "the root %s; skipping.'\n" % (output, self.root)) ++ uninstaller += ("print('%s was not installed inside " ++ "the root %s; skipping.')\n" % (output, self.root)) + continue + output = path_strip_prefix(output, self.root) + assert os.path.isabs(output) +@@ -202,24 +202,24 @@ for path in INSTALLED_FILES: + dirs.append(path) + # Delete the files. + for file in files: +- print "Removing '%s'." % file ++ print("Removing '%s'." % file) + try: + os.remove(file) +- except OSError, e: +- print >> sys.stderr, ' Error: %s.' % str(e) ++ except OSError as e: ++ print(' Error: %s.' % str(e), file=sys.stderr) + # Delete the directories. First reverse-sort the normalized paths by + # length so that child directories are deleted before their parents. + dirs = [os.path.normpath(dir) for dir in dirs] + dirs.sort(key = len, reverse = True) + for dir in dirs: + try: +- print "Removing the directory '%s'." % dir ++ print("Removing the directory '%s'." % dir) + os.rmdir(dir) +- except OSError, e: ++ except OSError as e: + if e.errno == errno.ENOTEMPTY: +- print "Directory '%s' not empty; not removing." % dir ++ print("Directory '%s' not empty; not removing." % dir) + else: +- print >> sys.stderr, str(e) ++ print(str(e), file=sys.stderr) + """ + + uninstaller_file = open(uninstaller_filename, 'w') +@@ -227,7 +227,7 @@ for dir in dirs: + uninstaller_file.close() + + # Set exec bit for uninstaller +- mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777 ++ mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777 + os.chmod(uninstaller_filename, mode) + + def write_installed_files(self): +@@ -242,7 +242,7 @@ for dir in dirs: + try: + for output in self.get_installed_files(): + assert "\n" not in output +- print >> f, output ++ print(output, file=f) + finally: + f.close() + +@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command): + # Read the list of installed files. + try: + f = open(INSTALLED_FILES_NAME, "r") +- except IOError, e: ++ except IOError as e: + if e.errno == errno.ENOENT: + log.error("Couldn't open the installation record '%s'. " + "Have you installed yet?" % INSTALLED_FILES_NAME) +@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command): + try: + if not self.dry_run: + os.remove(file) +- except OSError, e: ++ except OSError as e: + log.error(str(e)) + # Delete the directories. First reverse-sort the normalized paths by + # length so that child directories are deleted before their parents. +@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command): + log.info("Removing the directory '%s'." % dir) + if not self.dry_run: + os.rmdir(dir) +- except OSError, e: ++ except OSError as e: + if e.errno == errno.ENOTEMPTY: + log.info("Directory '%s' not empty; not removing." % dir) + else: +diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py +index 9ba612a..fd251fe 100755 +--- a/ndiff/test-scans/anonymize.py ++++ b/ndiff/test-scans/anonymize.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Anonymize an Nmap XML file, replacing host name and IP addresses with random + # anonymous ones. Anonymized names will be consistent between runs of the +@@ -20,20 +20,20 @@ r = random.Random() + + + def hash(s): +- digest = hashlib.sha512(s).hexdigest() ++ digest = hashlib.sha512(s.encode()).hexdigest() + return int(digest, 16) + + + def anonymize_mac_address(addr): + r.seed(hash(addr)) + nums = (0, 0, 0) + tuple(r.randrange(256) for i in range(3)) +- return u":".join(u"%02X" % x for x in nums) ++ return ":".join("%02X" % x for x in nums) + + + def anonymize_ipv4_address(addr): + r.seed(hash(addr)) + nums = (10,) + tuple(r.randrange(256) for i in range(3)) +- return u".".join(unicode(x) for x in nums) ++ return ".".join(str(x) for x in nums) + + + def anonymize_ipv6_address(addr): +@@ -41,7 +41,7 @@ def anonymize_ipv6_address(addr): + # RFC 4193. + nums = (0xFD00 + r.randrange(256),) + nums = nums + tuple(r.randrange(65536) for i in range(7)) +- return u":".join("%04X" % x for x in nums) ++ return ":".join("%04X" % x for x in nums) + + # Maps to memoize address and host name conversions. + hostname_map = {} +@@ -54,11 +54,11 @@ def anonymize_hostname(name): + LETTERS = "acbdefghijklmnopqrstuvwxyz" + r.seed(hash(name)) + length = r.randrange(5, 10) +- prefix = u"".join(r.sample(LETTERS, length)) ++ prefix = "".join(r.sample(LETTERS, length)) + num = r.randrange(1000) +- hostname_map[name] = u"%s-%d.example.com" % (prefix, num) ++ hostname_map[name] = "%s-%d.example.com" % (prefix, num) + if VERBOSE: +- print >> sys.stderr, "Replace %s with %s" % (name, hostname_map[name]) ++ print("Replace %s with %s" % (name, hostname_map[name]), file=sys.stderr) + return hostname_map[name] + + mac_re = re.compile(r'\b([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}\b') +@@ -78,7 +78,7 @@ def anonymize_address(addr): + else: + assert False + if VERBOSE: +- print >> sys.stderr, "Replace %s with %s" % (addr, address_map[addr]) ++ print("Replace %s with %s" % (addr, address_map[addr]), file=sys.stderr) + return address_map[addr] + + +-- +2.24.1 + diff --git a/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch b/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch new file mode 100644 index 0000000..c43ff9f --- /dev/null +++ b/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch @@ -0,0 +1,48 @@ +From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 14 Feb 2020 08:19:54 +0000 +Subject: [PATCH] configure.ac: make ndiff depend on python3 + +Python 2 ceased being maintained on the 1st January 2020. +We've already removed all users of it from oe-core, so +let ndiff depend on python3. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + .../nmap/7.80-r0/nmap-7.80/configure.ac | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9d2fff8..5ffdd55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then + HAVE_PYTHON2=true + fi + ++HAVE_PYTHON3=false ++if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then ++ HAVE_PYTHON3=true ++fi ++ + NDIFFDIR=ndiff + + # Do they want Ndiff? + AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check]) +-if $HAVE_PYTHON2 ; then : ; ++if $HAVE_PYTHON3 ; then : ; + else + if test "$with_ndiff" = "check" ; then +- AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found]) ++ AC_MSG_WARN([Not building Ndiff because Python3 was not found]) + elif test "$with_ndiff" = "yes"; then +- AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4]) ++ AC_MSG_FAILURE([--with-ndiff requires Python3]) + fi + with_ndiff=no + fi +-- +2.24.1 + diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.80.bb index 96af17e..c76d232 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -10,6 +10,8 @@ SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ file://0001-Include-time.h-header-to-pass-clang-compilation.patch \ file://0002-Fix-building-with-libc.patch \ + file://0001-Make-ndiff-support-python3.patch \ + file://0001-configure.ac-make-ndiff-depend-on-python3.patch \ " SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5" @@ -28,7 +30,7 @@ PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, z #disable/enable packages PACKAGECONFIG[nping] = ",--without-nping," PACKAGECONFIG[ncat] = ",--without-ncat," -PACKAGECONFIG[ndiff] = ",--without-ndiff,python3" +PACKAGECONFIG[ndiff] = "--with-ndiff=yes,--without-ndiff,python3" PACKAGECONFIG[update] = ",--without-nmap-update," EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included" @@ -47,6 +49,12 @@ do_configure() { oe_runconf } +do_install_append() { + if [ -f "${D}${bindir}/ndiff" ]; then + sed -i 's@^#!.*$@#!/usr/bin/env python3 at g' ${D}${bindir}/ndiff + fi +} + FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" -RDEPENDS_${PN} = "python3" +RDEPENDS_${PN} += "python3-core" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:51 +0000 Subject: [oe-commits] [openembedded-core] 03/07: selftest: wic: Add APPEND to the optional variables list In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161649.14E3223281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f0b42df1a63e0b237daacd0a0501a67b02810fd0 Author: Kevin Hao AuthorDate: Sat Feb 15 19:41:44 2020 +0800 selftest: wic: Add APPEND to the optional variables list The APPEND is an optional variable, so add it to the optional variables list to make the wic selftest happy. Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 46cd98b..626a217 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -537,7 +537,8 @@ class Wic2(WicTestCase): # filter out optional variables wicvars = wicvars.difference(('DEPLOY_DIR_IMAGE', 'IMAGE_BOOT_FILES', 'INITRD', 'INITRD_LIVE', 'ISODIR','INITRAMFS_IMAGE', - 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME')) + 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME', + 'APPEND')) with open(path) as envfile: content = dict(line.split("=", 1) for line in envfile) # test if variables used by wic present in the .env file -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:49 +0000 Subject: [oe-commits] [openembedded-core] 01/07: meson.bbclass: Parameterise meson.cross In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161648.F3E8823281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dfe8f8cbe7dea8d0b54fdc3448c22081e6f257f5 Author: Alex Kiernan AuthorDate: Sat Feb 15 09:44:48 2020 +0000 meson.bbclass: Parameterise meson.cross Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated list of meson properties which are exported into meson.cross. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 161 ++++++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 06034e8..e778e37 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -34,88 +34,99 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -def meson_array(var, d): - items = d.getVar(var).split() - return repr(items[0] if len(items) == 1 else items) - -# Map our ARCH values to what Meson expects: -# http://mesonbuild.com/Reference-tables.html#cpu-families -def meson_cpu_family(var, d): - import re - arch = d.getVar(var) - if arch == 'powerpc': - return 'ppc' - elif arch == 'powerpc64' or arch == 'powerpc64le': - return 'ppc64' - elif arch == 'armeb': - return 'arm' - elif arch == 'aarch64_be': - return 'aarch64' - elif arch == 'mipsel': - return 'mips' - elif arch == 'mips64el': - return 'mips64' - elif re.match(r"i[3-6]86", arch): - return "x86" - elif arch == "microblazeel": - return "microblaze" - else: - return arch - -# Map our OS values to what Meson expects: -# https://mesonbuild.com/Reference-tables.html#operating-system-names -def meson_operating_system(var, d): - os = d.getVar(var) - if "mingw" in os: - return "windows" - else: - return os - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) +MESON_CROSS_BINARIES ??= "c:CC \ + cpp:CXX \ + ar:AR \ + nm:NM \ + strip:STRIP \ + readelf:READELF" + +MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \ + c_link_args:LDFLAGS \ + cpp_args:CXXFLAGS \ + cpp_link_args:LDFLAGS" addtask write_config before do_configure -do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross < 12a497d) Message-ID: <158178340862.27653.2051213226276302319@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 3b44c16 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk new dfe8f8c meson.bbclass: Parameterise meson.cross new 69a883c systemd: upgrade v244.1 -> v244.3 new f0b42df selftest: wic: Add APPEND to the optional variables list new 12deeab wic: Honor APPEND new 0ee9c2a icu: upgrade 64.2 -> 65.1 new a43f9f2 webkitgtk: Upgrade to 2.26.4 minor release new 12a497d openssh: Upgrade 8.1p1 -> 8.2p1 The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/image_types_wic.bbclass | 2 +- meta/classes/meson.bbclass | 161 +++++++++++---------- meta/lib/oeqa/selftest/cases/wic.py | 3 +- ...lly-applied-upstream-fix-for-openssh-test.patch | 60 -------- ...-seccomp-Allow-clock_gettime64-in-sandbox.patch | 31 ---- .../openssh/openssh-8.1p1-seccomp-nanosleep.patch | 27 ---- .../openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} | 7 +- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 19 +-- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 -------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ----- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 ------ .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 .../{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} | 5 +- .../icu/{icu_64.2.bb => icu_65.1.bb} | 4 +- scripts/lib/wic/ksparser.py | 5 + 18 files changed, 107 insertions(+), 439 deletions(-) delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch rename meta/recipes-connectivity/openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} (95%) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) rename meta/recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} (97%) rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:50 +0000 Subject: [oe-commits] [openembedded-core] 02/07: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161649.0954A23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 69a883c31856071fbf1d8e88cfcd100067305d92 Author: Alex Kiernan AuthorDate: Sat Feb 15 09:44:49 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use MESON_CROSS_... configuration instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 19 ++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 7 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..a77f6fb 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,20 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +EFI_LDFLAGS = "${@ " ".join(d.getVar('LD').split()[1:])} ${LDFLAGS}" +MESON_CROSS_BINARIES_append = " efi_cc:CC objcopy:OBJCOPY" +MESON_CROSS_PROPERTIES_remove = "c_link_args:LDFLAGS" +MESON_CROSS_PROPERTIES_append = " c_link_args:EFI_LDFLAGS" + EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \ -Defi-includedir=${STAGING_INCDIR}/efi \ - -Defi-ldsdir=${STAGING_LIBDIR} \ -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-ld=${@ d.getVar('LD').split()[0]} \ -Dman=false \ - -Defi-cc='${EFI_CC}' \ - -Defi-ld='${LD}' \ - -Defi-objcopy='${OBJCOPY}' \ " # install to the image as boot*.efi if its the EFI_PROVIDER, diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96..e73b397 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch deleted file mode 100644 index e2e19ba..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:52 +0000 Subject: [oe-commits] [openembedded-core] 04/07: wic: Honor APPEND In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161649.1DA1F23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12deeab8effbc6d3dbe8622f304469bd4cdb963f Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:54 +0000 Subject: [oe-commits] [openembedded-core] 06/07: webkitgtk: Upgrade to 2.26.4 minor release In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161649.302BE232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a43f9f27a0da63107a1f46330f3de246dff826a4 Author: Khem Raj AuthorDate: Sat Feb 15 07:43:58 2020 -0800 webkitgtk: Upgrade to 2.26.4 minor release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb similarity index 97% rename from meta/recipes-sato/webkit/webkitgtk_2.26.2.bb rename to meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a184d83..c7f0d5e 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -21,9 +21,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ " - -SRC_URI[md5sum] = "65e06fe73ee166447894aaea95038e3b" -SRC_URI[sha256sum] = "6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512" +SRC_URI[md5sum] = "60f881729f3b71244b7f6e58790073e0" +SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:53 +0000 Subject: [oe-commits] [openembedded-core] 05/07: icu: upgrade 64.2 -> 65.1 In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161649.27773232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0ee9c2aaff4bf88f033bf89595c9feba5dc51d50 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:27 2020 -0800 icu: upgrade 64.2 -> 65.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb similarity index 88% rename from meta/recipes-support/icu/icu_64.2.bb rename to meta/recipes-support/icu/icu_65.1.bb index 44caa43..bd932d7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_65.1.bb @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 16:16:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 16:16:55 +0000 Subject: [oe-commits] [openembedded-core] 07/07: openssh: Upgrade 8.1p1 -> 8.2p1 In-Reply-To: <158178340862.27653.2051213226276302319@git.openembedded.org> References: <158178340862.27653.2051213226276302319@git.openembedded.org> Message-ID: <20200215161649.3979B23282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12a497d56dd937aa719a8c295c9decc3ca68c346 Author: Alex Kiernan AuthorDate: Sat Feb 15 15:30:06 2020 +0000 openssh: Upgrade 8.1p1 -> 8.2p1 Drop backports from upstream: 0001-Manually-applied-upstream-fix-for-openssh-test.patch 0001-seccomp-Allow-clock_gettime64-in-sandbox.patch openssh-8.1p1-seccomp-nanosleep.patch Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...lly-applied-upstream-fix-for-openssh-test.patch | 60 ---------------------- ...-seccomp-Allow-clock_gettime64-in-sandbox.patch | 31 ----------- .../openssh/openssh-8.1p1-seccomp-nanosleep.patch | 27 ---------- .../openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} | 7 +-- 4 files changed, 2 insertions(+), 123 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch deleted file mode 100644 index 7171ec0..0000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001 -From: "Mingde (Matthew) Zeng" -Date: Wed, 15 Jan 2020 15:51:42 -0500 -Subject: [PATCH] Manually applied upstream fix for openssh test - -Upstream Status: Backport: - https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381 - -Signed-off-by: Mingde (Matthew) Zeng ---- - regress/cert-hostkey.sh | 4 ++-- - regress/cert-userkey.sh | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh -index 86ea6250..60e3ec02 100644 ---- a/regress/cert-hostkey.sh -+++ b/regress/cert-hostkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified host keys" -@@ -252,7 +252,7 @@ test_one() { - test_one "user-certificate" failure "-n $HOSTS" - test_one "empty principals" success "-h" - test_one "wrong principals" failure "-h -n foo" --test_one "cert not yet valid" failure "-h -V20200101:20300101" -+test_one "cert not yet valid" failure "-h -V20300101:20320101" - test_one "cert expired" failure "-h -V19800101:19900101" - test_one "cert valid interval" success "-h -V-1w:+2w" - test_one "cert has constraints" failure "-h -Oforce-command=false" -diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh -index 38c14a69..f0e30945 100644 ---- a/regress/cert-userkey.sh -+++ b/regress/cert-userkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified user keys" -@@ -338,7 +338,7 @@ test_one() { - test_one "correct principal" success "-n ${USER}" - test_one "host-certificate" failure "-n ${USER} -h" - test_one "wrong principals" failure "-n foo" --test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" -+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" - test_one "cert expired" failure "-n ${USER} -V19800101:19900101" - test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" - test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" -@@ -399,4 +399,3 @@ done - - rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key* - rm -f $OBJ/authorized_principals_$USER -- --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch b/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch deleted file mode 100644 index 78c493d..0000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eae3e85322fa7c869f5822db4eda6348f2beb09e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 7 Jan 2020 16:26:45 -0800 -Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. - -This helps sshd accept connections on mips platforms with -upcoming glibc ( 2.31 ) - -Upstream-Status: Accepted [https://github.com/openssh/openssh-portable/pull/161] -Signed-off-by: Khem Raj ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 3ef30c9..999c46c 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_clock_nanosleep_time64 - SC_ALLOW(__NR_clock_nanosleep_time64), - #endif -+#ifdef __NR_clock_gettime64 -+ SC_ALLOW(__NR_clock_gettime64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch b/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch deleted file mode 100644 index 7c9d61c..0000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7e929163ed40f9ce90060a3ca6df558c3d901379 -Author: Jakub Jelen -Date: Wed Nov 13 12:57:05 2019 +0100 - -seccomp: Allow clock_nanosleep() to make OpenSSH working with latest glibc -sandbox-seccomp: Allow clock_nanosleep on ARM - -Upstream-Status: Backport [https://github.com/tcely/openssh-portable/pull/258] - [https://github.com/bobby0809/openssh-portable/pull/138] - -Signed-off-by: Khem Raj References: <158176248670.31260.7654152103178704127@git.openembedded.org> <20200215102807.938B8232818@git.openembedded.org> Message-ID: <65fcf6fa-6f55-b082-52fb-6d8a8ce2ef3c@koncepto.io> Hello All, Le 15/02/2020 ? 11:28, git at git.openembedded.org a ?crit?: > busybox: Backport patches to support removal of __NR_clock_gettime > > This helps compiling with musl on 32bit arches now that musl has > switched to 64bit time_t > > Signed-off-by: Khem Raj > Signed-off-by: Richard Purdie > --- > ...all-wrappers-around-clock_gettime-closes-.patch | 120 +++++++++++++++++++++ > ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ > ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ > ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 ++++++++ > meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + > 5 files changed, 266 insertions(+) this commit causes the following build issue : ERROR: busybox-1.31.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/runner/work/kas-files/kas-files/build/tmp/work/cortexa7t2hf-neon-vfpv4-poky-linux-gnueabi/busybox/1.31.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch patching file Makefile.flags patching file coreutils/date.c Hunk #2 FAILED at 270. 1 out of 2 hunks FAILED -- rejects in file coreutils/date.c patching file libbb/time.c patching file runit/runsv.c Patch 0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch does not apply (enforce with -f) ERROR: Logfile of failure stored in: /home/runner/work/kas-files/kas-files/build/tmp/work/cortexa7t2hf-neon-vfpv4-poky-linux-gnueabi/busybox/1.31.1-r0/temp/log.do_patch.62122 ERROR: Task (/home/runner/work/kas-files/kas-files/poky/meta/recipes-core/busybox/busybox_1.31.1.bb:do_patch) failed with exit code '1' Tested on top of poky master (commit 7f2af8bd795ace46828952a7812f0bbdf26529a [1]) [1] - https://github.com/texierp/kas-files/runs/447729194 Thanks ! Regards -- Pierre-Jean Texier Embedded Linux Engineer https://koncepto.io From martin.jansa at gmail.com Sat Feb 15 16:38:11 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Sat, 15 Feb 2020 17:38:11 +0100 Subject: [oe-commits] [openembedded-core] 11/18: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <65fcf6fa-6f55-b082-52fb-6d8a8ce2ef3c@koncepto.io> References: <158176248670.31260.7654152103178704127@git.openembedded.org> <20200215102807.938B8232818@git.openembedded.org> <65fcf6fa-6f55-b082-52fb-6d8a8ce2ef3c@koncepto.io> Message-ID: Isn't it caused by some other layer prepending some busybox patch causing this? Can you check with bitbake -e? I'm not seeing this one in my builds (and I was just refreshing some of our webOS OSE patches to apply cleanly on 1.31.1) Regards, On Sat, Feb 15, 2020 at 5:30 PM Pierre-Jean Texier via Openembedded-commits wrote: > Hello All, > > Le 15/02/2020 ? 11:28, git at git.openembedded.org a ?crit : > > busybox: Backport patches to support removal of __NR_clock_gettime > > > > This helps compiling with musl on 32bit arches now that musl has > > switched to 64bit time_t > > > > Signed-off-by: Khem Raj > > Signed-off-by: Richard Purdie > > --- > > ...all-wrappers-around-clock_gettime-closes-.patch | 120 > +++++++++++++++++++++ > > ...-date-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++++ > > ...-time-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++++ > > ...runsv-Use-64-prefix-syscall-if-we-have-to.patch | 46 ++++++++ > > meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + > > 5 files changed, 266 insertions(+) > > this commit causes the following build issue : > > ERROR: busybox-1.31.1-r0 do_patch: Command Error: 'quilt --quiltrc > /home/runner/work/kas-files/kas-files/build/tmp/work/cortexa7t2hf-neon-vfpv4-poky-linux-gnueabi/busybox/1.31.1-r0/recipe-sysroot-native/etc/quiltrc > > push' exited with 0 Output: > Applying patch > 0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch > patching file Makefile.flags > patching file coreutils/date.c > Hunk #2 FAILED at 270. > 1 out of 2 hunks FAILED -- rejects in file coreutils/date.c > patching file libbb/time.c > patching file runit/runsv.c > Patch 0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch > does not apply (enforce with -f) > ERROR: Logfile of failure stored in: > > /home/runner/work/kas-files/kas-files/build/tmp/work/cortexa7t2hf-neon-vfpv4-poky-linux-gnueabi/busybox/1.31.1-r0/temp/log.do_patch.62122 > ERROR: Task > > (/home/runner/work/kas-files/kas-files/poky/meta/recipes-core/busybox/busybox_1.31.1.bb:do_patch) > > failed with exit code '1' > > Tested on top of poky master (commit > 7f2af8bd795ace46828952a7812f0bbdf26529a [1]) > > [1] - https://github.com/texierp/kas-files/runs/447729194 > > Thanks ! > > Regards > -- > Pierre-Jean Texier > Embedded Linux Engineer > https://koncepto.io > -- > _______________________________________________ > Openembedded-commits mailing list > Openembedded-commits at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-commits > From pjtexier at koncepto.io Sat Feb 15 16:46:44 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 15 Feb 2020 17:46:44 +0100 Subject: [oe-commits] [openembedded-core] 11/18: busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: References: <158176248670.31260.7654152103178704127@git.openembedded.org> <20200215102807.938B8232818@git.openembedded.org> <65fcf6fa-6f55-b082-52fb-6d8a8ce2ef3c@koncepto.io> Message-ID: <432947a2-e180-8799-c6dd-22aa89ba4e89@koncepto.io> Martin, Le 15/02/2020 ? 17:38, Martin Jansa a ?crit?: > Isn't it caused by some other layer prepending some busybox patch causing > this? Can you check with bitbake -e? > > I'm not seeing this one in my builds (and I was just refreshing some of our > webOS OSE patches to apply cleanly on 1.31.1) You're indeed right :(, after a quick check, it seems the build failure comes from the meta-riscv. Thanks, and sorry for the noise. Regards, -- Pierre-Jean Texier Embedded Linux Engineer https://koncepto.io From git at git.openembedded.org Sat Feb 15 17:26:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:33 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: resulttool/resultutils: Fix unicode error handling Message-ID: <158178759381.12739.10216336585528859353@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. The following commit(s) were added to refs/heads/master by this push: new 3aa0d0f resulttool/resultutils: Fix unicode error handling 3aa0d0f is described below commit 3aa0d0fd0bbf8c9c13719251a2fd1e85a22c7336 Author: Richard Purdie AuthorDate: Sat Feb 15 17:23:54 2020 +0000 resulttool/resultutils: Fix unicode error handling This error handling didn't work as expected since upon failure it would inject bytestreams back into the code leading to tracebacks. Instead, ignore the decode errors. Fixes: Traceback (most recent call last): File "/home/pokybuild/yocto-worker/a-full/build/scripts/resulttool", line 78, in sys.exit(main()) File "/home/pokybuild/yocto-worker/a-full/build/scripts/resulttool", line 72, in main ret = args.func(args, logger) File "/home/pokybuild/yocto-worker/a-full/build/scripts/lib/resulttool/store.py", line 70, in store resultutils.save_resultsdata(results, tempdir, ptestlogs=True) File "/home/pokybuild/yocto-worker/a-full/build/scripts/lib/resulttool/resultutils.py", line 178, in save_resultsdata f.write(sectionlog) TypeError: write() argument must be str, not bytes Signed-off-by: Richard Purdie --- scripts/lib/resulttool/resultutils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py index f0ae8ec..5fec01f 100644 --- a/scripts/lib/resulttool/resultutils.py +++ b/scripts/lib/resulttool/resultutils.py @@ -127,10 +127,7 @@ def decode_log(logdata): data = logdata.get("compressed") data = base64.b64decode(data.encode("utf-8")) data = zlib.decompress(data) - try: - return data.decode("utf-8") - except UnicodeDecodeError: - return data + return data.decode("utf-8", errors='ignore') return None def ptestresult_get_log(results, section): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:44 +0000 Subject: [oe-commits] [openembedded-core] 01/26: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.996E323281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a5e10ceed86ffd26a655c64acc64ebd7b7e2c385 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:47 +0000 Subject: [oe-commits] [openembedded-core] 04/26: HACK: signing: Add extra test debug In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.B355D232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bee8e4d81562ce4bb552917ef6150c94e26079e8 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:43 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (12a497d -> 7d51b7c) Message-ID: <158178760346.12964.9138501876473186015@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 12a497d openssh: Upgrade 8.1p1 -> 8.2p1 discard a43f9f2 webkitgtk: Upgrade to 2.26.4 minor release discard 0ee9c2a icu: upgrade 64.2 -> 65.1 discard 12deeab wic: Honor APPEND discard f0b42df selftest: wic: Add APPEND to the optional variables list discard 69a883c systemd: upgrade v244.1 -> v244.3 discard dfe8f8c meson.bbclass: Parameterise meson.cross discard 3b44c16 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk discard 3c1eabb newlib: Move syscalls from newlib to libgloss discard 2ad2725 tclibc-newlib: Include qemu on the SDK discard a2aec6b tclibc-baremetal: Include qemu on the SDK discard 4e5c525 image.bbclass, package-index.bb: Delete do_populate_lic task discard 5840326 tcf-agent: Mangle arch for armeb discard 73e3be1 x11perf: make x11perfcomp a mulitlib script discard b8e1e69 subversion: move pkgconfig files in to libdir discard 636e1fc libassuan: multilib header for assuan.h discard 023f5ee libsndfile1: mutlilibize sndfile.h discard ecd4817 libxslt: multilib_header xsltconfig.h discard 7a9c1cb bind: add mulitlib_header for platform.h discard 09d594b HACK: extra debug discard d131e72 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 4217768 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 5171c2d HACK: signing: Add extra test debug discard 69fa2d6 glew/curl: specify exclusive package configs discard aeedb9b base.bbclass: extend PACKAGECONFIG for conflict package configs discard 4157cd3 oescripts.py: use unittest.SkipUnless for class skip add 3aa0d0f resulttool/resultutils: Fix unicode error handling new a5e10ce oescripts.py: use unittest.SkipUnless for class skip new 2874341 base.bbclass: extend PACKAGECONFIG for conflict package configs new 667beb9 glew/curl: specify exclusive package configs new bee8e4d HACK: signing: Add extra test debug new 39bba0c sstatesig: Log timestamps for hashequiv in reprodubile builds new 6df479a rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 69c97a1 HACK: extra debug new 80a7ce0 bind: add mulitlib_header for platform.h new 3578ae2 libxslt: multilib_header xsltconfig.h new e581874 libsndfile1: mutlilibize sndfile.h new d07dd1e libassuan: multilib header for assuan.h new 53d7e2a subversion: move pkgconfig files in to libdir new 72c74c0 x11perf: make x11perfcomp a mulitlib script new bab33cb tcf-agent: Mangle arch for armeb new 6bac384 image.bbclass, package-index.bb: Delete do_populate_lic task new c642590 tclibc-baremetal: Include qemu on the SDK new 702b777 tclibc-newlib: Include qemu on the SDK new 241b256 newlib: Move syscalls from newlib to libgloss new 04de26d gnupg: Read GNUPG_BINDIR from environment variables for nativesdk new 5353962 meson.bbclass: Parameterise meson.cross new ac498ae systemd: upgrade v244.1 -> v244.3 new 203dbbd selftest: wic: Add APPEND to the optional variables list new 0ccb6ea wic: Honor APPEND new ad39960 icu: upgrade 64.2 -> 65.1 new 9c3ee69 webkitgtk: Upgrade to 2.26.4 minor release new 7d51b7c openssh: Upgrade 8.1p1 -> 8.2p1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (12a497d) \ N -- N -- N refs/heads/master-next (7d51b7c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 26 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: scripts/lib/resulttool/resultutils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:45 +0000 Subject: [oe-commits] [openembedded-core] 02/26: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.A1F3423281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2874341c0dad2ad36e22bcea85804dbe0d8207ed Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:46 +0000 Subject: [oe-commits] [openembedded-core] 03/26: glew/curl: specify exclusive package configs In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.AAB9C23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 667beb991bffe39b884af6448c07142ad9b77030 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:48 +0000 Subject: [oe-commits] [openembedded-core] 05/26: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.BF7B1232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 39bba0cf28435708438fc3286a8510581a2d4250 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:50 +0000 Subject: [oe-commits] [openembedded-core] 07/26: HACK: extra debug In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.D165523282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 69c97a1b333de26bf0c5733a54252050b16e4ea0 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:51 +0000 Subject: [oe-commits] [openembedded-core] 08/26: bind: add mulitlib_header for platform.h In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.DA0B623282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 80a7ce0077d5479e2754571b4ca8633d117cea7c Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:48 2020 -0800 bind: add mulitlib_header for platform.h Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.11.13.bb index 338d6c7..4e64171 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.11.13.bb @@ -31,7 +31,7 @@ UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" # don't report it here since dhcpd is already recent enough. CVE_CHECK_WHITELIST += "CVE-2019-6470" -inherit autotools update-rc.d systemd useradd pkgconfig multilib_script +inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -105,6 +105,8 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf fi + + oe_multilib_header isc/platform.h } CONFFILES_${PN} = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:53 +0000 Subject: [oe-commits] [openembedded-core] 10/26: libsndfile1: mutlilibize sndfile.h In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.EB9CC232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e58187498732faf5e461e638db56c20c1013c698 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:50 2020 -0800 libsndfile1: mutlilibize sndfile.h sndfile.h can differ depending on the combined architectures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 7855008..b100108 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -32,7 +32,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig multilib_header + +do_install_append() { + oe_multilib_header sndfile.h +} # This can't be replicated and is just a memory leak. # https://github.com/erikd/libsndfile/issues/398 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:49 +0000 Subject: [oe-commits] [openembedded-core] 06/26: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.C984823282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6df479a6a9d28ebe681b9ea316e570844b1856c1 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:52 +0000 Subject: [oe-commits] [openembedded-core] 09/26: libxslt: multilib_header xsltconfig.h In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172643.E3300232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3578ae2ab653dc18769998ac1f68185a685b7fd6 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:49 2020 -0800 libxslt: multilib_header xsltconfig.h xsltconfig.h is generated and can be different between multilibs Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb index ad37b5a..1961bb5 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header do_configure_prepend () { # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. @@ -43,6 +43,10 @@ do_install_append_class-native () { create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } +do_install_append () { + oe_multilib_header libxslt/xsltconfig.h +} + FILES_${PN} += "${libdir}/libxslt-plugins" FILES_${PN}-dev += "${libdir}/xsltConf.sh" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:54 +0000 Subject: [oe-commits] [openembedded-core] 11/26: libassuan: multilib header for assuan.h In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.020BD232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d07dd1e87ec44aa3edd084089428025134b6a4a3 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:51 2020 -0800 libassuan: multilib header for assuan.h assuan.h is generated and can differ between mutlilibs. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libassuan/libassuan_2.5.3.bb b/meta/recipes-support/libassuan/libassuan_2.5.3.bb index 6fb3d2f..52b4c0f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.3.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.3.bb @@ -22,11 +22,15 @@ SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f7 BINCONFIG = "${bindir}/libassuan-config" -inherit autotools texinfo binconfig-disabled pkgconfig +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } +do_install_append () { + oe_multilib_header assuan.h +} + BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:55 +0000 Subject: [oe-commits] [openembedded-core] 12/26: subversion: move pkgconfig files in to libdir In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.0BB86232834@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 53d7e2ac1770ac98a4fe11d3ece180013b4fcebf Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:52 2020 -0800 subversion: move pkgconfig files in to libdir All of the .pc files contain the path to ${libdir} which fails in a multilib rpm image. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/subversion/subversion_1.13.0.bb b/meta/recipes-devtools/subversion/subversion_1.13.0.bb index 9c1281a..6879f12 100644 --- a/meta/recipes-devtools/subversion/subversion_1.13.0.bb +++ b/meta/recipes-devtools/subversion/subversion_1.13.0.bb @@ -37,6 +37,8 @@ EXTRA_OECONF = " \ ac_cv_path_RUBY=none \ " +EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" + acpaths = "-I build/ -I build/ac-macros/" CPPFLAGS += "-P" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:56 +0000 Subject: [oe-commits] [openembedded-core] 13/26: x11perf: make x11perfcomp a mulitlib script In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.152C3232835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72c74c0aa2c34ccb8e591fad79f822102b46a326 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:53 2020 -0800 x11perf: make x11perfcomp a mulitlib script x11perfcomp encodes the library paths in the script. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb index 33c0c8a..c4d443b 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ PE = "1" +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/x11perfcomp" + do_install_append_class-target () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:57 +0000 Subject: [oe-commits] [openembedded-core] 14/26: tcf-agent: Mangle arch for armeb In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.1EF4A23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bab33cb240f97628e29df179f76dd7ae33a30fd4 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:44:16 2020 -0800 tcf-agent: Mangle arch for armeb Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index e0a07a9..ed14fe6 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -29,7 +29,7 @@ INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." # mangling needed for make -MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64,`" +MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64, | sed s,armeb,arm,`" MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:26:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:26:58 +0000 Subject: [oe-commits] [openembedded-core] 15/26: image.bbclass, package-index.bb: Delete do_populate_lic task In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.28440232836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6bac3845f6859e46b027956a26046b576309cf34 Author: Khem Raj AuthorDate: Fri Feb 14 15:29:01 2020 -0800 image.bbclass, package-index.bb: Delete do_populate_lic task These are meta packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 1 + meta/recipes-core/meta/package-index.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c282439..07aa1f1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -609,6 +609,7 @@ do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" +deltask do_populate_lic deltask do_populate_sysroot do_package[noexec] = "1" deltask do_package_qa diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index a4123b7..98c5bcb 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -12,6 +12,7 @@ deltask do_patch deltask do_configure deltask do_compile deltask do_install +deltask do_populate_lic deltask do_populate_sysroot do_package_index[nostamp] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:01 +0000 Subject: [oe-commits] [openembedded-core] 18/26: newlib: Move syscalls from newlib to libgloss In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.48A1723281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 241b2568aa73bcc4659dfa75a07037a65d031b99 Author: Mark Hatle AuthorDate: Fri Feb 14 12:34:14 2020 -0600 newlib: Move syscalls from newlib to libgloss By passing --disabled-newlib-supplied-syscalls, newlib will disable the generation of builtin syscalls and move this to libgloss. (This also affects the generation of crt0.o.) libgloss SHOULD then provide the syscalls, crt0.o and other functions that are no longer part of newlib itself. This now means that you must link with both newlib and libgloss, whereas before newlib would run in many configurations by itself. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index d7ac8bf..5edea8a 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -42,6 +42,7 @@ EXTRA_OECONF = " \ --with-gnu-as \ --with-gnu-ld \ --disable-multilib \ + --disable-newlib-supplied-syscalls \ " do_configure[cleandirs] = "${B}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:00 +0000 Subject: [oe-commits] [openembedded-core] 17/26: tclibc-newlib: Include qemu on the SDK In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.3DF9F23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 702b777f8185f1e3377d28d2c8445a41752d1d63 Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Feb 14 10:13:49 2020 -0800 tclibc-newlib: Include qemu on the SDK Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the newlib based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-newlib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-newlib.inc b/meta/conf/distro/include/tclibc-newlib.inc index 8338003..bf89b11 100644 --- a/meta/conf/distro/include/tclibc-newlib.inc +++ b/meta/conf/distro/include/tclibc-newlib.inc @@ -38,7 +38,7 @@ BASE_DEFAULT_DEPS_append_class-target = " ${NEWLIB_EXTENDED}" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_TARGET_TASK ?= "${LIBC_DEPENDENCIES}" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "zlib ncurses" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:02 +0000 Subject: [oe-commits] [openembedded-core] 19/26: gnupg: Read GNUPG_BINDIR from environment variables for nativesdk In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.52A7F23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 04de26d54237c786f60344089ba01834a35b5f39 Author: Robert Yang AuthorDate: Mon Jan 6 18:30:32 2020 +0800 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk There is already a relocate.patch for native which is used for reading GNUPG_BINDIR from environment variables, now also enable it for nativesdk. Otherwise, command like the following one doesn't work for nativesdk: $ gpg-connect-agent --homedir ../keys/ reloadagent /bye gpg-connect-agent: no running gpg-agent - starting '/opt/path/to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent' gpg-connect-agent: failed to start agent '/opt/path/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent': No such file or directory Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-support/gnupg/gnupg_2.2.19.bb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/gnupg/gnupg_2.2.19.bb b/meta/recipes-support/gnupg/gnupg_2.2.19.bb index 76c09ff..c07bff1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.19.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.19.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" +SRC_URI_append_class-nativesdk = " file://relocate.patch" SRC_URI[md5sum] = "cb3b373d08ba078c325299945a7f2818" SRC_URI[sha256sum] = "242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0" @@ -60,10 +61,17 @@ do_install_append() { } do_install_append_class-native() { - create_wrapper ${D}${bindir}/gpg2 GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpgconf GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpg-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpg-connect-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} + create_wrappers ${STAGING_BINDIR_NATIVE} +} + +do_install_append_class-nativesdk() { + create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} +} + +create_wrappers() { + for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 + done } PACKAGECONFIG ??= "gnutls" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:08 +0000 Subject: [oe-commits] [openembedded-core] 25/26: webkitgtk: Upgrade to 2.26.4 minor release In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.9942C232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9c3ee699ddf4b1ff0e662c9c43e0d3f6ba079e69 Author: Khem Raj AuthorDate: Sat Feb 15 07:43:58 2020 -0800 webkitgtk: Upgrade to 2.26.4 minor release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb similarity index 97% rename from meta/recipes-sato/webkit/webkitgtk_2.26.2.bb rename to meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a184d83..c7f0d5e 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -21,9 +21,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ " - -SRC_URI[md5sum] = "65e06fe73ee166447894aaea95038e3b" -SRC_URI[sha256sum] = "6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512" +SRC_URI[md5sum] = "60f881729f3b71244b7f6e58790073e0" +SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:03 +0000 Subject: [oe-commits] [openembedded-core] 20/26: meson.bbclass: Parameterise meson.cross In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.5C854232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5353962a3407a6e45ef0982ffc9f471363a6ff0b Author: Alex Kiernan AuthorDate: Sat Feb 15 09:44:48 2020 +0000 meson.bbclass: Parameterise meson.cross Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated list of meson properties which are exported into meson.cross. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 161 ++++++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 06034e8..e778e37 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -34,88 +34,99 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -def meson_array(var, d): - items = d.getVar(var).split() - return repr(items[0] if len(items) == 1 else items) - -# Map our ARCH values to what Meson expects: -# http://mesonbuild.com/Reference-tables.html#cpu-families -def meson_cpu_family(var, d): - import re - arch = d.getVar(var) - if arch == 'powerpc': - return 'ppc' - elif arch == 'powerpc64' or arch == 'powerpc64le': - return 'ppc64' - elif arch == 'armeb': - return 'arm' - elif arch == 'aarch64_be': - return 'aarch64' - elif arch == 'mipsel': - return 'mips' - elif arch == 'mips64el': - return 'mips64' - elif re.match(r"i[3-6]86", arch): - return "x86" - elif arch == "microblazeel": - return "microblaze" - else: - return arch - -# Map our OS values to what Meson expects: -# https://mesonbuild.com/Reference-tables.html#operating-system-names -def meson_operating_system(var, d): - os = d.getVar(var) - if "mingw" in os: - return "windows" - else: - return os - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) +MESON_CROSS_BINARIES ??= "c:CC \ + cpp:CXX \ + ar:AR \ + nm:NM \ + strip:STRIP \ + readelf:READELF" + +MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \ + c_link_args:LDFLAGS \ + cpp_args:CXXFLAGS \ + cpp_link_args:LDFLAGS" addtask write_config before do_configure -do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross < References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.32586232837@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c64259075131ebd5f617090882c62b4c244e7373 Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Feb 14 10:13:48 2020 -0800 tclibc-baremetal: Include qemu on the SDK Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the baremetal based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-baremetal.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/meta/conf/distro/include/tclibc-baremetal.inc index e04f8c8..31d132e 100644 --- a/meta/conf/distro/include/tclibc-baremetal.inc +++ b/meta/conf/distro/include/tclibc-baremetal.inc @@ -27,7 +27,7 @@ BASEDEPENDS_remove_class-target = "virtual/${TARGET_PREFIX}compilerlibs" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_TARGET_TASK ?= "libgcc-dev" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "virtual/${MLPREFIX}libc zlib ncurses" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:09 +0000 Subject: [oe-commits] [openembedded-core] 26/26: openssh: Upgrade 8.1p1 -> 8.2p1 In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.A43D223283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7d51b7c9e2ac171b3872fddd078477a6888bca45 Author: Alex Kiernan AuthorDate: Sat Feb 15 15:30:06 2020 +0000 openssh: Upgrade 8.1p1 -> 8.2p1 Drop backports from upstream: 0001-Manually-applied-upstream-fix-for-openssh-test.patch 0001-seccomp-Allow-clock_gettime64-in-sandbox.patch openssh-8.1p1-seccomp-nanosleep.patch Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...lly-applied-upstream-fix-for-openssh-test.patch | 60 ---------------------- ...-seccomp-Allow-clock_gettime64-in-sandbox.patch | 31 ----------- .../openssh/openssh-8.1p1-seccomp-nanosleep.patch | 27 ---------- .../openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} | 7 +-- 4 files changed, 2 insertions(+), 123 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch deleted file mode 100644 index 7171ec0..0000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001 -From: "Mingde (Matthew) Zeng" -Date: Wed, 15 Jan 2020 15:51:42 -0500 -Subject: [PATCH] Manually applied upstream fix for openssh test - -Upstream Status: Backport: - https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381 - -Signed-off-by: Mingde (Matthew) Zeng ---- - regress/cert-hostkey.sh | 4 ++-- - regress/cert-userkey.sh | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh -index 86ea6250..60e3ec02 100644 ---- a/regress/cert-hostkey.sh -+++ b/regress/cert-hostkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified host keys" -@@ -252,7 +252,7 @@ test_one() { - test_one "user-certificate" failure "-n $HOSTS" - test_one "empty principals" success "-h" - test_one "wrong principals" failure "-h -n foo" --test_one "cert not yet valid" failure "-h -V20200101:20300101" -+test_one "cert not yet valid" failure "-h -V20300101:20320101" - test_one "cert expired" failure "-h -V19800101:19900101" - test_one "cert valid interval" success "-h -V-1w:+2w" - test_one "cert has constraints" failure "-h -Oforce-command=false" -diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh -index 38c14a69..f0e30945 100644 ---- a/regress/cert-userkey.sh -+++ b/regress/cert-userkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified user keys" -@@ -338,7 +338,7 @@ test_one() { - test_one "correct principal" success "-n ${USER}" - test_one "host-certificate" failure "-n ${USER} -h" - test_one "wrong principals" failure "-n foo" --test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" -+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" - test_one "cert expired" failure "-n ${USER} -V19800101:19900101" - test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" - test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" -@@ -399,4 +399,3 @@ done - - rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key* - rm -f $OBJ/authorized_principals_$USER -- --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch b/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch deleted file mode 100644 index 78c493d..0000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eae3e85322fa7c869f5822db4eda6348f2beb09e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 7 Jan 2020 16:26:45 -0800 -Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. - -This helps sshd accept connections on mips platforms with -upcoming glibc ( 2.31 ) - -Upstream-Status: Accepted [https://github.com/openssh/openssh-portable/pull/161] -Signed-off-by: Khem Raj ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 3ef30c9..999c46c 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_clock_nanosleep_time64 - SC_ALLOW(__NR_clock_nanosleep_time64), - #endif -+#ifdef __NR_clock_gettime64 -+ SC_ALLOW(__NR_clock_gettime64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch b/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch deleted file mode 100644 index 7c9d61c..0000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7e929163ed40f9ce90060a3ca6df558c3d901379 -Author: Jakub Jelen -Date: Wed Nov 13 12:57:05 2019 +0100 - -seccomp: Allow clock_nanosleep() to make OpenSSH working with latest glibc -sandbox-seccomp: Allow clock_nanosleep on ARM - -Upstream-Status: Backport [https://github.com/tcely/openssh-portable/pull/258] - [https://github.com/bobby0809/openssh-portable/pull/138] - -Signed-off-by: Khem Raj References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.72A4923283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 203dbbd55a4f588caa1922c00a97cc4a4e0526f3 Author: Kevin Hao AuthorDate: Sat Feb 15 19:41:44 2020 +0800 selftest: wic: Add APPEND to the optional variables list The APPEND is an optional variable, so add it to the optional variables list to make the wic selftest happy. Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 46cd98b..626a217 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -537,7 +537,8 @@ class Wic2(WicTestCase): # filter out optional variables wicvars = wicvars.difference(('DEPLOY_DIR_IMAGE', 'IMAGE_BOOT_FILES', 'INITRD', 'INITRD_LIVE', 'ISODIR','INITRAMFS_IMAGE', - 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME')) + 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME', + 'APPEND')) with open(path) as envfile: content = dict(line.split("=", 1) for line in envfile) # test if variables used by wic present in the .env file -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:07 +0000 Subject: [oe-commits] [openembedded-core] 24/26: icu: upgrade 64.2 -> 65.1 In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.8D56523283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ad399602601af57c38da3b518504cd593c423524 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:27 2020 -0800 icu: upgrade 64.2 -> 65.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb similarity index 88% rename from meta/recipes-support/icu/icu_64.2.bb rename to meta/recipes-support/icu/icu_65.1.bb index 44caa43..bd932d7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_65.1.bb @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:06 +0000 Subject: [oe-commits] [openembedded-core] 23/26: wic: Honor APPEND In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.82B5823283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0ccb6ea15c34049c5f529349ba6a5c9912c635a0 Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 17:27:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 17:27:04 +0000 Subject: [oe-commits] [openembedded-core] 21/26: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158178760346.12964.9138501876473186015@git.openembedded.org> References: <158178760346.12964.9138501876473186015@git.openembedded.org> Message-ID: <20200215172644.6827723283A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ac498ae1faa99a3b040c194034fbf4958530290a Author: Alex Kiernan AuthorDate: Sat Feb 15 09:44:49 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use MESON_CROSS_... configuration instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 19 ++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 7 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..a77f6fb 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,20 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +EFI_LDFLAGS = "${@ " ".join(d.getVar('LD').split()[1:])} ${LDFLAGS}" +MESON_CROSS_BINARIES_append = " efi_cc:CC objcopy:OBJCOPY" +MESON_CROSS_PROPERTIES_remove = "c_link_args:LDFLAGS" +MESON_CROSS_PROPERTIES_append = " c_link_args:EFI_LDFLAGS" + EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \ -Defi-includedir=${STAGING_INCDIR}/efi \ - -Defi-ldsdir=${STAGING_LIBDIR} \ -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-ld=${@ d.getVar('LD').split()[0]} \ -Dman=false \ - -Defi-cc='${EFI_CC}' \ - -Defi-ld='${LD}' \ - -Defi-objcopy='${OBJCOPY}' \ " # install to the image as boot*.efi if its the EFI_PROVIDER, diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96..e73b397 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch deleted file mode 100644 index e2e19ba..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:35 +0000 Subject: [oe-commits] [openembedded-core] 02/16: libxslt: multilib_header xsltconfig.h In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.0C82D23281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 966a8d95da1d1bbf59d2d4068c27821e8a54ee5f Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:49 2020 -0800 libxslt: multilib_header xsltconfig.h xsltconfig.h is generated and can be different between multilibs Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb index ad37b5a..1961bb5 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header do_configure_prepend () { # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. @@ -43,6 +43,10 @@ do_install_append_class-native () { create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } +do_install_append () { + oe_multilib_header libxslt/xsltconfig.h +} + FILES_${PN} += "${libdir}/libxslt-plugins" FILES_${PN}-dev += "${libdir}/xsltConf.sh" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:34 +0000 Subject: [oe-commits] [openembedded-core] 01/16: bind: add mulitlib_header for platform.h In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.0418C23281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cfaaeedcb634b68d0b20a05130fd582df660fef6 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:48 2020 -0800 bind: add mulitlib_header for platform.h Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.11.13.bb index 338d6c7..4e64171 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.11.13.bb @@ -31,7 +31,7 @@ UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" # don't report it here since dhcpd is already recent enough. CVE_CHECK_WHITELIST += "CVE-2019-6470" -inherit autotools update-rc.d systemd useradd pkgconfig multilib_script +inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -105,6 +105,8 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf fi + + oe_multilib_header isc/platform.h } CONFFILES_${PN} = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:36 +0000 Subject: [oe-commits] [openembedded-core] 03/16: libsndfile1: mutlilibize sndfile.h In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.18DDD23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0373b0b40d004fb9900249bd1ba65dea54495960 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:50 2020 -0800 libsndfile1: mutlilibize sndfile.h sndfile.h can differ depending on the combined architectures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 7855008..b100108 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -32,7 +32,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig multilib_header + +do_install_append() { + oe_multilib_header sndfile.h +} # This can't be replicated and is just a memory leak. # https://github.com/erikd/libsndfile/issues/398 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:37 +0000 Subject: [oe-commits] [openembedded-core] 04/16: libassuan: multilib header for assuan.h In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.231A4232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 21043a168a2c68dd9a2f2f14f404b6f66fc05cf7 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:51 2020 -0800 libassuan: multilib header for assuan.h assuan.h is generated and can differ between mutlilibs. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libassuan/libassuan_2.5.3.bb b/meta/recipes-support/libassuan/libassuan_2.5.3.bb index 6fb3d2f..52b4c0f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.3.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.3.bb @@ -22,11 +22,15 @@ SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f7 BINCONFIG = "${bindir}/libassuan-config" -inherit autotools texinfo binconfig-disabled pkgconfig +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } +do_install_append () { + oe_multilib_header assuan.h +} + BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:33 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (3aa0d0f -> c9b5802) Message-ID: <158180655362.16647.15394303735989257512@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 3aa0d0f resulttool/resultutils: Fix unicode error handling new cfaaeed bind: add mulitlib_header for platform.h new 966a8d9 libxslt: multilib_header xsltconfig.h new 0373b0b libsndfile1: mutlilibize sndfile.h new 21043a1 libassuan: multilib header for assuan.h new c96c564 subversion: move pkgconfig files in to libdir new 2c7d825 x11perf: make x11perfcomp a mulitlib script new 1a1d7e9 tcf-agent: Mangle arch for armeb new e6ea95a image.bbclass, package-index.bb: Delete do_populate_lic task new 2c6a249 tclibc-baremetal: Include qemu on the SDK new 9521c66 tclibc-newlib: Include qemu on the SDK new c6b00b5 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk new 7c8b3a1 selftest: wic: Add APPEND to the optional variables list new 18981b8 wic: Honor APPEND new 7ed5632 icu: upgrade 64.2 -> 65.1 new eb36ff9 webkitgtk: Upgrade to 2.26.4 minor release new c9b5802 openssh: Upgrade 8.1p1 -> 8.2p1 The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/image.bbclass | 1 + meta/classes/image_types_wic.bbclass | 2 +- meta/conf/distro/include/tclibc-baremetal.inc | 2 +- meta/conf/distro/include/tclibc-newlib.inc | 2 +- meta/lib/oeqa/selftest/cases/wic.py | 3 +- meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +- ...lly-applied-upstream-fix-for-openssh-test.patch | 60 ---------------------- ...-seccomp-Allow-clock_gettime64-in-sandbox.patch | 31 ----------- .../openssh/openssh-8.1p1-seccomp-nanosleep.patch | 27 ---------- .../openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} | 7 +-- meta/recipes-core/meta/package-index.bb | 1 + .../subversion/subversion_1.13.0.bb | 2 + meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++ .../libsndfile/libsndfile1_1.0.28.bb | 6 ++- .../{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} | 5 +- meta/recipes-support/gnupg/gnupg_2.2.19.bb | 16 ++++-- .../icu/{icu_64.2.bb => icu_65.1.bb} | 4 +- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 ++- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 ++- scripts/lib/wic/ksparser.py | 5 ++ 21 files changed, 55 insertions(+), 141 deletions(-) delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch rename meta/recipes-connectivity/openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} (95%) rename meta/recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} (97%) rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:38 +0000 Subject: [oe-commits] [openembedded-core] 05/16: subversion: move pkgconfig files in to libdir In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.2D6CA232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c96c56476fe9025884c7ea96f15f41694a6908fe Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:52 2020 -0800 subversion: move pkgconfig files in to libdir All of the .pc files contain the path to ${libdir} which fails in a multilib rpm image. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/subversion/subversion_1.13.0.bb b/meta/recipes-devtools/subversion/subversion_1.13.0.bb index 9c1281a..6879f12 100644 --- a/meta/recipes-devtools/subversion/subversion_1.13.0.bb +++ b/meta/recipes-devtools/subversion/subversion_1.13.0.bb @@ -37,6 +37,8 @@ EXTRA_OECONF = " \ ac_cv_path_RUBY=none \ " +EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" + acpaths = "-I build/ -I build/ac-macros/" CPPFLAGS += "-P" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:39 +0000 Subject: [oe-commits] [openembedded-core] 06/16: x11perf: make x11perfcomp a mulitlib script In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.3848623282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c7d8251a56a73a94c1f868e33eeee197c5ffa57 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:42:53 2020 -0800 x11perf: make x11perfcomp a mulitlib script x11perfcomp encodes the library paths in the script. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb index 33c0c8a..c4d443b 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ PE = "1" +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/x11perfcomp" + do_install_append_class-target () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:40 +0000 Subject: [oe-commits] [openembedded-core] 07/16: tcf-agent: Mangle arch for armeb In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.408AA23282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1a1d7e94b2e3aaaaf2683123c406651ef590df96 Author: Jeremy A. Puhlman AuthorDate: Fri Feb 14 20:44:16 2020 -0800 tcf-agent: Mangle arch for armeb Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index e0a07a9..ed14fe6 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -29,7 +29,7 @@ INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." # mangling needed for make -MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64,`" +MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64, | sed s,armeb,arm,`" MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:41 +0000 Subject: [oe-commits] [openembedded-core] 08/16: image.bbclass, package-index.bb: Delete do_populate_lic task In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.4B3BE23282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e6ea95ae85763670aef35f7cb025eea693138d07 Author: Khem Raj AuthorDate: Fri Feb 14 15:29:01 2020 -0800 image.bbclass, package-index.bb: Delete do_populate_lic task These are meta packages Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 1 + meta/recipes-core/meta/package-index.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c282439..07aa1f1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -609,6 +609,7 @@ do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" +deltask do_populate_lic deltask do_populate_sysroot do_package[noexec] = "1" deltask do_package_qa diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index a4123b7..98c5bcb 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -12,6 +12,7 @@ deltask do_patch deltask do_configure deltask do_compile deltask do_install +deltask do_populate_lic deltask do_populate_sysroot do_package_index[nostamp] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:42 +0000 Subject: [oe-commits] [openembedded-core] 09/16: tclibc-baremetal: Include qemu on the SDK In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.545B5232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c6a249f3e1ad9c160f59d2d0b38749c85e7ff3a Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Feb 14 10:13:48 2020 -0800 tclibc-baremetal: Include qemu on the SDK Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the baremetal based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-baremetal.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/meta/conf/distro/include/tclibc-baremetal.inc index e04f8c8..31d132e 100644 --- a/meta/conf/distro/include/tclibc-baremetal.inc +++ b/meta/conf/distro/include/tclibc-baremetal.inc @@ -27,7 +27,7 @@ BASEDEPENDS_remove_class-target = "virtual/${TARGET_PREFIX}compilerlibs" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_TARGET_TASK ?= "libgcc-dev" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "virtual/${MLPREFIX}libc zlib ncurses" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:43 +0000 Subject: [oe-commits] [openembedded-core] 10/16: tclibc-newlib: Include qemu on the SDK In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.5D69C232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9521c66e0edb2b36c3d5c777ec7a7158b40452d4 Author: Alejandro Enedino Hernandez Samaniego AuthorDate: Fri Feb 14 10:13:49 2020 -0800 tclibc-newlib: Include qemu on the SDK Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the newlib based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-newlib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-newlib.inc b/meta/conf/distro/include/tclibc-newlib.inc index 8338003..bf89b11 100644 --- a/meta/conf/distro/include/tclibc-newlib.inc +++ b/meta/conf/distro/include/tclibc-newlib.inc @@ -38,7 +38,7 @@ BASE_DEFAULT_DEPS_append_class-target = " ${NEWLIB_EXTENDED}" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_TARGET_TASK ?= "${LIBC_DEPENDENCIES}" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "zlib ncurses" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:44 +0000 Subject: [oe-commits] [openembedded-core] 11/16: gnupg: Read GNUPG_BINDIR from environment variables for nativesdk In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.663B2232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c6b00b5594adec0a7d7a7f3617fb99b65ea8d9f1 Author: Robert Yang AuthorDate: Mon Jan 6 18:30:32 2020 +0800 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk There is already a relocate.patch for native which is used for reading GNUPG_BINDIR from environment variables, now also enable it for nativesdk. Otherwise, command like the following one doesn't work for nativesdk: $ gpg-connect-agent --homedir ../keys/ reloadagent /bye gpg-connect-agent: no running gpg-agent - starting '/opt/path/to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent' gpg-connect-agent: failed to start agent '/opt/path/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent': No such file or directory Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-support/gnupg/gnupg_2.2.19.bb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/gnupg/gnupg_2.2.19.bb b/meta/recipes-support/gnupg/gnupg_2.2.19.bb index 76c09ff..c07bff1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.19.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.19.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" +SRC_URI_append_class-nativesdk = " file://relocate.patch" SRC_URI[md5sum] = "cb3b373d08ba078c325299945a7f2818" SRC_URI[sha256sum] = "242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0" @@ -60,10 +61,17 @@ do_install_append() { } do_install_append_class-native() { - create_wrapper ${D}${bindir}/gpg2 GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpgconf GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpg-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} - create_wrapper ${D}${bindir}/gpg-connect-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} + create_wrappers ${STAGING_BINDIR_NATIVE} +} + +do_install_append_class-nativesdk() { + create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} +} + +create_wrappers() { + for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 + done } PACKAGECONFIG ??= "gnutls" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:45 +0000 Subject: [oe-commits] [openembedded-core] 12/16: selftest: wic: Add APPEND to the optional variables list In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.6F4AB232834@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7c8b3a1b920fd4cc1598357985eef0e5e0e0ac79 Author: Kevin Hao AuthorDate: Sat Feb 15 19:41:44 2020 +0800 selftest: wic: Add APPEND to the optional variables list The APPEND is an optional variable, so add it to the optional variables list to make the wic selftest happy. Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 46cd98b..626a217 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -537,7 +537,8 @@ class Wic2(WicTestCase): # filter out optional variables wicvars = wicvars.difference(('DEPLOY_DIR_IMAGE', 'IMAGE_BOOT_FILES', 'INITRD', 'INITRD_LIVE', 'ISODIR','INITRAMFS_IMAGE', - 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME')) + 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME', + 'APPEND')) with open(path) as envfile: content = dict(line.split("=", 1) for line in envfile) # test if variables used by wic present in the .env file -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:46 +0000 Subject: [oe-commits] [openembedded-core] 13/16: wic: Honor APPEND In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.78C89232835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 18981b8a457104391dfd94938c247eac04e4ed50 Author: Kevin Hao AuthorDate: Thu Feb 13 10:31:41 2020 +0800 wic: Honor APPEND APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106..b83308b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8..650b976 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:47 +0000 Subject: [oe-commits] [openembedded-core] 14/16: icu: upgrade 64.2 -> 65.1 In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.82D43232836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7ed56327bd87b97bcf81a78e5dd738a0c038e578 Author: Wang Mingyu AuthorDate: Fri Feb 14 15:44:27 2020 -0800 icu: upgrade 64.2 -> 65.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb similarity index 88% rename from meta/recipes-support/icu/icu_64.2.bb rename to meta/recipes-support/icu/icu_65.1.bb index 44caa43..bd932d7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_65.1.bb @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:48 +0000 Subject: [oe-commits] [openembedded-core] 15/16: webkitgtk: Upgrade to 2.26.4 minor release In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.8B4F3232837@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eb36ff94af8f8425a09ae4db150146d4e9e75b6b Author: Khem Raj AuthorDate: Sat Feb 15 07:43:58 2020 -0800 webkitgtk: Upgrade to 2.26.4 minor release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb similarity index 97% rename from meta/recipes-sato/webkit/webkitgtk_2.26.2.bb rename to meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a184d83..c7f0d5e 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -21,9 +21,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ " - -SRC_URI[md5sum] = "65e06fe73ee166447894aaea95038e3b" -SRC_URI[sha256sum] = "6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512" +SRC_URI[md5sum] = "60f881729f3b71244b7f6e58790073e0" +SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:42:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:42:49 +0000 Subject: [oe-commits] [openembedded-core] 16/16: openssh: Upgrade 8.1p1 -> 8.2p1 In-Reply-To: <158180655362.16647.15394303735989257512@git.openembedded.org> References: <158180655362.16647.15394303735989257512@git.openembedded.org> Message-ID: <20200215224234.9908923281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c9b5802bbe1de609450f509edf4721ab0a7a70aa Author: Alex Kiernan AuthorDate: Sat Feb 15 15:30:06 2020 +0000 openssh: Upgrade 8.1p1 -> 8.2p1 Drop backports from upstream: 0001-Manually-applied-upstream-fix-for-openssh-test.patch 0001-seccomp-Allow-clock_gettime64-in-sandbox.patch openssh-8.1p1-seccomp-nanosleep.patch Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...lly-applied-upstream-fix-for-openssh-test.patch | 60 ---------------------- ...-seccomp-Allow-clock_gettime64-in-sandbox.patch | 31 ----------- .../openssh/openssh-8.1p1-seccomp-nanosleep.patch | 27 ---------- .../openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} | 7 +-- 4 files changed, 2 insertions(+), 123 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch deleted file mode 100644 index 7171ec0..0000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001 -From: "Mingde (Matthew) Zeng" -Date: Wed, 15 Jan 2020 15:51:42 -0500 -Subject: [PATCH] Manually applied upstream fix for openssh test - -Upstream Status: Backport: - https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381 - -Signed-off-by: Mingde (Matthew) Zeng ---- - regress/cert-hostkey.sh | 4 ++-- - regress/cert-userkey.sh | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh -index 86ea6250..60e3ec02 100644 ---- a/regress/cert-hostkey.sh -+++ b/regress/cert-hostkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified host keys" -@@ -252,7 +252,7 @@ test_one() { - test_one "user-certificate" failure "-n $HOSTS" - test_one "empty principals" success "-h" - test_one "wrong principals" failure "-h -n foo" --test_one "cert not yet valid" failure "-h -V20200101:20300101" -+test_one "cert not yet valid" failure "-h -V20300101:20320101" - test_one "cert expired" failure "-h -V19800101:19900101" - test_one "cert valid interval" success "-h -V-1w:+2w" - test_one "cert has constraints" failure "-h -Oforce-command=false" -diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh -index 38c14a69..f0e30945 100644 ---- a/regress/cert-userkey.sh -+++ b/regress/cert-userkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified user keys" -@@ -338,7 +338,7 @@ test_one() { - test_one "correct principal" success "-n ${USER}" - test_one "host-certificate" failure "-n ${USER} -h" - test_one "wrong principals" failure "-n foo" --test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" -+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" - test_one "cert expired" failure "-n ${USER} -V19800101:19900101" - test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" - test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" -@@ -399,4 +399,3 @@ done - - rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key* - rm -f $OBJ/authorized_principals_$USER -- --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch b/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch deleted file mode 100644 index 78c493d..0000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eae3e85322fa7c869f5822db4eda6348f2beb09e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 7 Jan 2020 16:26:45 -0800 -Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. - -This helps sshd accept connections on mips platforms with -upcoming glibc ( 2.31 ) - -Upstream-Status: Accepted [https://github.com/openssh/openssh-portable/pull/161] -Signed-off-by: Khem Raj ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 3ef30c9..999c46c 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_clock_nanosleep_time64 - SC_ALLOW(__NR_clock_nanosleep_time64), - #endif -+#ifdef __NR_clock_gettime64 -+ SC_ALLOW(__NR_clock_gettime64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch b/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch deleted file mode 100644 index 7c9d61c..0000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7e929163ed40f9ce90060a3ca6df558c3d901379 -Author: Jakub Jelen -Date: Wed Nov 13 12:57:05 2019 +0100 - -seccomp: Allow clock_nanosleep() to make OpenSSH working with latest glibc -sandbox-seccomp: Allow clock_nanosleep on ARM - -Upstream-Status: Backport [https://github.com/tcely/openssh-portable/pull/258] - [https://github.com/bobby0809/openssh-portable/pull/138] - -Signed-off-by: Khem Raj References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.46D2F23281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 13e1363cdecd17fef89e2fea22fe8903ef04e68e Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:00 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (7d51b7c -> f192192) Message-ID: <158180658015.17413.9182330174545676686@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 7d51b7c openssh: Upgrade 8.1p1 -> 8.2p1 discard 9c3ee69 webkitgtk: Upgrade to 2.26.4 minor release discard ad39960 icu: upgrade 64.2 -> 65.1 discard 0ccb6ea wic: Honor APPEND discard 203dbbd selftest: wic: Add APPEND to the optional variables list discard ac498ae systemd: upgrade v244.1 -> v244.3 discard 5353962 meson.bbclass: Parameterise meson.cross discard 04de26d gnupg: Read GNUPG_BINDIR from environment variables for nativesdk discard 241b256 newlib: Move syscalls from newlib to libgloss discard 702b777 tclibc-newlib: Include qemu on the SDK discard c642590 tclibc-baremetal: Include qemu on the SDK discard 6bac384 image.bbclass, package-index.bb: Delete do_populate_lic task discard bab33cb tcf-agent: Mangle arch for armeb discard 72c74c0 x11perf: make x11perfcomp a mulitlib script discard 53d7e2a subversion: move pkgconfig files in to libdir discard d07dd1e libassuan: multilib header for assuan.h discard e581874 libsndfile1: mutlilibize sndfile.h discard 3578ae2 libxslt: multilib_header xsltconfig.h discard 80a7ce0 bind: add mulitlib_header for platform.h discard 69c97a1 HACK: extra debug discard 6df479a rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 39bba0c sstatesig: Log timestamps for hashequiv in reprodubile builds discard bee8e4d HACK: signing: Add extra test debug discard 667beb9 glew/curl: specify exclusive package configs discard 2874341 base.bbclass: extend PACKAGECONFIG for conflict package configs discard a5e10ce oescripts.py: use unittest.SkipUnless for class skip add cfaaeed bind: add mulitlib_header for platform.h add 966a8d9 libxslt: multilib_header xsltconfig.h add 0373b0b libsndfile1: mutlilibize sndfile.h add 21043a1 libassuan: multilib header for assuan.h add c96c564 subversion: move pkgconfig files in to libdir add 2c7d825 x11perf: make x11perfcomp a mulitlib script add 1a1d7e9 tcf-agent: Mangle arch for armeb add e6ea95a image.bbclass, package-index.bb: Delete do_populate_lic task add 2c6a249 tclibc-baremetal: Include qemu on the SDK add 9521c66 tclibc-newlib: Include qemu on the SDK add c6b00b5 gnupg: Read GNUPG_BINDIR from environment variables for nativesdk add 7c8b3a1 selftest: wic: Add APPEND to the optional variables list add 18981b8 wic: Honor APPEND add 7ed5632 icu: upgrade 64.2 -> 65.1 add eb36ff9 webkitgtk: Upgrade to 2.26.4 minor release add c9b5802 openssh: Upgrade 8.1p1 -> 8.2p1 new 13e1363 oescripts.py: use unittest.SkipUnless for class skip new 5414e25 base.bbclass: extend PACKAGECONFIG for conflict package configs new 59e9c52 glew/curl: specify exclusive package configs new a112eb6 HACK: signing: Add extra test debug new 59328e8 sstatesig: Log timestamps for hashequiv in reprodubile builds new 7a9fa16 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 1a4872c HACK: extra debug new e133b7f newlib: Move syscalls from newlib to libgloss new ca28f8d meson.bbclass: Parameterise meson.cross new f192192 systemd: upgrade v244.1 -> v244.3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7d51b7c) \ N -- N -- N refs/heads/master-next (f192192) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:04 +0000 Subject: [oe-commits] [openembedded-core] 04/10: HACK: signing: Add extra test debug In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.6325D232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a112eb667d163f9eea5ded69e4df4980e7f5e640 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:02 +0000 Subject: [oe-commits] [openembedded-core] 02/10: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.5022A23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5414e256e723fcfd017e9310dc43ad7b7ae59ce1 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:03 +0000 Subject: [oe-commits] [openembedded-core] 03/10: glew/curl: specify exclusive package configs In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.591FC232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59e9c52807aaa0832d4fcb7a326e3d7635f4da84 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:05 +0000 Subject: [oe-commits] [openembedded-core] 05/10: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.6C88823282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59328e809217229ae1d4be1015cc53ff412b01ae Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:07 +0000 Subject: [oe-commits] [openembedded-core] 07/10: HACK: extra debug In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.7F58923282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1a4872c94e63e321d0470a21b603213fb95b0d1a Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:08 +0000 Subject: [oe-commits] [openembedded-core] 08/10: newlib: Move syscalls from newlib to libgloss In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.8B321232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e133b7f015eb2ee7bed685564ba35f1722f89766 Author: Mark Hatle AuthorDate: Fri Feb 14 12:34:14 2020 -0600 newlib: Move syscalls from newlib to libgloss By passing --disabled-newlib-supplied-syscalls, newlib will disable the generation of builtin syscalls and move this to libgloss. (This also affects the generation of crt0.o.) libgloss SHOULD then provide the syscalls, crt0.o and other functions that are no longer part of newlib itself. This now means that you must link with both newlib and libgloss, whereas before newlib would run in many configurations by itself. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index d7ac8bf..5edea8a 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -42,6 +42,7 @@ EXTRA_OECONF = " \ --with-gnu-as \ --with-gnu-ld \ --disable-multilib \ + --disable-newlib-supplied-syscalls \ " do_configure[cleandirs] = "${B}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:06 +0000 Subject: [oe-commits] [openembedded-core] 06/10: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.7520823282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a9fa1683ce4205f98cf5029412351209be3d4ae Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:10 +0000 Subject: [oe-commits] [openembedded-core] 10/10: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.A17CC232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f1921921aa0a955cc61b264348e84cac9fde276d Author: Alex Kiernan AuthorDate: Sat Feb 15 09:44:49 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use MESON_CROSS_... configuration instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 19 ++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 7 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..a77f6fb 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,20 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +EFI_LDFLAGS = "${@ " ".join(d.getVar('LD').split()[1:])} ${LDFLAGS}" +MESON_CROSS_BINARIES_append = " efi_cc:CC objcopy:OBJCOPY" +MESON_CROSS_PROPERTIES_remove = "c_link_args:LDFLAGS" +MESON_CROSS_PROPERTIES_append = " c_link_args:EFI_LDFLAGS" + EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \ -Defi-includedir=${STAGING_INCDIR}/efi \ - -Defi-ldsdir=${STAGING_LIBDIR} \ -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-ld=${@ d.getVar('LD').split()[0]} \ -Dman=false \ - -Defi-cc='${EFI_CC}' \ - -Defi-ld='${LD}' \ - -Defi-objcopy='${OBJCOPY}' \ " # install to the image as boot*.efi if its the EFI_PROVIDER, diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96..e73b397 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch deleted file mode 100644 index e2e19ba..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 15 22:43:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 15 Feb 2020 22:43:09 +0000 Subject: [oe-commits] [openembedded-core] 09/10: meson.bbclass: Parameterise meson.cross In-Reply-To: <158180658015.17413.9182330174545676686@git.openembedded.org> References: <158180658015.17413.9182330174545676686@git.openembedded.org> Message-ID: <20200215224300.9438C232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ca28f8dc26f2641f22815c9447883fb6686d460b Author: Alex Kiernan AuthorDate: Sat Feb 15 09:44:48 2020 +0000 meson.bbclass: Parameterise meson.cross Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated list of meson properties which are exported into meson.cross. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 161 ++++++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 06034e8..e778e37 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -34,88 +34,99 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -def meson_array(var, d): - items = d.getVar(var).split() - return repr(items[0] if len(items) == 1 else items) - -# Map our ARCH values to what Meson expects: -# http://mesonbuild.com/Reference-tables.html#cpu-families -def meson_cpu_family(var, d): - import re - arch = d.getVar(var) - if arch == 'powerpc': - return 'ppc' - elif arch == 'powerpc64' or arch == 'powerpc64le': - return 'ppc64' - elif arch == 'armeb': - return 'arm' - elif arch == 'aarch64_be': - return 'aarch64' - elif arch == 'mipsel': - return 'mips' - elif arch == 'mips64el': - return 'mips64' - elif re.match(r"i[3-6]86", arch): - return "x86" - elif arch == "microblazeel": - return "microblaze" - else: - return arch - -# Map our OS values to what Meson expects: -# https://mesonbuild.com/Reference-tables.html#operating-system-names -def meson_operating_system(var, d): - os = d.getVar(var) - if "mingw" in os: - return "windows" - else: - return os - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) +MESON_CROSS_BINARIES ??= "c:CC \ + cpp:CXX \ + ar:AR \ + nm:NM \ + strip:STRIP \ + readelf:READELF" + +MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \ + c_link_args:LDFLAGS \ + cpp_args:CXXFLAGS \ + cpp_link_args:LDFLAGS" addtask write_config before do_configure -do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross < f23f2b9) Message-ID: <158188605172.19097.12635763434944369724@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from c13246e zabbix: upgrade 4.4.1 -> 4.4.5 add 650cbab libconfig,libfile,libtest: Do not inherit allarch add 41f5abd meta-oe: Remove dnf dependent package for non-rpm package backend add dd7b78c libteam: Upgrade to 1.30 add addc04e mcelog: Upgrade to 168 add 4f61c89 python3-cffi: upgrade 1.13.2 -> 1.14.0 add 1f27638 python3-configparser: upgrade 3.8.1 -> 4.0.2 add 662f7b7 python3-pytest: upgrade 5.3.2 -> 5.3.5 add ec2c3d3 abseil-cpp: add recipe for git version add 0b7e50f iozone3: Upgrade to 489 add 115144f python3-grpcio: Upgrade to 1.27.1 add fe35221 samba: upgrade 4.10.11 -> 4.10.13 add 92f7fdc libmimetic: Library to aid multi-part form data parsing add 74b3646 packagegroup-meta-oe: Remove python2 packages from packagegroup-meta-oe-devtools add f3f8add ipmitool: fix CVE-2020-5208 add 69c0e0d libiio: upgrade 0.18 -> 0.19 add ba3e922 ntfs-3g-ntfsprogs: Make it support usrmerge properly add 59ceb3f cryptsetup: upgrade 2.2.2 -> 2.3.0 add 58d4365 hwdata: upgrade 0.331 -> 0.332 add 4dbe12d libdbi-perl: upgrade 1.642 -> 1.643 add 4990f80 libp11: upgrade 0.4.10 -> 11 add 6b2ad45 python3-bcrypt: consolidate inc and bb files into a single bb file add 747b6bd python-beautifulsoup4: consolidate inc and bb files into a single bb file add 48c61df python3-behave: consolidate inc and bb files into a single bb file add 116dc4f pcimem: add initial version 2.0 add 587a2ba python3-blinker: consolidate inc and bb files into a single bb file add abc2a85 python3-booleanpy: consolidate inc and bb files into a single bb file add 82eafcc spidev-test: Add initial version of recipe add 401bd65 python3-cachetools: consolidate inc and bb files into a single bb file add d3fdee8 python3-can: consolidate inc and bb files into a single bb file add e2e028c python3-cassandra-driver: consolidate inc and bb files into a single bb file add 1dbe0e2 python3-certifi: consolidate inc and bb files into a single bb file add c3d10cd python3-chardet: consolidate inc and bb files into a single bb file add d5df1fe python3-click: consolidate inc and bb files into a single bb file add 90ca842 python3-cmd2: consolidate inc and bb files into a single bb file add bbe7eb6 python3-cffi: consolidate inc and bb files into a single bb file add d4b54a9 pytest-timeout: New package add 701290f pytest-metadata: Add new package add d3dd0a5 pytest-html: Add new package add 16fd296 phoronix-test-suite: add missing mime and mime-xdg inherit add 25e8539 libmimetic: Fix ordrered comparision between pointer and zero add a939ec7 x265: add x265 recipe add 2b13589 python3-et-xmlfile: add initial recipe version 1.0.1 add 554e52a python3-jdcal: add initial recipe version 1.4.1 add 693ab66 python3-openpyxl: Add initial version 2.6.3 add 3dcfe32 mpv: Fix build with python3 add 056dbf5 python-pytest: Fix typo in SUMMARY add 51c6ea0 nmap: make ndiff support python3 add f23f2b9 lirc: build and deploy with python3 No new revisions were added by this update. Summary of changes: .../files/0001-Make-build-support-usrmerge.patch | 43 - .../ntfs-3g-ntfsprogs_2017.3.23.bb | 15 +- .../samba/{samba_4.10.11.bb => samba_4.10.13.bb} | 4 +- .../iozone3/{iozone3_488.bb => iozone3_489.bb} | 4 +- .../phoronix-test-suite_9.2.1.bb | 2 +- meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb | 10 +- .../packagegroups/packagegroup-meta-oe.bb | 6 +- .../{cryptsetup_2.2.2.bb => cryptsetup_2.3.0.bb} | 4 +- ...Remove-maes-option-from-cross-compilation.patch | 53 + ...gotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch | 35 + .../abseil-cpp/0003-Add-fPIC-option.patch | 27 + .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 52 + .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 1 + meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | 17 + .../{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} | 4 +- .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 3 + ...1-fru-Fix-buffer-overflow-vulnerabilities.patch | 133 ++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 1 + meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 29 + .../recipes-multimedia/mplayer/mpv/python3.patch | 12 - meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 15 +- .../files/0001-Make-ndiff-support-python3.patch | 1720 ++++++++++++++++++++ ...configure.ac-make-ndiff-depend-on-python3.patch | 48 + meta-oe/recipes-security/nmap/nmap_7.80.bb | 12 +- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- meta-oe/recipes-support/libiio/libiio_git.bb | 5 +- ...Removing-test-directory-from-the-Makefile.patch | 67 + ...ic-Check-for-MMAP_FAILED-return-from-mmap.patch | 49 + .../recipes-support/libmimetic/libmimetic_0.9.8.bb | 22 + .../libp11/{libp11_0.4.10.bb => libp11_11.bb} | 2 +- .../libteam/{libteam_1.29.bb => libteam_1.30.bb} | 2 +- .../mcelog/{mcelog_166.bb => mcelog_168.bb} | 2 +- .../recipes-multimedia/x265/x265_3.2.1.bb | 22 + .../libconfig/libconfig-autoconf-perl_0.318.bb | 2 +- .../libfile/libfile-slurper-perl_0.012.bb | 2 +- .../libtest/libtest-warnings-perl_0.028.bb | 2 +- .../recipes-devtools/python/python-bcrypt.inc | 17 - .../python/python-beautifulsoup4.inc | 17 - .../recipes-devtools/python/python-behave.inc | 15 - .../recipes-devtools/python/python-blinker.inc | 7 - .../recipes-devtools/python/python-booleanpy.inc | 14 - .../recipes-devtools/python/python-cachetools.inc | 16 - meta-python/recipes-devtools/python/python-can.inc | 18 - .../python/python-cassandra-driver.inc | 33 - .../recipes-devtools/python/python-certifi.inc | 13 - .../recipes-devtools/python/python-chardet.inc | 23 - .../recipes-devtools/python/python-click.inc | 25 - .../recipes-devtools/python/python-cmd2.inc | 13 - .../python/python-configparser.inc | 7 +- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 40 - .../python/python-grpcio/gettid.patch | 26 - .../recipes-devtools/python/python-pytest.inc | 8 +- .../python/python3-bcrypt_3.1.7.bb | 19 +- .../python/python3-beautifulsoup4_4.8.2.bb | 19 +- .../python/python3-behave_1.2.6.bb | 17 +- .../recipes-devtools/python/python3-blinker_1.4.bb | 8 +- .../python/python3-booleanpy_3.7.bb | 16 +- .../python/python3-cachetools_4.0.0.bb | 18 +- .../recipes-devtools/python/python3-can_3.3.2.bb | 17 +- .../python/python3-cassandra-driver_3.14.0.bb | 35 +- .../python/python3-certifi_2019.11.28.bb | 15 +- .../recipes-devtools/python/python3-cffi_1.13.2.bb | 2 - .../{python-cffi.inc => python3-cffi_1.14.0.bb} | 6 +- .../python/python3-chardet_3.0.4.bb | 29 +- .../recipes-devtools/python/python3-click_7.0.bb | 26 +- .../recipes-devtools/python/python3-cmd2_0.9.23.bb | 20 +- ...rser_3.8.1.bb => python3-configparser_4.0.2.bb} | 0 .../python/python3-et-xmlfile_1.0.1.bb | 20 + ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 64 + .../ppc-boringssl-support.patch | 2 +- .../riscv64_support.patch | 2 +- .../python/python3-grpcio_1.19.0.bb | 2 - ...{python-grpcio.inc => python3-grpcio_1.27.1.bb} | 16 +- .../recipes-devtools/python/python3-jdcal_1.4.1.bb | 15 + .../python/python3-openpyxl_2.6.3.bb | 15 + .../python/python3-pytest-html_1.6.bb | 19 + .../python/python3-pytest-metadata_1.8.0.bb | 15 + .../python/python3-pytest-timeout_1.3.4.bb | 13 + ...on3-pytest_5.3.2.bb => python3-pytest_5.3.5.bb} | 0 79 files changed, 2727 insertions(+), 426 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch rename meta-networking/recipes-connectivity/samba/{samba_4.10.11.bb => samba_4.10.13.bb} (98%) rename meta-oe/recipes-benchmark/iozone3/{iozone3_488.bb => iozone3_489.bb} (97%) rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.2.2.bb => cryptsetup_2.3.0.bb} (96%) create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb create mode 100644 meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb rename meta-oe/recipes-devtools/perl/{libdbi-perl_1.642.bb => libdbi-perl_1.643.bb} (92%) create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-vulnerabilities.patch create mode 100644 meta-oe/recipes-kernel/spidev-test/spidev-test.bb delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/python3.patch create mode 100644 meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch create mode 100644 meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch create mode 100644 meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb rename meta-oe/recipes-support/libp11/{libp11_0.4.10.bb => libp11_11.bb} (93%) rename meta-oe/recipes-support/libteam/{libteam_1.29.bb => libteam_1.30.bb} (95%) rename meta-oe/recipes-support/mcelog/{mcelog_166.bb => mcelog_168.bb} (95%) create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb delete mode 100644 meta-python/recipes-devtools/python/python-bcrypt.inc delete mode 100644 meta-python/recipes-devtools/python/python-beautifulsoup4.inc delete mode 100644 meta-python/recipes-devtools/python/python-behave.inc delete mode 100644 meta-python/recipes-devtools/python/python-blinker.inc delete mode 100644 meta-python/recipes-devtools/python/python-booleanpy.inc delete mode 100644 meta-python/recipes-devtools/python/python-cachetools.inc delete mode 100644 meta-python/recipes-devtools/python/python-can.inc delete mode 100644 meta-python/recipes-devtools/python/python-cassandra-driver.inc delete mode 100644 meta-python/recipes-devtools/python/python-certifi.inc delete mode 100644 meta-python/recipes-devtools/python/python-chardet.inc delete mode 100644 meta-python/recipes-devtools/python/python-click.inc delete mode 100644 meta-python/recipes-devtools/python/python-cmd2.inc delete mode 100644 meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch delete mode 100644 meta-python/recipes-devtools/python/python-grpcio/gettid.patch delete mode 100644 meta-python/recipes-devtools/python/python3-cffi_1.13.2.bb rename meta-python/recipes-devtools/python/{python-cffi.inc => python3-cffi_1.14.0.bb} (71%) rename meta-python/recipes-devtools/python/{python3-configparser_3.8.1.bb => python3-configparser_4.0.2.bb} (100%) create mode 100644 meta-python/recipes-devtools/python/python3-et-xmlfile_1.0.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch rename meta-python/recipes-devtools/python/{python-grpcio => python3-grpcio}/ppc-boringssl-support.patch (94%) rename meta-python/recipes-devtools/python/{python-grpcio => python3-grpcio}/riscv64_support.patch (93%) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb rename meta-python/recipes-devtools/python/{python-grpcio.inc => python3-grpcio_1.27.1.bb} (67%) create mode 100644 meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-openpyxl_2.6.3.bb create mode 100644 meta-python/recipes-devtools/python/python3-pytest-html_1.6.bb create mode 100644 meta-python/recipes-devtools/python/python3-pytest-metadata_1.8.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb rename meta-python/recipes-devtools/python/{python3-pytest_5.3.2.bb => python3-pytest_5.3.5.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:25 +0000 Subject: [oe-commits] [meta-openembedded] 01/18: vpnc: splitout the vpnc-script into its own package In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205224.D20DD23281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 546b7900f6694a7df4d6d33c798da91d621ef393 Author: Max Krummenacher AuthorDate: Sat Feb 15 16:59:33 2020 +0100 vpnc: splitout the vpnc-script into its own package The vpnc-script can be used unchanged with the openconnect package. Provide it in its own package and make vpnc RDEPEND on it. Signed-off-by: Max Krummenacher Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index ea21799..54e855a 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -28,6 +28,8 @@ PACKAGECONFIG ?= "gnutls" PACKAGECONFIG[gnutls] = ",,gnutls" PACKAGECONFIG[openssl] = ",,openssl" +PACKAGES =+ "${PN}-script" + S = "${WORKDIR}/git" inherit perlnative pkgconfig @@ -54,6 +56,8 @@ vpnc_sysroot_preprocess () { install -m 755 ${D}${sysconfdir}/vpnc/vpnc-script ${SYSROOT_DESTDIR}${sysconfdir}/vpnc } +FILES_${PN}-script = "${sysconfdir}/vpnc/vpnc-script" + CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" -RDEPENDS_${PN} = "perl-module-io-file" +RDEPENDS_${PN} = "perl-module-io-file ${PN}-script" RRECOMMENDS_${PN} = "kernel-module-tun" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:27 +0000 Subject: [oe-commits] [meta-openembedded] 03/18: openconnect: use target path to script In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205224.E3156232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2f21a8ce5fdeaf0d8c9c0ae7d2be880be73fc003 Author: Max Krummenacher AuthorDate: Sat Feb 15 16:59:35 2020 +0100 openconnect: use target path to script openconnect puts the default absolute path to the vpnc-script into its binary from the --with-vpnc-script configure options. So do not prepend the value with the path to the OE sysroot. RDEPEND on vpnc-script to have the script from vpnc installed on target. Signed-off-by: Max Krummenacher Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb index 974ff45..597c192 100644 --- a/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb @@ -9,7 +9,7 @@ SRC_URI = " \ SRCREV = "ea73851969ae7a6ea54fdd2d2b8c94776af24b2a" DEPENDS = "vpnc libxml2 krb5 gettext-native" -RDEPENDS_${PN} = "bash python3-core" +RDEPENDS_${PN} = "bash python3-core vpnc-script" PACKAGECONFIG ??= "gnutls lz4 libproxy" @@ -25,5 +25,5 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF += "--with-vpnc-script=${SYSROOT_DESTDIR}${sysconfdir}/vpnc/vpnc-script \ +EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ --disable-static" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:28 +0000 Subject: [oe-commits] [meta-openembedded] 04/18: python3-coloredlogs: consolidate inc and bb files into a single bb file In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205224.EF20C232826@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fb58592c7042d7e2164d0c1da35793d17f85c008 Author: Derek Straka AuthorDate: Sat Feb 15 12:29:24 2020 -0500 python3-coloredlogs: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-coloredlogs.inc | 24 -------------------- .../python/python3-coloredlogs_10.0.bb | 26 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-coloredlogs.inc b/meta-python/recipes-devtools/python/python-coloredlogs.inc deleted file mode 100644 index bdb1d75..0000000 --- a/meta-python/recipes-devtools/python/python-coloredlogs.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Colored terminal output for Python's logging module" -HOMEPAGE = "https://coloredlogs.readthedocs.io" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=690da298a43805797a4fa7bbe180b3c6" - -SRC_URI[md5sum] = "0a186966a1955fff8cf9489373e691d9" -SRC_URI[sha256sum] = "b869a2dda3fa88154b9dd850e27828d8755bfab5a838a1c97fbc850c6e377c36" - -inherit pypi - -do_compile_prepend() { - sed -ie "s/find_pth_directory(),/'',/g" ${S}/setup.py -} - -do_install_append() { - rm -rf ${D}${datadir} -} - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-humanfriendly \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-coloredlogs_10.0.bb b/meta-python/recipes-devtools/python/python3-coloredlogs_10.0.bb index 3872399..88fac87 100644 --- a/meta-python/recipes-devtools/python/python3-coloredlogs_10.0.bb +++ b/meta-python/recipes-devtools/python/python3-coloredlogs_10.0.bb @@ -1,2 +1,24 @@ -inherit setuptools3 -require python-coloredlogs.inc +DESCRIPTION = "Colored terminal output for Python's logging module" +HOMEPAGE = "https://coloredlogs.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=690da298a43805797a4fa7bbe180b3c6" + +SRC_URI[md5sum] = "0a186966a1955fff8cf9489373e691d9" +SRC_URI[sha256sum] = "b869a2dda3fa88154b9dd850e27828d8755bfab5a838a1c97fbc850c6e377c36" + +inherit pypi setuptools3 + +do_compile_prepend() { + sed -ie "s/find_pth_directory(),/'',/g" ${S}/setup.py +} + +do_install_append() { + rm -rf ${D}${datadir} +} + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-humanfriendly \ +" + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:24 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (f23f2b9 -> 3dbcc5d) Message-ID: <158188634447.20868.10851061781587160031@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from f23f2b9 lirc: build and deploy with python3 new 546b790 vpnc: splitout the vpnc-script into its own package new c24a061 openconnect: build with python3 new 2f21a8c openconnect: use target path to script new fb58592 python3-coloredlogs: consolidate inc and bb files into a single bb file new a14a615 python3-configargparse: consolidate inc and bb files into a single bb file new 97c41dc python3-configparser: consolidate inc and bb files into a single bb file new 2dd0260 python3-constantly: consolidate inc and bb files into a single bb file new 9f709be python3-contextlib2: consolidate inc and bb files into a single bb file new 1544ca4 python3-crcmod: consolidate inc and bb files into a single bb file new d00808b python3-ansi2html: add new package new 1eb621f python3-colorlog: add new package new 7012edb sigrok-cli: Inherit mime-xdg new e9a2438 libsigrok: inherit mime new ea5c076 joe: Inherit mime-xdg new 815c6ac remmina: Inherit mime-xdg new 64fa3d8 sysprof: Inherit mime and mime-xdg new 2052442 gtkwave: Inherit mime and mime-xdg new 3dbcc5d gimp: Depend on libexecinfo for musl The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 1 + .../recipes-kernel/sysprof/sysprof_3.34.1.bb | 4 +- ...rojans-tncc-wrapper.py-convert-to-python3.patch | 71 ++++++++++++++++++++++ .../openconnect/openconnect_8.03.bb | 14 ++--- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 6 +- meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb | 2 +- .../recipes-extended/sigrok/sigrok-cli_0.7.1.bb | 2 +- .../recipes-graphics/gtkwave/gtkwave_3.3.103.bb | 6 +- meta-oe/recipes-support/joe/joe_4.6.bb | 2 +- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 2 +- .../recipes-devtools/python/python-coloredlogs.inc | 24 -------- .../python/python-configargparse.inc | 22 ------- .../python/python-configparser.inc | 14 ----- .../recipes-devtools/python/python-constantly.inc | 11 ---- .../recipes-devtools/python/python-contextlib2.inc | 10 --- .../recipes-devtools/python/python-crcmod.inc | 14 ----- .../python/python3-ansi2html_1.5.2.bb | 13 ++++ .../python/python3-coloredlogs_10.0.bb | 26 +++++++- .../python/python3-colorlog_4.1.0.bb | 11 ++++ .../python/python3-configargparse_0.15.1.bb | 23 ++++++- .../python/python3-configparser_4.0.2.bb | 16 ++++- .../python/python3-constantly_15.1.0.bb | 13 +++- .../python/python3-contextlib2_0.6.0.bb | 11 +++- .../recipes-devtools/python/python3-crcmod_1.7.bb | 16 ++++- 24 files changed, 210 insertions(+), 124 deletions(-) create mode 100644 meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch delete mode 100644 meta-python/recipes-devtools/python/python-coloredlogs.inc delete mode 100644 meta-python/recipes-devtools/python/python-configargparse.inc delete mode 100644 meta-python/recipes-devtools/python/python-configparser.inc delete mode 100644 meta-python/recipes-devtools/python/python-constantly.inc delete mode 100644 meta-python/recipes-devtools/python/python-contextlib2.inc delete mode 100644 meta-python/recipes-devtools/python/python-crcmod.inc create mode 100644 meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:26 +0000 Subject: [oe-commits] [meta-openembedded] 02/18: openconnect: build with python3 In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205224.DA50D23281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c24a06107d739d2496779951eeaca54f2ba9fe68 Author: Max Krummenacher AuthorDate: Sat Feb 15 16:59:34 2020 +0100 openconnect: build with python3 Signed-off-by: Max Krummenacher Signed-off-by: Khem Raj --- ...rojans-tncc-wrapper.py-convert-to-python3.patch | 71 ++++++++++++++++++++++ .../openconnect/openconnect_8.03.bb | 12 ++-- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch b/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch new file mode 100644 index 0000000..623ec10 --- /dev/null +++ b/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch @@ -0,0 +1,71 @@ +From de78bcac5e1fd13de0371c8e14b062b8786ade56 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Sun, 2 Feb 2020 15:53:05 +0000 +Subject: [PATCH] trojans/tncc-wrapper.py: convert to python3 + +Use 2to3 to convert the script to python3. + +Upstream-Status: Pending + +Signed-off-by: Max Krummenacher +--- + trojans/tncc-wrapper.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/trojans/tncc-wrapper.py b/trojans/tncc-wrapper.py +index 0d4587bf..1a9a1f4d 100755 +--- a/trojans/tncc-wrapper.py ++++ b/trojans/tncc-wrapper.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2 ++#!/usr/bin/python3 + + # Lifted from Russ Dill's juniper-vpn-wrap.py, thus: + # +@@ -18,19 +18,19 @@ + + import subprocess + import mechanize +-import cookielib ++import http.cookiejar + import getpass + import sys + import os + import zipfile +-import urllib ++import urllib.request, urllib.parse, urllib.error + import socket + import ssl + import errno + import argparse + import atexit + import signal +-import ConfigParser ++import configparser + import time + import binascii + import hmac +@@ -39,7 +39,7 @@ import hashlib + def mkdir_p(path): + try: + os.mkdir(path) +- except OSError, exc: ++ except OSError as exc: + if exc.errno == errno.EEXIST and os.path.isdir(path): + pass + else: +@@ -64,9 +64,9 @@ class Tncc: + if zipfile.ZipFile(self.tncc_jar, 'r').testzip() is not None: + raise Exception() + except: +- print 'Downloading tncc.jar...' ++ print('Downloading tncc.jar...') + mkdir_p(os.path.expanduser('~/.juniper_networks')) +- urllib.urlretrieve('https://' + self.vpn_host ++ urllib.request.urlretrieve('https://' + self.vpn_host + + '/dana-cached/hc/tncc.jar', self.tncc_jar) + + with zipfile.ZipFile(self.tncc_jar, 'r') as jar: +-- +2.20.1 + diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb index ec36a37..974ff45 100644 --- a/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb @@ -2,11 +2,14 @@ SUMMARY = "Open client for Cisco AnyConnect VPN" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" -SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git" +SRC_URI = " \ + git://git.infradead.org/users/dwmw2/openconnect.git \ + file://0001-trojans-tncc-wrapper.py-convert-to-python3.patch \ +" SRCREV = "ea73851969ae7a6ea54fdd2d2b8c94776af24b2a" DEPENDS = "vpnc libxml2 krb5 gettext-native" -RDEPENDS_${PN} = "bash python" +RDEPENDS_${PN} = "bash python3-core" PACKAGECONFIG ??= "gnutls lz4 libproxy" @@ -24,8 +27,3 @@ inherit autotools pkgconfig EXTRA_OECONF += "--with-vpnc-script=${SYSROOT_DESTDIR}${sysconfdir}/vpnc/vpnc-script \ --disable-static" - -do_configure_append() { - # script has /usr/bin/python2 path hardcoded - sed -i -e 's=python2\.*=python=g' ${S}/trojans/tncc-wrapper.py -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:30 +0000 Subject: [oe-commits] [meta-openembedded] 06/18: python3-configparser: consolidate inc and bb files into a single bb file In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.0E88C23282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 97c41dcd671efb1497a0128a886ad949b4ceb58d Author: Derek Straka AuthorDate: Sat Feb 15 12:38:48 2020 -0500 python3-configparser: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-configparser.inc | 14 -------------- .../python/python3-configparser_4.0.2.bb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-configparser.inc b/meta-python/recipes-devtools/python/python-configparser.inc deleted file mode 100644 index bce7cee..0000000 --- a/meta-python/recipes-devtools/python/python-configparser.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "This module provides the ConfigParser class which implements a basic configuration language which provides a structure similar to what's found in Microsoft Windows INI files." -SECTION = "devel/python" -HOMEPAGE = "https://docs.python.org/3/library/configparser.html" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=23f9ad5cad3d8cc0336e2a5d8a87e1fa" - -SRC_URI[md5sum] = "35926cc4b9133f1f9ca70a1fd2fdf237" -SRC_URI[sha256sum] = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -inherit pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb b/meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb index 770cba5..1966609 100644 --- a/meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb @@ -1,2 +1,14 @@ -inherit setuptools3 -require python-configparser.inc +SUMMARY = "This module provides the ConfigParser class which implements a basic configuration language which provides a structure similar to what's found in Microsoft Windows INI files." +SECTION = "devel/python" +HOMEPAGE = "https://docs.python.org/3/library/configparser.html" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=23f9ad5cad3d8cc0336e2a5d8a87e1fa" + +SRC_URI[md5sum] = "35926cc4b9133f1f9ca70a1fd2fdf237" +SRC_URI[sha256sum] = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:29 +0000 Subject: [oe-commits] [meta-openembedded] 05/18: python3-configargparse: consolidate inc and bb files into a single bb file In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.050B523282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a14a6159f7a7d3d8301bfa320e4c0fd9b1587e34 Author: Derek Straka AuthorDate: Sat Feb 15 12:35:54 2020 -0500 python3-configargparse: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../python/python-configargparse.inc | 22 --------------------- .../python/python3-configargparse_0.15.1.bb | 23 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-configargparse.inc b/meta-python/recipes-devtools/python/python-configargparse.inc deleted file mode 100644 index 17d296f..0000000 --- a/meta-python/recipes-devtools/python/python-configargparse.inc +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A drop-in replacement for argparse that allows options to also be set via config files and/or environment variables." -HOMEPAGE = "https://github.com/bw2/ConfigArgParse" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" - -SRC_URI[md5sum] = "aba15b7973b7a70bea86fd69289f8fe3" -SRC_URI[sha256sum] = "baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac" - -PYPI_PACKAGE = "ConfigArgParse" - -inherit pypi - -PACKAGECONFIG ?= "yaml" -PACKAGECONFIG[yaml] = ",,,${PYTHON_PN}-pyyaml" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb b/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb index 698eccf..0797898 100644 --- a/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb +++ b/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb @@ -1,3 +1,22 @@ -inherit setuptools3 -require python-configargparse.inc +SUMMARY = "A drop-in replacement for argparse that allows options to also be set via config files and/or environment variables." +HOMEPAGE = "https://github.com/bw2/ConfigArgParse" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" + +SRC_URI[md5sum] = "aba15b7973b7a70bea86fd69289f8fe3" +SRC_URI[sha256sum] = "baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac" + +PYPI_PACKAGE = "ConfigArgParse" + +inherit pypi setuptools3 + +PACKAGECONFIG ?= "yaml" +PACKAGECONFIG[yaml] = ",,,${PYTHON_PN}-pyyaml" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:31 +0000 Subject: [oe-commits] [meta-openembedded] 07/18: python3-constantly: consolidate inc and bb files into a single bb file In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.183D423282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2dd02608735cf61e78cee97aa63bc80417d1652e Author: Derek Straka AuthorDate: Sat Feb 15 12:43:10 2020 -0500 python3-constantly: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-constantly.inc | 11 ----------- .../recipes-devtools/python/python3-constantly_15.1.0.bb | 13 +++++++++++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-constantly.inc b/meta-python/recipes-devtools/python/python-constantly.inc deleted file mode 100644 index 8153504..0000000 --- a/meta-python/recipes-devtools/python/python-constantly.inc +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Symbolic constants in Python" -HOMEPAGE = "https://github.com/twisted/constantly" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e393e4ddd223e3a74982efa784f89fd7" - -SRC_URI[md5sum] = "f0762f083d83039758e53f8cf0086eef" -SRC_URI[sha256sum] = "586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-json" diff --git a/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb b/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb index 3f66754..ad24f6d 100644 --- a/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb @@ -1,2 +1,11 @@ -inherit setuptools3 -require python-constantly.inc +DESCRIPTION = "Symbolic constants in Python" +HOMEPAGE = "https://github.com/twisted/constantly" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e393e4ddd223e3a74982efa784f89fd7" + +SRC_URI[md5sum] = "f0762f083d83039758e53f8cf0086eef" +SRC_URI[sha256sum] = "586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-json" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:32 +0000 Subject: [oe-commits] [meta-openembedded] 08/18: python3-contextlib2: consolidate inc and bb files into a single bb file In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.229E2232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9f709be1083ef6d36bb8f6950b978ab209319670 Author: Derek Straka AuthorDate: Sat Feb 15 12:48:51 2020 -0500 python3-contextlib2: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-contextlib2.inc | 10 ---------- .../recipes-devtools/python/python3-contextlib2_0.6.0.bb | 11 ++++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-contextlib2.inc b/meta-python/recipes-devtools/python/python-contextlib2.inc deleted file mode 100644 index 750721f..0000000 --- a/meta-python/recipes-devtools/python/python-contextlib2.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Backports and enhancements for the contextlib module" -HOMEPAGE = "http://contextlib2.readthedocs.org/" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=43d1c7827e8fad6454b553caf0e1d734" - -SRC_URI[md5sum] = "d03a631073b40073b5c41364ad8f5979" -SRC_URI[sha256sum] = "7197aa736777caac513dbd800944c209a49765bf1979b12b037dce0277077ed3" - -BBCLASSEXTEND = "native nativesdk" \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb b/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb index 1c0b560..6074efa 100644 --- a/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb @@ -1,3 +1,12 @@ +DESCRIPTION = "Backports and enhancements for the contextlib module" +HOMEPAGE = "http://contextlib2.readthedocs.org/" +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=43d1c7827e8fad6454b553caf0e1d734" + +SRC_URI[md5sum] = "d03a631073b40073b5c41364ad8f5979" +SRC_URI[sha256sum] = "7197aa736777caac513dbd800944c209a49765bf1979b12b037dce0277077ed3" + inherit pypi setuptools3 -require python-contextlib2.inc +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:33 +0000 Subject: [oe-commits] [meta-openembedded] 09/18: python3-crcmod: consolidate inc and bb files into a single bb file In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.2DD6A232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1544ca4eb7590fbd11a74c1bb9396e0fec3448d8 Author: Derek Straka AuthorDate: Sat Feb 15 12:51:19 2020 -0500 python3-crcmod: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-crcmod.inc | 14 -------------- .../recipes-devtools/python/python3-crcmod_1.7.bb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-crcmod.inc b/meta-python/recipes-devtools/python/python-crcmod.inc deleted file mode 100644 index 85da7cb..0000000 --- a/meta-python/recipes-devtools/python/python-crcmod.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A Python module for generating objects that compute the Cyclic Redundancy Check." -HOMEPAGE = "https://pypi.org/project/crcmod" -LICENSE = "MIT" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a19291627cad2d1dfbfcf3c9fb85c2" - -SRC_URI[md5sum] = "2d5b92117d958dcead94f9e17f54cd32" -SRC_URI[sha256sum] = "dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-unittest" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb b/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb index 6996b13..14a344f 100644 --- a/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb +++ b/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb @@ -1,2 +1,14 @@ -inherit setuptools3 -require python-crcmod.inc +SUMMARY = "A Python module for generating objects that compute the Cyclic Redundancy Check." +HOMEPAGE = "https://pypi.org/project/crcmod" +LICENSE = "MIT" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a19291627cad2d1dfbfcf3c9fb85c2" + +SRC_URI[md5sum] = "2d5b92117d958dcead94f9e17f54cd32" +SRC_URI[sha256sum] = "dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-unittest" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:34 +0000 Subject: [oe-commits] [meta-openembedded] 10/18: python3-ansi2html: add new package In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.36447232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d00808b0c3d14df79ceec1b3b86e99cd1a4fe421 Author: Jeremy Puhlman AuthorDate: Sat Feb 15 09:51:43 2020 -0800 python3-ansi2html: add new package Convert text with ANSI color codes to HTML or to LaTeX Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-ansi2html_1.5.2.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb b/meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb new file mode 100644 index 0000000..8e586ea --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb @@ -0,0 +1,13 @@ +DESCRPTION = "ansi2html - Convert text with ANSI color codes to HTML or to LaTeX" +HOMEPAGE = "https://github.com/ralphbean/ansi2html" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" +LICENSE = "GPLv3" + +PYPI_PACKAGE = "ansi2html" + +SRC_URI[md5sum] = "52d6085ad1c5970082ea5305a26af981" +SRC_URI[sha256sum] = "96ae85ae7b26b7da674d87de2870ba4d1964bca733ae4614587080b6358c3ba9" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "${PYTHON_PN}-six" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:35 +0000 Subject: [oe-commits] [meta-openembedded] 11/18: python3-colorlog: add new package In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.3EE04232834@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1eb621fce8a342256b4fc815c9844ee13cd4cb84 Author: Jeremy Puhlman AuthorDate: Sat Feb 15 09:51:44 2020 -0800 python3-colorlog: add new package A colored formatter for the python logging module Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb b/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb new file mode 100644 index 0000000..ea4c575 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A colored formatter for the python logging module" +HOMEPAGE = "https://github.com/borntyping/python-colorlog" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;md5=05592f7a5b83bfc756f62dbd70a9b9b5" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "colorlog" + +SRC_URI[md5sum] = "25f79b76421132e2a9e08da15e4e0a73" +SRC_URI[sha256sum] = "30aaef5ab2a1873dec5da38fd6ba568fa761c9fa10b40241027fa3edea47f3d2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:36 +0000 Subject: [oe-commits] [meta-openembedded] 12/18: sigrok-cli: Inherit mime-xdg In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.46B68232835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7012edb060b4c84614637938d9f151b80855a892 Author: Khem Raj AuthorDate: Sat Feb 15 15:12:28 2020 -0800 sigrok-cli: Inherit mime-xdg Fixes WARNING: sigrok-cli-0.7.1-r0 do_package_qa: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg Signed-off-by: Khem Raj --- meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb index 2293f14..369e2f6 100644 --- a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb +++ b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb @@ -10,7 +10,7 @@ PACKAGECONFIG[decode] = "--with-libsigrokdecode,--without-libsigrokdecode,libsig PACKAGECONFIG ??= "decode" -inherit autotools pkgconfig +inherit autotools pkgconfig mime-xdg SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz" SRC_URI[md5sum] = "3f45ce664bad529d8b3f78a61b017d75" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:37 +0000 Subject: [oe-commits] [meta-openembedded] 13/18: libsigrok: inherit mime In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.4F3D3232836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e9a2438b3c6068622b28d6d9e71d439c94d10024 Author: Khem Raj AuthorDate: Sat Feb 15 15:26:56 2020 -0800 libsigrok: inherit mime Fixes libsigrok-0.5.2: package contains mime types but does not inhert mime: libsigrok path '/work/aarch64-yoe-linux/libsigrok/0.5.2-r0/packages-split/libsigrok/usr/share/mime/packages/vnd.sigrok.session.xml' [mime] Signed-off-by: Khem Raj --- meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb index 35e59d6..e8c36a8 100644 --- a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb +++ b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb @@ -15,7 +15,7 @@ PACKAGECONFIG[hidapi] = "--with-libhidapi,--without-libhidapi,hidapi" PACKAGECONFIG ??= "serialport ftdi usb" -inherit autotools pkgconfig +inherit autotools pkgconfig mime SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:38 +0000 Subject: [oe-commits] [meta-openembedded] 14/18: joe: Inherit mime-xdg In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.5791223281D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ea5c076386bd1e894aaa5194b5c816d9843c76c4 Author: Khem Raj AuthorDate: Sat Feb 15 15:28:57 2020 -0800 joe: Inherit mime-xdg Fixes joe-4.6: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: joe path '/work/aarch64-yoe-linux/joe/4.6-r0/packages-split/joe/usr/share/applications/jpico.desktop' Signed-off-by: Khem Raj --- meta-oe/recipes-support/joe/joe_4.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb index b79e028..674736a 100644 --- a/meta-oe/recipes-support/joe/joe_4.6.bb +++ b/meta-oe/recipes-support/joe/joe_4.6.bb @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" PACKAGECONFIG ??= "curses" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" -inherit autotools-brokensep +inherit autotools-brokensep mime-xdg SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43" SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:39 +0000 Subject: [oe-commits] [meta-openembedded] 15/18: remmina: Inherit mime-xdg In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.6093C232837@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 815c6ac7f3b023b2fd03cd63c523dbf23bfd9f54 Author: Khem Raj AuthorDate: Sat Feb 15 15:30:20 2020 -0800 remmina: Inherit mime-xdg Fixes remmina-1.3.6: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: remmina path '/work/aarch64-yoe-linux/remmina/1.3.6-r0/packages-split/remmina/usr/share/applications/remmina-file.desktop' Signed-off-by: Khem Raj --- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 14fbc94..f9963ff 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5 S = "${WORKDIR}/Remmina-v${PV}" -inherit cmake features_check +inherit cmake features_check mime-xdg # depends on avahi-ui with this restriction ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:40 +0000 Subject: [oe-commits] [meta-openembedded] 16/18: sysprof: Inherit mime and mime-xdg In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.69662232820@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 64fa3d8d97a4b826dfc636613bf3f3ae4f707bbc Author: Khem Raj AuthorDate: Sat Feb 15 15:31:32 2020 -0800 sysprof: Inherit mime and mime-xdg Use += for depends to not override prior ones Fixes sysprof-3.34.1: package contains mime types but does not inhert mime: sysprof path '/work/aarch64-yoe-linux/sysprof/3.34.1-r0/packages-split/sysprof/usr/share/mime/packages/sysprof-mime.xml' [mime] sysprof-3.34.1: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: sysprof path '/work/aarch64-yoe-linux/sysprof/3.34.1-r0/packages-split/sysprof/usr/share/applications/org.gnome.Sysprof3.desktop' [mime-xdg] Signed-off-by: Khem Raj --- meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb index 1e530ef..ad69ab6 100644 --- a/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext systemd upstream-version-is-even gsettings +inherit gnomebase gettext systemd upstream-version-is-even gsettings mime mime-xdg -DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" +DEPENDS += "glib-2.0 libxml2-native glib-2.0-native" SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629" SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:41 +0000 Subject: [oe-commits] [meta-openembedded] 17/18: gtkwave: Inherit mime and mime-xdg In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.78E8323281C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2052442dbda45c2e0e1e4c1d9768ef368cfe73ee Author: Khem Raj AuthorDate: Sat Feb 15 15:33:07 2020 -0800 gtkwave: Inherit mime and mime-xdg Use += for depends to not override prior ones Fixes gtkwave-3.3.103: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: gtkwave path '/work/aarch64-yoe-linux/gtkwave/3.3.103-r0/packages-split/gtkwave/usr/share/applications/gtkwave.desktop' [mime-xdg] Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb index 286d9aa..fec3c7c 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb @@ -10,9 +10,9 @@ SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" SRC_URI[md5sum] = "5a9a5913f9a02a333b2b23626f153fd7" SRC_URI[sha256sum] = "c325abf7cf26c53309a67c0ecaaf196774fa982a717a102c599ac8a516eeeaf7" -inherit pkgconfig autotools gettext texinfo -DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" -RDEPENDS_${PN} = "tk-lib" +inherit pkgconfig autotools gettext texinfo mime mime-xdg +DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" +RDEPENDS_${PN} += "tk-lib" # depends on gtk+ which has this restriction inherit features_check -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 16 20:52:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 16 Feb 2020 20:52:42 +0000 Subject: [oe-commits] [meta-openembedded] 18/18: gimp: Depend on libexecinfo for musl In-Reply-To: <158188634447.20868.10851061781587160031@git.openembedded.org> References: <158188634447.20868.10851061781587160031@git.openembedded.org> Message-ID: <20200216205225.82F1723281F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3dbcc5dc3ea095c115f539192873bfb71641ac96 Author: Khem Raj AuthorDate: Sat Feb 15 15:56:33 2020 -0800 gimp: Depend on libexecinfo for musl musl does not have internal backtrace implementation like glibc but we can use external library Signed-off-by: Khem Raj Cc: Andreas M?ller --- meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb index 045958d..30f0579 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb @@ -29,6 +29,7 @@ DEPENDS = " \ libmng \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \ " +DEPENDS_append_libc-musl = " libexecinfo" inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 07:33:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 07:33:02 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: abseil-cpp: Fix build on risc-v In-Reply-To: <158192478105.3447.3687240745622766110@git.openembedded.org> References: <158192478105.3447.3687240745622766110@git.openembedded.org> Message-ID: <20200217073301.80BC723282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 497aa40527a04a5be029ab720682a80762f63611 Author: Khem Raj AuthorDate: Sun Feb 16 16:29:36 2020 -0800 abseil-cpp: Fix build on risc-v Port GetProgramCounter to support risc-v program counter Signed-off-by: Khem Raj --- ...01-Add-RISCV-support-to-GetProgramCounter.patch | 29 ++++++++++++++++++++++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + 2 files changed, 30 insertions(+) diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch new file mode 100644 index 0000000..95ec070 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch @@ -0,0 +1,29 @@ +From 983eeae0792946fe5c090f95164c892ec6db5cc4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Feb 2020 16:22:53 -0800 +Subject: [PATCH] Add RISCV support to GetProgramCounter() + +Identify PC register from signal context + +Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/621] +Signed-off-by: Khem Raj +--- + absl/debugging/internal/examine_stack.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc +index 4739fbc..fb77450 100644 +--- a/absl/debugging/internal/examine_stack.cc ++++ b/absl/debugging/internal/examine_stack.cc +@@ -53,6 +53,8 @@ void* GetProgramCounter(void* vuc) { + return reinterpret_cast(context->uc_mcontext.gp_regs[32]); + #elif defined(__powerpc__) + return reinterpret_cast(context->uc_mcontext.regs->nip); ++#elif defined(__riscv) ++ return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); + #elif defined(__s390__) && !defined(__s390x__) + return reinterpret_cast(context->uc_mcontext.psw.addr & 0x7fffffff); + #elif defined(__s390__) && defined(__s390x__) +-- +2.25.0 + diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 77afba8..4d16361 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ file://0001-Remove-maes-option-from-cross-compilation.patch \ file://0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch \ file://0003-Add-fPIC-option.patch \ + file://0001-Add-RISCV-support-to-GetProgramCounter.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 07:33:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 07:33:01 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3dbcc5d -> d459ead) Message-ID: <158192478105.3447.3687240745622766110@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 3dbcc5d gimp: Depend on libexecinfo for musl new 497aa40 abseil-cpp: Fix build on risc-v new 11e6038 mutter: upgrade 3.34.3 -> 3.34.4 new 40ed607 gnome-shell: upgrade 3.34.3 -> 3.34.4 new d459ead xfce4-whiskermenu-plugin: upgrade 2.3.5 -> 2.4.2 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...gnome-shell_3.34.3.bb => gnome-shell_3.34.4.bb} | 4 +-- .../mutter/0001-cogl-Fix-GLES2-fallback.patch | 37 ---------------------- .../mutter/{mutter_3.34.3.bb => mutter_3.34.4.bb} | 5 ++- ...01-Add-RISCV-support-to-GetProgramCounter.patch | 29 +++++++++++++++++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + ..._2.3.5.bb => xfce4-whiskermenu-plugin_2.4.2.bb} | 4 +-- 6 files changed, 36 insertions(+), 44 deletions(-) rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_3.34.3.bb => gnome-shell_3.34.4.bb} (91%) delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch rename meta-gnome/recipes-gnome/mutter/{mutter_3.34.3.bb => mutter_3.34.4.bb} (93%) create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.3.5.bb => xfce4-whiskermenu-plugin_2.4.2.bb} (66%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 07:33:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 07:33:03 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: mutter: upgrade 3.34.3 -> 3.34.4 In-Reply-To: <158192478105.3447.3687240745622766110@git.openembedded.org> References: <158192478105.3447.3687240745622766110@git.openembedded.org> Message-ID: <20200217073301.8C2FE23282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 11e603828297331349e20c37d6bc43cbada19049 Author: Andreas M?ller AuthorDate: Sun Feb 16 22:22:42 2020 +0100 mutter: upgrade 3.34.3 -> 3.34.4 Backported patch is included see '<-' in annnouncement: News ==== * Handle mode set race conditions more gracefully [Jonas; !1007] * Fix fallback to GLES2 [Adam; #635] <- * Fix interoperation with wl_data_device_manager v1 [Carlos; #965] * Fix visual glitches with offscreen effects applied [Georges; !992] * Favor text over images in clipboard manager [Carlos; #919] * Fixes crashes [Jonas, Carlos; !961, !869] * Plugged memory leaks [Sebastian, Adam; !1002, !1011] * Misc. bug fixes [Carlos, Robert, Olivier; !1005, #878, !1031, !1034, !1040] Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../mutter/0001-cogl-Fix-GLES2-fallback.patch | 37 ---------------------- .../mutter/{mutter_3.34.3.bb => mutter_3.34.4.bb} | 5 ++- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch deleted file mode 100644 index ec92000..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f4f7e31303d78b2a8a0881b61311b8d750301b8f Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 29 Oct 2019 11:53:27 -0400 -Subject: [PATCH] cogl: Fix GLES2 fallback - -Say you're using intel gen3, you poor soul. Your big-GL maxes out at 1.5 -unless you use dirty tricks, but you do have GLES2. We try to fall back -to GLES in this case, but we only ever say eglBindAPI(EGL_OPENGL_API). -So when we go to do CreateContext, even though we think we've requested -GLES 2.0, the driver will compare that "2.0" against the maximum big-GL -version, and things will fail. - -Fix this by binding EGL_OPENGL_ES_API before trying a GLES context. - -https://gitlab.gnome.org/GNOME/mutter/issues/635 - -Upstream-Status: Applied ---- - cogl/cogl/winsys/cogl-winsys-egl.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c -index 99dcb8bf3..f2b439a67 100644 ---- a/cogl/cogl/winsys/cogl-winsys-egl.c -+++ b/cogl/cogl/winsys/cogl-winsys-egl.c -@@ -329,6 +329,8 @@ try_create_context (CoglDisplay *display, - if (renderer->driver == COGL_DRIVER_GL || - renderer->driver == COGL_DRIVER_GL3) - eglBindAPI (EGL_OPENGL_API); -+ else if (renderer->driver == COGL_DRIVER_GLES2) -+ eglBindAPI (EGL_OPENGL_ES_API); - - egl_attributes_from_framebuffer_config (display, - &display->onscreen_template->config, --- -2.21.0 - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.3.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb similarity index 93% rename from meta-gnome/recipes-gnome/mutter/mutter_3.34.3.bb rename to meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb index 9afa269..b4ddc5d 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.3.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb @@ -22,9 +22,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "c3ee46ae7b84d9d0e8dd3f9e04a61ab1" -SRC_URI[archive.sha256sum] = "cdf57ddd0bc35db952b732b77c796760e65d1ce2f7df31273e5c8d4759ed4a89" -SRC_URI += "file://0001-cogl-Fix-GLES2-fallback.patch" +SRC_URI[archive.md5sum] = "de19a6de98a2250dd7efdfca14359e39" +SRC_URI[archive.sha256sum] = "0134513515f605dd0858154d0b54d2e23c5779d52590533e266d407251e20ba2" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "x11" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 07:33:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 07:33:04 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: gnome-shell: upgrade 3.34.3 -> 3.34.4 In-Reply-To: <158192478105.3447.3687240745622766110@git.openembedded.org> References: <158192478105.3447.3687240745622766110@git.openembedded.org> Message-ID: <20200217073301.9891823282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 40ed607c17fbc19ecfdd13139f4eedb135cee0e6 Author: Andreas M?ller AuthorDate: Sun Feb 16 22:22:43 2020 +0100 gnome-shell: upgrade 3.34.3 -> 3.34.4 >From announcement: News ==== * Switch screen-recorder back to VP8 [Bj?rn; #256] Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../gnome-shell/{gnome-shell_3.34.3.bb => gnome-shell_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.3.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.4.bb similarity index 91% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.3.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.4.bb index 463fbf4..33dd7e4 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.3.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.4.bb @@ -30,8 +30,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -SRC_URI[archive.md5sum] = "a0f7d78f57616076890f0e3b7f12196a" -SRC_URI[archive.sha256sum] = "2474bef386c5a47d7be285aa22e24125c46ba5f860a25a1a36a90de4e456bd8a" +SRC_URI[archive.md5sum] = "692181c1a98be9e5f5b7e8738fd428ce" +SRC_URI[archive.sha256sum] = "e99cfb151307e1d5e5dff57b7026cf8aeace9d595a8c9e62537e934d0f14a366" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 07:33:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 07:33:05 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: xfce4-whiskermenu-plugin: upgrade 2.3.5 -> 2.4.2 In-Reply-To: <158192478105.3447.3687240745622766110@git.openembedded.org> References: <158192478105.3447.3687240745622766110@git.openembedded.org> Message-ID: <20200217073301.A626A232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d459ead5c65d0bfc45b3fd8c707c118049c401f8 Author: Andreas M?ller AuthorDate: Sun Feb 16 22:22:44 2020 +0100 xfce4-whiskermenu-plugin: upgrade 2.3.5 -> 2.4.2 Release notes for 2.4.2 ======================= - Fix crash when selecting desktop action. (bug #16445) - Translation updates: Chinese (China), Croatian, Georgian. Release notes for 2.4.1 ======================= - Fix narrow iconview columns. - Fix bad hyphenation by increasing iconview column width. - Translation updates: Finnish, Serbian. Release notes for 2.4.0 ======================= - Add option to show as icons. (bug #15675) - Add hiding menu items. (bug #14816) - Add searching keywords of menu items. (bug #15047) - Add tooltip to profile picture for editing profile. (bug #15501) - Adjust wording of switch user command. (bug #15398) - Add icons to context menu. - New default layout. - Make panel button square only if single row and title hidden. - Rearrange settings dialog. - Redesign session confirmation dialogs. - Refactor code. - Rewrite menu load to match GarconGtkMenu. - Switch categories with keyboard focus if hover enabled. - Use custom icon renderer. - Use link time optimization if available. - Increase C++ version. - Translation updates: Bulgarian, Catalan, Chinese (Taiwan), Czech, Danish, Dutch, Finnish, French, Galician, Georgian, German, Greek, Icelandic, Indonesian, Interlingue, Italian, Japanese, Lithuanian, Malay, Nepali, Norwegian Bokmal, Polish, Portuguese, Portuguese (Brazil), Slovak, Spanish, Turkish. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...-whiskermenu-plugin_2.3.5.bb => xfce4-whiskermenu-plugin_2.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb similarity index 66% rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb index 75b5a31..25fc72d 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.5.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "b5242d7922fa4253cc99c253efcff7cf" -SRC_URI[sha256sum] = "8f7134f4c1b5ff5290048c5b96b130e1238a286002cbe35255c2cd7d5a1ab6b4" +SRC_URI[md5sum] = "f553d3be2ffebd8d9fa5b6415647e4ff" +SRC_URI[sha256sum] = "fb2e1d44744d851c5339900e7af9068397028efa9ee5235a66ab273e95740dee" RRECOMMENDS_${PN} += "menulibre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 12:04:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 12:04:37 +0000 Subject: [oe-commits] [bitbake] branch master updated: doc: correct typo of 'BitBack' Message-ID: <158194107743.20364.17141034336697203953@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new 88b8b5f doc: correct typo of 'BitBack' 88b8b5f is described below commit 88b8b5f6f17c18f57f8f9f7863483792f29e22ef Author: Robert P. J. Day AuthorDate: Sat Feb 8 14:43:38 2020 -0500 doc: correct typo of 'BitBack' Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml index 383f94b..bb5a7f8 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml @@ -1864,7 +1864,7 @@ accessing your $HOME/.ccache directory. The following command "whitelists" the environment variable - CCACHE_DIR causing BitBack to allow that + CCACHE_DIR causing BitBake to allow that variable into the datastore: export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE CCACHE_DIR" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 12:04:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 12:04:42 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: doc: correct typo of 'BitBack' Message-ID: <158194108200.20757.13901220720038840103@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new d9fc6e9 doc: correct typo of 'BitBack' d9fc6e9 is described below commit d9fc6e95b8ad3921f1cd9a5ab16e0944c7b784ec Author: Robert P. J. Day AuthorDate: Sat Feb 8 14:43:38 2020 -0500 doc: correct typo of 'BitBack' Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml index 383f94b..bb5a7f8 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml @@ -1864,7 +1864,7 @@ accessing your $HOME/.ccache directory. The following command "whitelists" the environment variable - CCACHE_DIR causing BitBack to allow that + CCACHE_DIR causing BitBake to allow that variable into the datastore: export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE CCACHE_DIR" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:24 +0000 Subject: [oe-commits] [openembedded-core] 02/11: qemux86: do not add vga=0 to kernel parameters In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.A77E923282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9087ae6af12e7a38185506f8c71ef2107dab986b Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:07 2020 +0100 qemux86: do not add vga=0 to kernel parameters This was added ages ago to enable GL passthrough with vmware driver, and is no longer relevant, as std or virgl is used instead nowadays. Original commit: commit 072545b1111c5efb66289a4866897429f5fcd969 Author: Richard Purdie Date: Wed Jan 21 17:40:51 2009 +0000 scripts/poky-qemu-internal: Add support for GL passthrough in qemux86 images Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-x86.inc | 2 +- scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 495418f..049681b 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -8,7 +8,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index c8d9f12..22b4521 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks @@ -4,5 +4,5 @@ include common.wks.inc -bootloader --timeout=0 --append="vga=0 rw oprofile.timer=1 rootfstype=ext4 " +bootloader --timeout=0 --append="rw oprofile.timer=1 rootfstype=ext4 " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:23 +0000 Subject: [oe-commits] [openembedded-core] 01/11: procps: upstream has switched to gitlab In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.98CDD23282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ad48167cd570e3f34dee0a41592cc577b21c1970 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:06 2020 +0100 procps: upstream has switched to gitlab Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.3.16.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_3.3.16.bb index 60f9097..2810ebd 100644 --- a/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -12,14 +12,19 @@ DEPENDS = "ncurses" inherit autotools gettext pkgconfig update-alternatives -SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ +SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ file://sysctl.conf \ " +SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" -SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" -SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" +S = "${WORKDIR}/git" -S = "${WORKDIR}/procps-ng-${PV}" +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they +# don't ship a po/POTFILES.in (which is silly). Without that file gettext +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. +do_configure_prepend() { + ( cd ${S} && po/update-potfiles ) +} EXTRA_OECONF = "--enable-skill --disable-modern-top" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:26 +0000 Subject: [oe-commits] [openembedded-core] 04/11: webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.C038A232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dffada279647b784b21168895e67edbb6b00ab16 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:10 2020 +0100 webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c7f0d5e..4aa8533 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:25 +0000 Subject: [oe-commits] [openembedded-core] 03/11: qemux86: drop resolution setting via uvesafb In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.B24FF23282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a7658b256415747f1110d17db7cfaa20200cfea8 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:08 2020 +0100 qemux86: drop resolution setting via uvesafb I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it. The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues. The modern, supported option is video=... kernel parameter documented here: https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst which can be passed directly to runqemu and doesn't require special kernel modules. Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-x86.inc | 3 +-- meta/conf/machine/qemux86-64.conf | 4 ---- meta/conf/machine/qemux86.conf | 4 ---- meta/lib/oeqa/runtime/cases/parselogs.py | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 049681b..5dcc8b6 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -UVESA_MODE ?= "640x480-32" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 648cf2f..db9004e 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 8e0da82..7e6723b 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 9dafb89..3cad070 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -60,7 +60,6 @@ common_errors = [ ] video_related = [ - "uvesafb", ] x86_common = [ @@ -82,11 +81,8 @@ qemux86_common = [ "fail to add MMCONFIG information, can't access extended PCI configuration space under this bridge.", "can't claim BAR ", 'amd_nb: Cannot enumerate AMD northbridges', - 'uvesafb: 5000 ms task timeout, infinitely waiting', 'tsc: HPET/PMTIMER calibration failed', "modeset(0): Failed to initialize the DRI2 extension", - "uvesafb: cannot reserve video memory at", - "uvesafb: probe of uvesafb.0 failed with error", "glamor initialization failed", ] + common_errors -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:22 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f192192 -> a008ca4) Message-ID: <158194526223.14158.11187069944049992909@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard f192192 systemd: upgrade v244.1 -> v244.3 discard ca28f8d meson.bbclass: Parameterise meson.cross new ad48167 procps: upstream has switched to gitlab new 9087ae6 qemux86: do not add vga=0 to kernel parameters new a7658b2 qemux86: drop resolution setting via uvesafb new dffada2 webkitgtk: x11 and wayland are not mutually exclusive new a5e1b1f weston: add a basic runtime test new e9ed1e1 wayland: convert to meson build new 49ed877 ptest-packagelists: mention ifupdown ptest in a comment new a9068d7 python3: resolve ncurses host contamination new ff951ab fix various, innocuous typos new 6138ffd systemd: upgrade v244.1 -> v244.3 new a008ca4 insane.bbclass: Correct typo inhert->inherit This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f192192) \ N -- N -- N refs/heads/master-next (a008ca4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 2 +- meta/classes/meson.bbclass | 161 ++++++++++----------- meta/classes/testimage.bbclass | 4 +- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/conf/licenses.conf | 2 +- meta/conf/machine/include/qemuboot-x86.inc | 3 +- meta/conf/machine/qemux86-64.conf | 4 - meta/conf/machine/qemux86.conf | 4 - meta/lib/oeqa/manual/eclipse-plugin.json | 6 +- meta/lib/oeqa/runtime/cases/parselogs.py | 4 - meta/lib/oeqa/runtime/cases/{xorg.py => weston.py} | 12 +- meta/lib/oeqa/sdk/context.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 2 +- meta/recipes-core/systemd/systemd-boot_244.3.bb | 15 +- ...ysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...c-setup.py-do-not-add-a-curses-include-pa.patch | 48 ++++++ ...2-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + meta/recipes-extended/procps/procps_3.3.16.bb | 13 +- ...-find-the-native-wayland-scanner-directly.patch | 27 ++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 9 +- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- scripts/pybootchartgui/pybootchartgui/draw.py | 2 +- 25 files changed, 198 insertions(+), 134 deletions(-) copy meta/lib/oeqa/runtime/cases/{xorg.py => weston.py} (58%) create mode 100644 meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:27 +0000 Subject: [oe-commits] [openembedded-core] 05/11: weston: add a basic runtime test In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.CBC3D232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a5e1b1fb97a5e5042d6ed5b23f0c29194579bcde Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:11 2020 +0100 weston: add a basic runtime test The test is checking that weston is able to start. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/lib/oeqa/runtime/cases/weston.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75f0f2c..9588f2c 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -57,7 +57,7 @@ BASICTESTSUITE = "\ ping date df ssh scp python perl gi ptest parselogs \ logrotate connman systemd oe_syslog pam stap ldd xorg \ kernelmodule gcc buildcpio buildlzip buildgalculator \ - dnf rpm opkg apt" + dnf rpm opkg apt weston" DEFAULT_TEST_SUITES = "${BASICTESTSUITE}" diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py new file mode 100644 index 0000000..f32599a --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/weston.py @@ -0,0 +1,19 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfNotFeature +from oeqa.runtime.decorator.package import OEHasPackage + +class WestonTest(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['weston']) + def test_weston_running(self): + cmd ='%s | grep [w]eston-desktop-shell' % self.tc.target_cmds['ps'] + status, output = self.target.run(cmd) + msg = ('Weston does not appear to be running %s' % + self.target.run(self.tc.target_cmds['ps'])[1]) + self.assertEqual(status, 0, msg=msg) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:29 +0000 Subject: [oe-commits] [openembedded-core] 07/11: ptest-packagelists: mention ifupdown ptest in a comment In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.E4615232834@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 49ed877866675739be7a84a3de32de72766437ca Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:14 2020 +0100 ptest-packagelists: mention ifupdown ptest in a comment Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0a13bf0..23865ac 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -57,6 +57,7 @@ PTESTS_FAST = "\ # lz4-ptest \ # Needs a rewrite # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design +# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py #" PTESTS_SLOW = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:30 +0000 Subject: [oe-commits] [openembedded-core] 08/11: python3: resolve ncurses host contamination In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.EF360232835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a9068d76fb2e6484ec662ae7c6674ecc508485c1 Author: Alexander Kanavin AuthorDate: Sun Feb 16 20:16:05 2020 +0100 python3: resolve ncurses host contamination Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...ysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...c-setup.py-do-not-add-a-curses-include-pa.patch | 48 ++++++++++++++++++++++ ...2-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 03f6008..e7af3c6 100644 --- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001 +From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch new file mode 100644 index 0000000..e04a916 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch @@ -0,0 +1,48 @@ +From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 17:50:25 +0100 +Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from + the host + +This leads to host contamination, and particularly can cause +curses modules to fail at runtime if the host curses is configured +differently to native curses (observed on current OpenSuse Tumbleweed +as dnf failures). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 6 ------ + setup.py | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 915f475..c911011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4828,12 +4828,6 @@ then + [Define if you have struct stat.st_mtimensec]) + fi + +-# first curses header check +-ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +-fi +- + AC_CHECK_HEADERS(curses.h ncurses.h) + + # On Solaris, term.h requires curses.h +diff --git a/setup.py b/setup.py +index b0f1541..7208cd0 100644 +--- a/setup.py ++++ b/setup.py +@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 6fe9839..61ac3e7 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001 +From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index c836066..7796852 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ + file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:33 +0000 Subject: [oe-commits] [openembedded-core] 11/11: insane.bbclass: Correct typo inhert->inherit In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131423.258D923283A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a008ca466e25b482ba66d26e515bde52dfde83b4 Author: Khem Raj AuthorDate: Sat Feb 15 15:23:38 2020 -0800 insane.bbclass: Correct typo inhert->inherit Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7425b8c..478240f 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -194,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages): """ if d.getVar("datadir") + "/mime/packages" in path and path.endswith('.xml') and not bb.data.inherits_class("mime", d): - package_qa_add_message(messages, "mime", "package contains mime types but does not inhert mime: %s path '%s'" % \ + package_qa_add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:28 +0000 Subject: [oe-commits] [openembedded-core] 06/11: wayland: convert to meson build In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131422.D7BE5232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e9ed1e19c720ddbdb752550500612ebbbe4e0036 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:13 2020 +0100 wayland: convert to meson build Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-find-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 9 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000..f98037a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075..21a848f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -14,19 +14,20 @@ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OECONF_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:31 +0000 Subject: [oe-commits] [openembedded-core] 09/11: fix various, innocuous typos In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131423.0C691232836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ff951ab23d7ba5ac1447ff8836bfc9aa8d908ce0 Author: Robert P. J. Day AuthorDate: Sun Feb 16 08:23:02 2020 -0500 fix various, innocuous typos Corrections: - environment - accommodate - conversion - compatible Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/conf/licenses.conf | 2 +- meta/lib/oeqa/manual/eclipse-plugin.json | 6 +++--- meta/lib/oeqa/sdk/context.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 2 +- scripts/pybootchartgui/pybootchartgui/draw.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 9588f2c..01d8598 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -243,7 +243,7 @@ def testimage_main(d): if d.getVar("TEST_TARGET") == "qemu": fstypes = [fs for fs in fstypes if fs in supported_fstypes] if not fstypes: - bb.fatal('Unsupported image type built. Add a comptible image to ' + bb.fatal('Unsupported image type built. Add a compatible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) qfstype = fstypes[0] diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 1c586a3..751424d 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -1,7 +1,7 @@ # Standards are great! Everyone has their own. In an effort to standardize licensing # names, common-licenses will use the SPDX standard license names. In order to not # break the non-standardized license names that we find in LICENSE, we'll set -# up a bunch of VarFlags to accomodate non-SPDX license names. +# up a bunch of VarFlags to accommodate non-SPDX license names. # # We should really discuss standardizing this field, but that's a longer term goal. # For now, we can do this and it should grab the most common LICENSE naming variations. diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json index 9869150..d77d0e6 100644 --- a/meta/lib/oeqa/manual/eclipse-plugin.json +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -82,7 +82,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -164,7 +164,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -319,4 +319,4 @@ "summary": "Eclipse_Poky_installation_and_setup" } } -] \ No newline at end of file +] diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 09e77c1..01c38c2 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) if not sdk_envs: raise argparse_oe.ArgumentUsageError("No available SDK "\ - "enviroments found at %s" % args.sdk_dir, self.name) + "environments found at %s" % args.sdk_dir, self.name) if args.list_sdk_env: self._display_sdk_envs(logger.info, args, sdk_envs) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index e2f91bc..5886862 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): when building the kernel. """ kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') - # Clean up the enviroment + # Clean up the environment bitbake('%s -c clean' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 6d80827..d4664bd 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): def test_blob_to_dict(self): """ - Test convertion of git blobs to dictionary + Test conversion of git blobs to dictionary """ from oe.buildhistory_analysis import blob_to_dict valuesmap = { "foo" : "1", "bar" : "2" } diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py index add5c53..53324b9 100644 --- a/scripts/pybootchartgui/pybootchartgui/draw.py +++ b/scripts/pybootchartgui/pybootchartgui/draw.py @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second proc_h = 16 # the height of a process leg_s = 10 MIN_IMG_W = 800 -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs OPTIONS = None def extents(options, xscale, trace): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:32 +0000 Subject: [oe-commits] [openembedded-core] 10/11: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158194526223.14158.11187069944049992909@git.openembedded.org> References: <158194526223.14158.11187069944049992909@git.openembedded.org> Message-ID: <20200217131423.18728232837@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6138ffde231697f416cf84b1b574d4c89e2fe599 Author: Alex Kiernan AuthorDate: Sun Feb 16 11:42:24 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use an additional cross-file instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 26 ++++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 14 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..f92c639 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,27 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:48 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (d9fc6e9 -> 7ab55bb) Message-ID: <158194528888.15476.10104063050263380593@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard d9fc6e9 doc: correct typo of 'BitBack' discard 44f8fca runqueue: Possible tid handling optimisation add 88b8b5f doc: correct typo of 'BitBack' new 7ab55bb runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d9fc6e9) \ N -- N -- N refs/heads/master-next (7ab55bb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:14:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:14:49 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158194528888.15476.10104063050263380593@git.openembedded.org> References: <158194528888.15476.10104063050263380593@git.openembedded.org> Message-ID: <20200217131449.09F8223282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 7ab55bb4f7638a1c3c543ea9a96bbee01886e55e Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? 5969cd3) Message-ID: <158194533989.17887.3421904886255049926@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from 7ab55bb runqueue: Possible tid handling optimisation new 39cf3d1 knotty: Make the bb.command.CommandExit event terminate bitbake new 6259785 fetch2: Make fetcher_compare_revisions() work new 5969cd3 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lib/bb/fetch2/__init__.py | 51 ++++++++++++++++++++++++++--------------------- lib/bb/ui/knotty.py | 1 + 2 files changed, 29 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:15:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:15:40 +0000 Subject: [oe-commits] [bitbake] 01/03: knotty: Make the bb.command.CommandExit event terminate bitbake In-Reply-To: <158194533989.17887.3421904886255049926@git.openembedded.org> References: <158194533989.17887.3421904886255049926@git.openembedded.org> Message-ID: <20200217131540.0B5C723282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 39cf3d1768656f59b4cefa51ad9eff48bb19378d Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:53 2020 +0100 knotty: Make the bb.command.CommandExit event terminate bitbake This matches the other bb.command.Command* events and without it, running `bitbake --revisions-changed` will hang indefinitely if there are changed revisions. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index a0340df..cbb289b 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -590,6 +590,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): if isinstance(event, bb.command.CommandExit): if not return_value: return_value = event.exitcode + main.shutdown = 2 continue if isinstance(event, (bb.command.CommandCompleted, bb.cooker.CookerExit)): main.shutdown = 2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:15:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:15:42 +0000 Subject: [oe-commits] [bitbake] 03/03: fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" In-Reply-To: <158194533989.17887.3421904886255049926@git.openembedded.org> References: <158194533989.17887.3421904886255049926@git.openembedded.org> Message-ID: <20200217131540.23D94232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 5969cd3ce3d1996266b1ac73e34b354b9db77935 Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:55 2020 +0100 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" Mark any keys used to cache the srcrevs for a recipe as "dontcache" if BB_DONT_CACHE is set for the recipe. Remove any such keys upon the next bitbake run even if BB_SRCREV_POLICY is set to "cache". This will make sure the srcrev is updated as expected if ${AUTOREV} is used. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 5646276..b83347a 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -499,6 +499,11 @@ def fetcher_init(d): srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) + # We still need to remove keys that are marked with "dontcache". + for key in list(revs.keys()): + if key.startswith("dontcache-"): + logger.debug(1, "Removing SRCREV key: %s" % key) + revs.pop(key) elif srcrev_policy == "clear": logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) revs.clear() @@ -729,9 +734,8 @@ def subprocess_setup(): signal.signal(signal.SIGPIPE, signal.SIG_DFL) def get_autorev(d): - # only not cache src rev in autorev case - if d.getVar('BB_SRCREV_POLICY') != "cache": - d.setVar('BB_DONT_CACHE', '1') + # Do not cache the srcrev in the autorev case + d.setVar('BB_DONT_CACHE', '1') return "AUTOINC" def get_srcrev(d, method_name='sortable_revision'): @@ -1594,7 +1598,13 @@ class FetchMethod(object): return True, str(latest_rev) def generate_revision_key(self, ud, d, name): - return self._revision_key(ud, d, name) + key = self._revision_key(ud, d, name) + if d.getVar('BB_DONT_CACHE'): + # Mark the key so it can be removed on the next bitbake run even if + # BB_SRCREV_POLICY is "cache". + return "dontcache-%s" % key + else: + return key def latest_versionstring(self, ud, d): """ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 13:15:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 13:15:41 +0000 Subject: [oe-commits] [bitbake] 02/03: fetch2: Make fetcher_compare_revisions() work In-Reply-To: <158194533989.17887.3421904886255049926@git.openembedded.org> References: <158194533989.17887.3421904886255049926@git.openembedded.org> Message-ID: <20200217131540.187CC23282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 62597859b861f3ad35f535365ed9da144df59598 Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:54 2020 +0100 fetch2: Make fetcher_compare_revisions() work This seems to have been broken for a very long time. Now it also works regardless of BB_SRCREV_POLICY. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 1b7f573..5646276 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -485,17 +485,22 @@ def fetcher_init(d): Called to initialize the fetchers once the configuration data is known. Calls before this must not hit the cache. """ + + revs = bb.persist_data.persist('BB_URI_HEADREVS', d) + try: + # fetcher_init is called multiple times, so make sure we only save the + # revs the first time it is called. + if not bb.fetch2.saved_headrevs: + bb.fetch2.saved_headrevs = dict(revs) + except: + pass + # When to drop SCM head revisions controlled by user policy srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) elif srcrev_policy == "clear": logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) - revs = bb.persist_data.persist('BB_URI_HEADREVS', d) - try: - bb.fetch2.saved_headrevs = revs.items() - except: - pass revs.clear() else: raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy) @@ -514,22 +519,12 @@ def fetcher_parse_done(): def fetcher_compare_revisions(d): """ - Compare the revisions in the persistant cache with current values and - return true/false on whether they've changed. + Compare the revisions in the persistent cache with the saved values from + when bitbake was started and return true if they have changed. """ - data = bb.persist_data.persist('BB_URI_HEADREVS', d).items() - data2 = bb.fetch2.saved_headrevs - - changed = False - for key in data: - if key not in data2 or data2[key] != data[key]: - logger.debug(1, "%s changed", key) - changed = True - return True - else: - logger.debug(2, "%s did not change", key) - return False + headrevs = dict(bb.persist_data.persist('BB_URI_HEADREVS', d)) + return headrevs != bb.fetch2.saved_headrevs def mirror_from_string(data): mirrors = (data or "").replace('\\n',' ').split() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:52 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (a008ca4 -> 85b66b4) Message-ID: <158195027209.16964.7380538925323047043@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard a008ca4 insane.bbclass: Correct typo inhert->inherit discard 6138ffd systemd: upgrade v244.1 -> v244.3 discard ff951ab fix various, innocuous typos discard a9068d7 python3: resolve ncurses host contamination discard 49ed877 ptest-packagelists: mention ifupdown ptest in a comment discard e9ed1e1 wayland: convert to meson build new 56daf84 ptest-packagelists: mention ifupdown ptest in a comment new 7992ab3 python3: resolve ncurses host contamination new 72d6031 fix various, innocuous typos new 9bc0afc systemd: upgrade v244.1 -> v244.3 new 90657fd insane.bbclass: Correct typo inhert->inherit new 85b66b4 babeltrace: update to 1.5.8 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a008ca4) \ N -- N -- N refs/heads/master-next (85b66b4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...-find-the-native-wayland-scanner-directly.patch | 27 ---------------------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 9 ++++---- .../{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} | 6 ++--- 3 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch rename meta/recipes-kernel/lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} (84%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:53 +0000 Subject: [oe-commits] [openembedded-core] 01/06: ptest-packagelists: mention ifupdown ptest in a comment In-Reply-To: <158195027209.16964.7380538925323047043@git.openembedded.org> References: <158195027209.16964.7380538925323047043@git.openembedded.org> Message-ID: <20200217143752.6A39E23282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 56daf84ed0b04963b6f13e12855eec8bf8242b89 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:14 2020 +0100 ptest-packagelists: mention ifupdown ptest in a comment Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0a13bf0..23865ac 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -57,6 +57,7 @@ PTESTS_FAST = "\ # lz4-ptest \ # Needs a rewrite # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design +# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py #" PTESTS_SLOW = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:54 +0000 Subject: [oe-commits] [openembedded-core] 02/06: python3: resolve ncurses host contamination In-Reply-To: <158195027209.16964.7380538925323047043@git.openembedded.org> References: <158195027209.16964.7380538925323047043@git.openembedded.org> Message-ID: <20200217143752.7924C232831@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7992ab33ce093869291a3ed16e06317851d813d1 Author: Alexander Kanavin AuthorDate: Sun Feb 16 20:16:05 2020 +0100 python3: resolve ncurses host contamination Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...ysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...c-setup.py-do-not-add-a-curses-include-pa.patch | 48 ++++++++++++++++++++++ ...2-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 03f6008..e7af3c6 100644 --- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001 +From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch new file mode 100644 index 0000000..e04a916 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch @@ -0,0 +1,48 @@ +From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 17:50:25 +0100 +Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from + the host + +This leads to host contamination, and particularly can cause +curses modules to fail at runtime if the host curses is configured +differently to native curses (observed on current OpenSuse Tumbleweed +as dnf failures). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 6 ------ + setup.py | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 915f475..c911011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4828,12 +4828,6 @@ then + [Define if you have struct stat.st_mtimensec]) + fi + +-# first curses header check +-ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +-fi +- + AC_CHECK_HEADERS(curses.h ncurses.h) + + # On Solaris, term.h requires curses.h +diff --git a/setup.py b/setup.py +index b0f1541..7208cd0 100644 +--- a/setup.py ++++ b/setup.py +@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 6fe9839..61ac3e7 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001 +From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index c836066..7796852 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ + file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:55 +0000 Subject: [oe-commits] [openembedded-core] 03/06: fix various, innocuous typos In-Reply-To: <158195027209.16964.7380538925323047043@git.openembedded.org> References: <158195027209.16964.7380538925323047043@git.openembedded.org> Message-ID: <20200217143752.88CE4232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72d603112649fb74c2a841c985bac77100d9c726 Author: Robert P. J. Day AuthorDate: Sun Feb 16 08:23:02 2020 -0500 fix various, innocuous typos Corrections: - environment - accommodate - conversion - compatible Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/conf/licenses.conf | 2 +- meta/lib/oeqa/manual/eclipse-plugin.json | 6 +++--- meta/lib/oeqa/sdk/context.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 2 +- scripts/pybootchartgui/pybootchartgui/draw.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 9588f2c..01d8598 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -243,7 +243,7 @@ def testimage_main(d): if d.getVar("TEST_TARGET") == "qemu": fstypes = [fs for fs in fstypes if fs in supported_fstypes] if not fstypes: - bb.fatal('Unsupported image type built. Add a comptible image to ' + bb.fatal('Unsupported image type built. Add a compatible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) qfstype = fstypes[0] diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 1c586a3..751424d 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -1,7 +1,7 @@ # Standards are great! Everyone has their own. In an effort to standardize licensing # names, common-licenses will use the SPDX standard license names. In order to not # break the non-standardized license names that we find in LICENSE, we'll set -# up a bunch of VarFlags to accomodate non-SPDX license names. +# up a bunch of VarFlags to accommodate non-SPDX license names. # # We should really discuss standardizing this field, but that's a longer term goal. # For now, we can do this and it should grab the most common LICENSE naming variations. diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json index 9869150..d77d0e6 100644 --- a/meta/lib/oeqa/manual/eclipse-plugin.json +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -82,7 +82,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -164,7 +164,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -319,4 +319,4 @@ "summary": "Eclipse_Poky_installation_and_setup" } } -] \ No newline at end of file +] diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 09e77c1..01c38c2 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) if not sdk_envs: raise argparse_oe.ArgumentUsageError("No available SDK "\ - "enviroments found at %s" % args.sdk_dir, self.name) + "environments found at %s" % args.sdk_dir, self.name) if args.list_sdk_env: self._display_sdk_envs(logger.info, args, sdk_envs) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index e2f91bc..5886862 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): when building the kernel. """ kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') - # Clean up the enviroment + # Clean up the environment bitbake('%s -c clean' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 6d80827..d4664bd 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): def test_blob_to_dict(self): """ - Test convertion of git blobs to dictionary + Test conversion of git blobs to dictionary """ from oe.buildhistory_analysis import blob_to_dict valuesmap = { "foo" : "1", "bar" : "2" } diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py index add5c53..53324b9 100644 --- a/scripts/pybootchartgui/pybootchartgui/draw.py +++ b/scripts/pybootchartgui/pybootchartgui/draw.py @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second proc_h = 16 # the height of a process leg_s = 10 MIN_IMG_W = 800 -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs OPTIONS = None def extents(options, xscale, trace): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:56 +0000 Subject: [oe-commits] [openembedded-core] 04/06: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158195027209.16964.7380538925323047043@git.openembedded.org> References: <158195027209.16964.7380538925323047043@git.openembedded.org> Message-ID: <20200217143752.96D63232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9bc0afc246fd07276fd7747b1ede20e2e74aaa65 Author: Alex Kiernan AuthorDate: Sun Feb 16 11:42:24 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use an additional cross-file instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 26 ++++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 14 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..f92c639 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,27 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:57 +0000 Subject: [oe-commits] [openembedded-core] 05/06: insane.bbclass: Correct typo inhert->inherit In-Reply-To: <158195027209.16964.7380538925323047043@git.openembedded.org> References: <158195027209.16964.7380538925323047043@git.openembedded.org> Message-ID: <20200217143752.A2E34232834@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 90657fd48556561bbb4b58fb9975153142e05a4b Author: Khem Raj AuthorDate: Sat Feb 15 15:23:38 2020 -0800 insane.bbclass: Correct typo inhert->inherit Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7425b8c..478240f 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -194,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages): """ if d.getVar("datadir") + "/mime/packages" in path and path.endswith('.xml') and not bb.data.inherits_class("mime", d): - package_qa_add_message(messages, "mime", "package contains mime types but does not inhert mime: %s path '%s'" % \ + package_qa_add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:59 +0000 Subject: [oe-commits] [openembedded-core] branch zeus-next updated (00e0bc9 -> 799b3cd) Message-ID: <158195027211.16964.13104484499961085027@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch zeus-next in repository openembedded-core. from 00e0bc9 u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig add 799b3cd build-appliance-image: Update to zeus head revision No new revisions were added by this update. Summary of changes: meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 14:37:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 14:37:58 +0000 Subject: [oe-commits] [openembedded-core] 06/06: babeltrace: update to 1.5.8 In-Reply-To: <158195027209.16964.7380538925323047043@git.openembedded.org> References: <158195027209.16964.7380538925323047043@git.openembedded.org> Message-ID: <20200217143752.AD6E7232835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85b66b453559881f081bb4f9490ba084db477edb Author: Anders Wallin AuthorDate: Mon Feb 17 14:34:05 2020 +0100 babeltrace: update to 1.5.8 updated HOMEPAGE to http://babeltrace.org/ updated LICENSE to include LGPLv2.1 Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- .../lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb similarity index 84% rename from meta/recipes-kernel/lttng/babeltrace_1.5.7.bb rename to meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index 05ef6d0..b6b7653 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -1,14 +1,14 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower" DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." -HOMEPAGE = "http://www.efficios.com/babeltrace/" +HOMEPAGE = "http://babeltrace.org/" BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" -LICENSE = "MIT & GPLv2" +LICENSE = "MIT & GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" -SRCREV = "d4014aeef4b89a4aaab1af42d7b0d143d62da0ff" +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:20:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:20:55 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (f23f2b9 -> d459ead) Message-ID: <158195645591.1097.13807709620941124366@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from f23f2b9 lirc: build and deploy with python3 add 546b790 vpnc: splitout the vpnc-script into its own package add c24a061 openconnect: build with python3 add 2f21a8c openconnect: use target path to script add fb58592 python3-coloredlogs: consolidate inc and bb files into a single bb file add a14a615 python3-configargparse: consolidate inc and bb files into a single bb file add 97c41dc python3-configparser: consolidate inc and bb files into a single bb file add 2dd0260 python3-constantly: consolidate inc and bb files into a single bb file add 9f709be python3-contextlib2: consolidate inc and bb files into a single bb file add 1544ca4 python3-crcmod: consolidate inc and bb files into a single bb file add d00808b python3-ansi2html: add new package add 1eb621f python3-colorlog: add new package add 7012edb sigrok-cli: Inherit mime-xdg add e9a2438 libsigrok: inherit mime add ea5c076 joe: Inherit mime-xdg add 815c6ac remmina: Inherit mime-xdg add 64fa3d8 sysprof: Inherit mime and mime-xdg add 2052442 gtkwave: Inherit mime and mime-xdg add 3dbcc5d gimp: Depend on libexecinfo for musl add 497aa40 abseil-cpp: Fix build on risc-v add 11e6038 mutter: upgrade 3.34.3 -> 3.34.4 add 40ed607 gnome-shell: upgrade 3.34.3 -> 3.34.4 add d459ead xfce4-whiskermenu-plugin: upgrade 2.3.5 -> 2.4.2 No new revisions were added by this update. Summary of changes: meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 1 + ...gnome-shell_3.34.3.bb => gnome-shell_3.34.4.bb} | 4 +- .../mutter/0001-cogl-Fix-GLES2-fallback.patch | 37 ----------- .../mutter/{mutter_3.34.3.bb => mutter_3.34.4.bb} | 5 +- .../recipes-kernel/sysprof/sysprof_3.34.1.bb | 4 +- ...rojans-tncc-wrapper.py-convert-to-python3.patch | 71 ++++++++++++++++++++++ .../openconnect/openconnect_8.03.bb | 14 ++--- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 6 +- ...01-Add-RISCV-support-to-GetProgramCounter.patch | 29 +++++++++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb | 2 +- .../recipes-extended/sigrok/sigrok-cli_0.7.1.bb | 2 +- .../recipes-graphics/gtkwave/gtkwave_3.3.103.bb | 6 +- meta-oe/recipes-support/joe/joe_4.6.bb | 2 +- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 2 +- .../recipes-devtools/python/python-coloredlogs.inc | 24 -------- .../python/python-configargparse.inc | 22 ------- .../python/python-configparser.inc | 14 ----- .../recipes-devtools/python/python-constantly.inc | 11 ---- .../recipes-devtools/python/python-contextlib2.inc | 10 --- .../recipes-devtools/python/python-crcmod.inc | 14 ----- .../python/python3-ansi2html_1.5.2.bb | 13 ++++ .../python/python3-coloredlogs_10.0.bb | 26 +++++++- .../python/python3-colorlog_4.1.0.bb | 11 ++++ .../python/python3-configargparse_0.15.1.bb | 23 ++++++- .../python/python3-configparser_4.0.2.bb | 16 ++++- .../python/python3-constantly_15.1.0.bb | 13 +++- .../python/python3-contextlib2_0.6.0.bb | 11 +++- .../recipes-devtools/python/python3-crcmod_1.7.bb | 16 ++++- ..._2.3.5.bb => xfce4-whiskermenu-plugin_2.4.2.bb} | 4 +- 30 files changed, 246 insertions(+), 168 deletions(-) rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_3.34.3.bb => gnome-shell_3.34.4.bb} (91%) delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch rename meta-gnome/recipes-gnome/mutter/{mutter_3.34.3.bb => mutter_3.34.4.bb} (93%) create mode 100644 meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch delete mode 100644 meta-python/recipes-devtools/python/python-coloredlogs.inc delete mode 100644 meta-python/recipes-devtools/python/python-configargparse.inc delete mode 100644 meta-python/recipes-devtools/python/python-configparser.inc delete mode 100644 meta-python/recipes-devtools/python/python-constantly.inc delete mode 100644 meta-python/recipes-devtools/python/python-contextlib2.inc delete mode 100644 meta-python/recipes-devtools/python/python-crcmod.inc create mode 100644 meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.3.5.bb => xfce4-whiskermenu-plugin_2.4.2.bb} (66%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:23:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:23:42 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: cooker/siggen: Empty siggen cache during parsing Message-ID: <158195662207.2342.1981785876354278329@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new b4de909 cooker/siggen: Empty siggen cache during parsing b4de909 is described below commit b4de909da648ee8911d2731af4888da75f344b33 Author: Richard Purdie AuthorDate: Mon Feb 17 16:18:25 2020 +0000 cooker/siggen: Empty siggen cache during parsing When parsing recipes its apparent the memory usage of bitbake rises linearly with number of recipes parsed. It shouldn't. Using tracemalloc (thanks for the tip Joshua Lock) it was clear that the dependency information left behind in siggen was the culprit. Add a new method to allow us to drop this information. We don't need it after the recipe has been parsed and hashes calculated (at runtime its different but only the currently executing task would be in memory). This should give signficant memory usage improvements for bitbake and that in turn should help speed on more constrained systems, as well as when used in multiconfig environments. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 3 ++- lib/bb/siggen.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 1124332..a05630d 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1940,7 +1940,8 @@ class Parser(multiprocessing.Process): except IndexError: break result = self.parse(*job) - + # Clear the siggen cache after parsing to control memory usage, its huge + bb.parse.siggen.postparsing_clean_cache() try: self.results.put(result, timeout=0.25) except queue.Full: diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ffd8fca..c2d0c73 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -51,6 +51,9 @@ class SignatureGenerator(object): def finalise(self, fn, d, varient): return + def postparsing_clean_cache(self): + return + def get_unihash(self, tid): return self.taskhash[tid] @@ -188,6 +191,14 @@ class SignatureGeneratorBasic(SignatureGenerator): for task in taskdeps: d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + ":" + task]) + def postparsing_clean_cache(self): + # + # After parsing we can remove some things from memory to reduce our memory footprint + # + self.gendeps = {} + self.lookupcache = {} + self.taskdeps = {} + def rundep_check(self, fn, recipename, task, dep, depname, dataCache): # Return True if we should keep the dependency, False to drop it # We only manipulate the dependencies for packages not in the whitelist -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:26 +0000 Subject: [oe-commits] [openembedded-core] 01/07: weston: add a basic runtime test In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164225.F0622232832@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d9db0bb09d8b1bcc033c3ba1eb6a5a81c9e88645 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:11 2020 +0100 weston: add a basic runtime test The test is checking that weston is able to start. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/lib/oeqa/runtime/cases/weston.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75f0f2c..9588f2c 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -57,7 +57,7 @@ BASICTESTSUITE = "\ ping date df ssh scp python perl gi ptest parselogs \ logrotate connman systemd oe_syslog pam stap ldd xorg \ kernelmodule gcc buildcpio buildlzip buildgalculator \ - dnf rpm opkg apt" + dnf rpm opkg apt weston" DEFAULT_TEST_SUITES = "${BASICTESTSUITE}" diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py new file mode 100644 index 0000000..f32599a --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/weston.py @@ -0,0 +1,19 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfNotFeature +from oeqa.runtime.decorator.package import OEHasPackage + +class WestonTest(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['weston']) + def test_weston_running(self): + cmd ='%s | grep [w]eston-desktop-shell' % self.tc.target_cmds['ps'] + status, output = self.target.run(cmd) + msg = ('Weston does not appear to be running %s' % + self.target.run(self.tc.target_cmds['ps'])[1]) + self.assertEqual(status, 0, msg=msg) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:25 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (85b66b4 -> 688052a) Message-ID: <158195774579.5572.13449418872460382461@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 85b66b4 babeltrace: update to 1.5.8 discard 90657fd insane.bbclass: Correct typo inhert->inherit discard 9bc0afc systemd: upgrade v244.1 -> v244.3 discard 72d6031 fix various, innocuous typos discard 7992ab3 python3: resolve ncurses host contamination discard 56daf84 ptest-packagelists: mention ifupdown ptest in a comment discard a5e1b1f weston: add a basic runtime test discard dffada2 webkitgtk: x11 and wayland are not mutually exclusive new d9db0bb weston: add a basic runtime test new a69d801 ptest-packagelists: mention ifupdown ptest in a comment new 03fb910 python3: resolve ncurses host contamination new b4b251a fix various, innocuous typos new beb5431 systemd: upgrade v244.1 -> v244.3 new 250608b insane.bbclass: Correct typo inhert->inherit new 688052a babeltrace: update to 1.5.8 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (85b66b4) \ N -- N -- N refs/heads/master-next (688052a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:27 +0000 Subject: [oe-commits] [openembedded-core] 02/07: ptest-packagelists: mention ifupdown ptest in a comment In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164226.08EF2232833@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a69d8015d9ed92b932ac3c711184838620e99414 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:14 2020 +0100 ptest-packagelists: mention ifupdown ptest in a comment Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0a13bf0..23865ac 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -57,6 +57,7 @@ PTESTS_FAST = "\ # lz4-ptest \ # Needs a rewrite # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design +# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py #" PTESTS_SLOW = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:28 +0000 Subject: [oe-commits] [openembedded-core] 03/07: python3: resolve ncurses host contamination In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164226.13575232834@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 03fb91067faea31f314658e0e3d6ed4f238a78ed Author: Alexander Kanavin AuthorDate: Sun Feb 16 20:16:05 2020 +0100 python3: resolve ncurses host contamination Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...ysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...c-setup.py-do-not-add-a-curses-include-pa.patch | 48 ++++++++++++++++++++++ ...2-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 03f6008..e7af3c6 100644 --- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001 +From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch new file mode 100644 index 0000000..e04a916 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch @@ -0,0 +1,48 @@ +From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 17:50:25 +0100 +Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from + the host + +This leads to host contamination, and particularly can cause +curses modules to fail at runtime if the host curses is configured +differently to native curses (observed on current OpenSuse Tumbleweed +as dnf failures). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 6 ------ + setup.py | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 915f475..c911011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4828,12 +4828,6 @@ then + [Define if you have struct stat.st_mtimensec]) + fi + +-# first curses header check +-ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +-fi +- + AC_CHECK_HEADERS(curses.h ncurses.h) + + # On Solaris, term.h requires curses.h +diff --git a/setup.py b/setup.py +index b0f1541..7208cd0 100644 +--- a/setup.py ++++ b/setup.py +@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 6fe9839..61ac3e7 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001 +From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index c836066..7796852 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ + file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:29 +0000 Subject: [oe-commits] [openembedded-core] 04/07: fix various, innocuous typos In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164226.2830B232835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b4b251a9a1729d30cd6b71a169767c0b019d8905 Author: Robert P. J. Day AuthorDate: Sun Feb 16 08:23:02 2020 -0500 fix various, innocuous typos Corrections: - environment - accommodate - conversion - compatible Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/conf/licenses.conf | 2 +- meta/lib/oeqa/manual/eclipse-plugin.json | 6 +++--- meta/lib/oeqa/sdk/context.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 2 +- scripts/pybootchartgui/pybootchartgui/draw.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 9588f2c..01d8598 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -243,7 +243,7 @@ def testimage_main(d): if d.getVar("TEST_TARGET") == "qemu": fstypes = [fs for fs in fstypes if fs in supported_fstypes] if not fstypes: - bb.fatal('Unsupported image type built. Add a comptible image to ' + bb.fatal('Unsupported image type built. Add a compatible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) qfstype = fstypes[0] diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 1c586a3..751424d 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -1,7 +1,7 @@ # Standards are great! Everyone has their own. In an effort to standardize licensing # names, common-licenses will use the SPDX standard license names. In order to not # break the non-standardized license names that we find in LICENSE, we'll set -# up a bunch of VarFlags to accomodate non-SPDX license names. +# up a bunch of VarFlags to accommodate non-SPDX license names. # # We should really discuss standardizing this field, but that's a longer term goal. # For now, we can do this and it should grab the most common LICENSE naming variations. diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json index 9869150..d77d0e6 100644 --- a/meta/lib/oeqa/manual/eclipse-plugin.json +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -82,7 +82,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -164,7 +164,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -319,4 +319,4 @@ "summary": "Eclipse_Poky_installation_and_setup" } } -] \ No newline at end of file +] diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 09e77c1..01c38c2 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) if not sdk_envs: raise argparse_oe.ArgumentUsageError("No available SDK "\ - "enviroments found at %s" % args.sdk_dir, self.name) + "environments found at %s" % args.sdk_dir, self.name) if args.list_sdk_env: self._display_sdk_envs(logger.info, args, sdk_envs) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index e2f91bc..5886862 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): when building the kernel. """ kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') - # Clean up the enviroment + # Clean up the environment bitbake('%s -c clean' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 6d80827..d4664bd 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): def test_blob_to_dict(self): """ - Test convertion of git blobs to dictionary + Test conversion of git blobs to dictionary """ from oe.buildhistory_analysis import blob_to_dict valuesmap = { "foo" : "1", "bar" : "2" } diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py index add5c53..53324b9 100644 --- a/scripts/pybootchartgui/pybootchartgui/draw.py +++ b/scripts/pybootchartgui/pybootchartgui/draw.py @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second proc_h = 16 # the height of a process leg_s = 10 MIN_IMG_W = 800 -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs OPTIONS = None def extents(options, xscale, trace): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:31 +0000 Subject: [oe-commits] [openembedded-core] 06/07: insane.bbclass: Correct typo inhert->inherit In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164226.5D1FF232837@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 250608b40837cfeea1905224561afff3659ba5ec Author: Khem Raj AuthorDate: Sat Feb 15 15:23:38 2020 -0800 insane.bbclass: Correct typo inhert->inherit Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7425b8c..478240f 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -194,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages): """ if d.getVar("datadir") + "/mime/packages" in path and path.endswith('.xml') and not bb.data.inherits_class("mime", d): - package_qa_add_message(messages, "mime", "package contains mime types but does not inhert mime: %s path '%s'" % \ + package_qa_add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:32 +0000 Subject: [oe-commits] [openembedded-core] 07/07: babeltrace: update to 1.5.8 In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164226.7925023283A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 688052a94b9113bd75ae0ab6444f51fac29b15e6 Author: Anders Wallin AuthorDate: Mon Feb 17 14:34:05 2020 +0100 babeltrace: update to 1.5.8 updated HOMEPAGE to http://babeltrace.org/ updated LICENSE to include LGPLv2.1 Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- .../lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb similarity index 84% rename from meta/recipes-kernel/lttng/babeltrace_1.5.7.bb rename to meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index 05ef6d0..b6b7653 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -1,14 +1,14 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower" DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." -HOMEPAGE = "http://www.efficios.com/babeltrace/" +HOMEPAGE = "http://babeltrace.org/" BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" -LICENSE = "MIT & GPLv2" +LICENSE = "MIT & GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" -SRCREV = "d4014aeef4b89a4aaab1af42d7b0d143d62da0ff" +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 16:42:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 16:42:30 +0000 Subject: [oe-commits] [openembedded-core] 05/07: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158195774579.5572.13449418872460382461@git.openembedded.org> References: <158195774579.5572.13449418872460382461@git.openembedded.org> Message-ID: <20200217164226.43C86232836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit beb54313700f37fe73ae09186156f4c447ddeed7 Author: Alex Kiernan AuthorDate: Sun Feb 16 11:42:24 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use an additional cross-file instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 26 ++++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 14 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..f92c639 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,27 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 19:10:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 19:10:08 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: mpv: Disable lua support for riscv In-Reply-To: <158196660718.13680.12337998928098376983@git.openembedded.org> References: <158196660718.13680.12337998928098376983@git.openembedded.org> Message-ID: <20200217191007.AD34D232837@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9f3e738cbc917d728377a1f487b084304b67f2ff Author: Khem Raj AuthorDate: Sun Feb 16 23:50:23 2020 -0800 mpv: Disable lua support for riscv luajit port of risc-v does not exist yet Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index 066e18a..3d325e2 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -28,6 +28,8 @@ LUA_mips64 = "" LUA_aarch64 = "" LUA_powerpc64 = "" LUA_powerpc64le = "" +LUA_riscv64 = "" +LUA_riscv32 = "" LUA_powerpc = "" # Note: both lua and libass are required to get on-screen-display (controls) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 19:10:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 19:10:07 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (d459ead -> 7002e7d) Message-ID: <158196660718.13680.12337998928098376983@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from d459ead xfce4-whiskermenu-plugin: upgrade 2.3.5 -> 2.4.2 new 9f3e738 mpv: Disable lua support for riscv new cbe0b43 libgphoto2: remove executable permission bits of udev rule file new 416c4f7 perl: Add libperlio-gzip-perl and libjson-perl new 64441dc lcov: Add support for intermediate JSON format new 7002e7d lcov: Add missing missing RDEPEND and enable nativesdk The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-devtools/perl/libjson-perl_4.02000.bb | 22 + .../perl/libperlio-gzip-perl_0.20.bb | 30 + .../recipes-graphics/gphoto2/libgphoto2_2.5.23.bb | 2 +- meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 2 + ...info-Add-intermediate-text-format-support.patch | 898 +++++++++++++++++++++ ...info-Add-intermediate-JSON-format-support.patch | 247 ++++++ meta-oe/recipes-support/lcov/lcov_1.14.bb | 11 +- 7 files changed, 1210 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb create mode 100644 meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb create mode 100644 meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch create mode 100644 meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 19:10:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 19:10:09 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: libgphoto2: remove executable permission bits of udev rule file In-Reply-To: <158196660718.13680.12337998928098376983@git.openembedded.org> References: <158196660718.13680.12337998928098376983@git.openembedded.org> Message-ID: <20200217191007.BADAB23283A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cbe0b43010a870c2943358a5173731f4baaa2064 Author: Yi Zhao AuthorDate: Mon Feb 17 18:55:25 2020 +0800 libgphoto2: remove executable permission bits of udev rule file Fixes systemd-udevd warning: systemd-udevd[156]: Configuration file /etc/udev/rules.d/40-libgphoto2.rules is marked executable. Please remove executable permission bits. Proceeding anyway. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb index a3bdf9c..a012c49 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb @@ -34,7 +34,7 @@ do_configure_append() { do_install_append() { install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0755 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ } PACKAGES =+ "libgphotoport libgphoto2-camlibs" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 19:10:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 19:10:10 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: perl: Add libperlio-gzip-perl and libjson-perl In-Reply-To: <158196660718.13680.12337998928098376983@git.openembedded.org> References: <158196660718.13680.12337998928098376983@git.openembedded.org> Message-ID: <20200217191007.CA02923283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 416c4f7d5bc9cd129102923f6ab01e432403ed5f Author: Viktor Rosendahl AuthorDate: Mon Feb 17 17:39:35 2020 +0100 perl: Add libperlio-gzip-perl and libjson-perl We need to add these perl modules in order to make lcov compatible with gcc9. Signed-off-by: Viktor Rosendahl Signed-off-by: Khem Raj --- .../recipes-devtools/perl/libjson-perl_4.02000.bb | 22 ++++++++++++++++ .../perl/libperlio-gzip-perl_0.20.bb | 30 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb b/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb new file mode 100644 index 0000000..4e5a8a6 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb @@ -0,0 +1,22 @@ +SUMMARY = "Perl module to decode/encode json files" +DESCRIPTION = "This package contains the JSON.pm module with friends. \ +The module implements JSON encode/decode." + +HOMEPAGE = "https://metacpan.org/pod/JSON" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://README;beginline=1171;endline=1176;md5=3be2cb8159d094768e67386c453e8bbe" + +DEPENDS += "perl" + +SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https" + +SRCREV = "42a6324df654e92419512cee80c0b49155d9e56d" + +S = "${WORKDIR}/git" + +inherit cpan + +RDEPENDS_${PN} += "perl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb new file mode 100644 index 0000000..ffe7a7d --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb @@ -0,0 +1,30 @@ +SUMMARY = "Perl module to manipulate and access gzip files" +DESCRIPTION = "This package contains the gzip.pm module with friends. \ +The module implements perlio layer for gzip." + +HOMEPAGE = "https://metacpan.org/pod/PerlIO::gzip" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://README;beginline=55;endline=61;md5=bc3da2dec1fbea59ac91172c5e0eb837" + +DEPENDS += "perl" + +SRC_URI = "https://cpan.metacpan.org/authors/id/N/NW/NWCLARK/PerlIO-gzip-${PV}.tar.gz" + +SRC_URI[md5sum] = "0393eae5d0b23df6cf40ed44af7d711c" +SRC_URI[sha256sum] = "4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5" + +S = "${WORKDIR}/PerlIO-gzip-${PV}" + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +inherit cpan + +do_compile() { + export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" + cpan_do_compile +} + +RDEPENDS_${PN} += "perl perl-module-perlio" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 19:10:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 19:10:11 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: lcov: Add support for intermediate JSON format In-Reply-To: <158196660718.13680.12337998928098376983@git.openembedded.org> References: <158196660718.13680.12337998928098376983@git.openembedded.org> Message-ID: <20200217191007.DC91923283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 64441dc46b07cd0f4b13dc7f15eb910a74c3b0f8 Author: Viktor Rosendahl AuthorDate: Mon Feb 17 17:39:36 2020 +0100 lcov: Add support for intermediate JSON format gcc-9 uses this intermediate JSON format, so we will need these two patches to make lcov work again. Signed-off-by: Viktor Rosendahl Signed-off-by: Khem Raj --- ...info-Add-intermediate-text-format-support.patch | 898 +++++++++++++++++++++ ...info-Add-intermediate-JSON-format-support.patch | 247 ++++++ meta-oe/recipes-support/lcov/lcov_1.14.bb | 9 +- 3 files changed, 1153 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch b/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch new file mode 100644 index 0000000..9ac0770 --- /dev/null +++ b/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch @@ -0,0 +1,898 @@ +From ec3e1f411c332cbc2f2bc7ab7e2175ebf918b37a Mon Sep 17 00:00:00 2001 +From: Peter Oberparleiter +Date: Fri, 24 May 2019 16:56:52 +0200 +Subject: [PATCH 1/2] geninfo: Add intermediate text format support + +This change adds support for parsing the output of gcov's intermediate +text file format as implemented by GCC versions 5 to 8. The use of the +gcov intermediate format should increase processing speed. It also +provides branch coverage data when using the --initial command line +option. + +Users can control whether geninfo uses the intermediate format via the +geninfo_intermediate configuration file option. Valid values are: + + 0: Use normal text format + 1: Use intermediate format + auto: Use intermediate format if available. This is the default. + +Signed-off-by: Peter Oberparleiter +--- + bin/geninfo | 567 ++++++++++++++++++++++++++++++++++++++++++++------- + lcovrc | 3 + + man/lcovrc.5 | 24 +++ + 3 files changed, 521 insertions(+), 73 deletions(-) + +Upstream-Status: Backport +Download URL: https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7 + +diff --git a/bin/geninfo b/bin/geninfo +index f41eaec..0276666 100755 +--- a/bin/geninfo ++++ b/bin/geninfo +@@ -54,6 +54,8 @@ use warnings; + use File::Basename; + use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir + splitpath catpath/; ++use File::Temp qw(tempfile tempdir); ++use File::Copy qw(copy); + use Getopt::Long; + use Digest::MD5 qw(md5_base64); + use Cwd qw/abs_path/; +@@ -163,13 +165,13 @@ sub solve_relative_path($$); + sub read_gcov_header($); + sub read_gcov_file($); + sub info(@); ++sub process_intermediate($$$); + sub map_llvm_version($); + sub version_to_str($); + sub get_gcov_version(); + sub system_no_output($@); + sub read_config($); + sub apply_config($); +-sub get_exclusion_data($); + sub apply_exclusion_data($$); + sub process_graphfile($$); + sub filter_fn_name($); +@@ -264,6 +266,8 @@ our $gcno_split_crc; + our $func_coverage = 1; + our $br_coverage = 0; + our $rc_auto_base = 1; ++our $rc_intermediate = "auto"; ++our $intermediate; + our $excl_line = "LCOV_EXCL_LINE"; + our $excl_br_line = "LCOV_EXCL_BR_LINE"; + +@@ -331,6 +335,7 @@ if ($config || %opt_rc) + "geninfo_compat" => \$opt_compat, + "geninfo_adjust_src_path" => \$rc_adjust_src_path, + "geninfo_auto_base" => \$rc_auto_base, ++ "geninfo_intermediate" => \$rc_intermediate, + "lcov_function_coverage" => \$func_coverage, + "lcov_branch_coverage" => \$br_coverage, + "lcov_excl_line" => \$excl_line, +@@ -460,15 +465,38 @@ if (system_no_output(3, $gcov_tool, "--help") == -1) + } + + ($gcov_version, $gcov_version_string) = get_gcov_version(); ++$gcov_caps = get_gcov_capabilities(); ++ ++# Determine intermediate mode ++if ($rc_intermediate eq "0") { ++ $intermediate = 0; ++} elsif ($rc_intermediate eq "1") { ++ $intermediate = 1; ++} elsif (lc($rc_intermediate) eq "auto") { ++ # Use intermediate format if supported by gcov ++ $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0; ++} else { ++ die("ERROR: invalid value for geninfo_intermediate: ". ++ "'$rc_intermediate'\n"); ++} ++ ++if ($intermediate) { ++ info("Using intermediate gcov format\n"); ++ if ($opt_derive_func_data) { ++ warn("WARNING: --derive-func-data is not compatible with ". ++ "intermediate format - ignoring\n"); ++ $opt_derive_func_data = 0; ++ } ++} + + # Determine gcov options +-$gcov_caps = get_gcov_capabilities(); + push(@gcov_options, "-b") if ($gcov_caps->{'branch-probabilities'} && + ($br_coverage || $func_coverage)); + push(@gcov_options, "-c") if ($gcov_caps->{'branch-counts'} && + $br_coverage); + push(@gcov_options, "-a") if ($gcov_caps->{'all-blocks'} && +- $opt_gcov_all_blocks && $br_coverage); ++ $opt_gcov_all_blocks && $br_coverage && ++ !$intermediate); + if ($gcov_caps->{'hash-filenames'}) + { + push(@gcov_options, "-x"); +@@ -599,7 +627,7 @@ foreach my $entry (@data_directory) { + gen_info($entry); + } + +-if ($initial && $br_coverage) { ++if ($initial && $br_coverage && !$intermediate) { + warn("Note: --initial does not generate branch coverage ". + "data\n"); + } +@@ -768,6 +796,7 @@ sub gen_info($) + my $prefix; + my $type; + my $ext; ++ my $tempdir; + + if ($initial) { + $type = "graph"; +@@ -798,16 +827,22 @@ sub gen_info($) + $prefix = ""; + } + ++ $tempdir = tempdir(CLEANUP => 1); ++ + # Process all files in list + foreach $file (@file_list) { + # Process file +- if ($initial) { ++ if ($intermediate) { ++ process_intermediate($file, $prefix, $tempdir); ++ } elsif ($initial) { + process_graphfile($file, $prefix); + } else { + process_dafile($file, $prefix); + } + } + ++ unlink($tempdir); ++ + # Report whether files were excluded. + if (%excluded_files) { + info("Excluded data for %d files due to include/exclude options\n", +@@ -1058,10 +1093,12 @@ sub process_dafile($$) + + # Try to find base directory automatically if requested by user + if ($rc_auto_base) { +- $base_dir = find_base_from_graph($base_dir, $instr, $graph); ++ $base_dir = find_base_from_source($base_dir, ++ [ keys(%{$instr}), keys(%{$graph}) ]); + } + +- ($instr, $graph) = adjust_graph_filenames($base_dir, $instr, $graph); ++ adjust_source_filenames($instr, $base_dir); ++ adjust_source_filenames($graph, $base_dir); + + # Set $object_dir to real location of object files. This may differ + # from $da_dir if the graph file is just a link to the "real" object +@@ -2017,6 +2054,299 @@ sub read_gcov_file($) + } + + ++# ++# read_intermediate_text(gcov_filename, data) ++# ++# Read gcov intermediate text format in GCOV_FILENAME and add the resulting ++# data to DATA in the following format: ++# ++# data: source_filename -> file_data ++# file_data: concatenated lines of intermediate text data ++# ++ ++sub read_intermediate_text($$) ++{ ++ my ($gcov_filename, $data) = @_; ++ my $fd; ++ my $filename; ++ ++ open($fd, "<", $gcov_filename) or ++ die("ERROR: Could not read $gcov_filename: $!\n"); ++ while (my $line = <$fd>) { ++ if ($line =~ /^file:(.*)$/) { ++ $filename = $1; ++ chomp($filename); ++ } elsif (defined($filename)) { ++ $data->{$filename} .= $line; ++ } ++ } ++ close($fd); ++} ++ ++ ++# ++# intermediate_text_to_info(fd, data, srcdata) ++# ++# Write DATA in info format to file descriptor FD. ++# ++# data: filename -> file_data: ++# file_data: concatenated lines of intermediate text data ++# ++# srcdata: filename -> [ excl, brexcl, checksums ] ++# excl: lineno -> 1 for all lines for which to exclude all data ++# brexcl: lineno -> 1 for all lines for which to exclude branch data ++# checksums: lineno -> source code checksum ++# ++# Note: To simplify processing, gcov data is not combined here, that is counts ++# that appear multiple times for the same lines/branches are not added. ++# This is done by lcov/genhtml when reading the data files. ++# ++ ++sub intermediate_text_to_info($$$) ++{ ++ my ($fd, $data, $srcdata) = @_; ++ my $branch_num = 0; ++ my $c; ++ ++ return if (!%{$data}); ++ ++ print($fd "TN:$test_name\n"); ++ for my $filename (keys(%{$data})) { ++ my ($excl, $brexcl, $checksums); ++ ++ if (defined($srcdata->{$filename})) { ++ ($excl, $brexcl, $checksums) = @{$srcdata->{$filename}}; ++ } ++ ++ print($fd "SF:$filename\n"); ++ for my $line (split(/\n/, $data->{$filename})) { ++ if ($line =~ /^lcount:(\d+),(\d+),?/) { ++ # lcount:, ++ # lcount:,, ++ if ($checksum && exists($checksums->{$1})) { ++ $c = ",".$checksums->{$1}; ++ } else { ++ $c = ""; ++ } ++ print($fd "DA:$1,$2$c\n") if (!$excl->{$1}); ++ ++ # Intermediate text format does not provide ++ # branch numbers, and the same branch may appear ++ # multiple times on the same line (e.g. in ++ # template instances). Synthesize a branch ++ # number based on the assumptions: ++ # a) the order of branches is fixed across ++ # instances ++ # b) an instance starts with an lcount line ++ $branch_num = 0; ++ } elsif ($line =~ /^function:(\d+),(\d+),([^,]+)$/) { ++ next if (!$func_coverage || $excl->{$1}); ++ ++ # function:,, ++ print($fd "FN:$1,$3\n"); ++ print($fd "FNDA:$2,$3\n"); ++ } elsif ($line =~ /^function:(\d+),\d+,(\d+),([^,]+)$/) { ++ next if (!$func_coverage || $excl->{$1}); ++ ++ # function:,,, ++ # ++ print($fd "FN:$1,$3\n"); ++ print($fd "FNDA:$2,$3\n"); ++ } elsif ($line =~ /^branch:(\d+),(taken|nottaken|notexec)/) { ++ next if (!$br_coverage || $excl->{$1} || ++ $brexcl->{$1}); ++ ++ # branch:,taken|nottaken|notexec ++ if ($2 eq "taken") { ++ $c = 1; ++ } elsif ($2 eq "nottaken") { ++ $c = 0; ++ } else { ++ $c = "-"; ++ } ++ print($fd "BRDA:$1,0,$branch_num,$c\n"); ++ $branch_num++; ++ } ++ } ++ print($fd "end_of_record\n"); ++ } ++} ++ ++ ++sub get_output_fd($$) ++{ ++ my ($outfile, $file) = @_; ++ my $fd; ++ ++ if (!defined($outfile)) { ++ open($fd, ">", "$file.info") or ++ die("ERROR: Cannot create file $file.info: $!\n"); ++ } elsif ($outfile eq "-") { ++ open($fd, ">&STDOUT") or ++ die("ERROR: Cannot duplicate stdout: $!\n"); ++ } else { ++ open($fd, ">>", $outfile) or ++ die("ERROR: Cannot write to file $outfile: $!\n"); ++ } ++ ++ return $fd; ++} ++ ++ ++# ++# print_gcov_warnings(stderr_file, is_graph, map) ++# ++# Print GCOV warnings in file STDERR_FILE to STDERR. If IS_GRAPH is non-zero, ++# suppress warnings about missing as these are expected. Replace keys found ++# in MAP with their values. ++# ++ ++sub print_gcov_warnings($$$) ++{ ++ my ($stderr_file, $is_graph, $map) = @_; ++ my $fd; ++ ++ if (!open($fd, "<", $stderr_file)) { ++ warn("WARNING: Could not open GCOV stderr file ". ++ "$stderr_file: $!\n"); ++ return; ++ } ++ while (my $line = <$fd>) { ++ next if ($is_graph && $line =~ /cannot open data file/); ++ ++ for my $key (keys(%{$map})) { ++ $line =~ s/\Q$key\E/$map->{$key}/g; ++ } ++ ++ print(STDERR $line); ++ } ++ close($fd); ++} ++ ++ ++# ++# process_intermediate(file, dir, tempdir) ++# ++# Create output for a single file (either a data file or a graph file) using ++# gcov's intermediate option. ++# ++ ++sub process_intermediate($$$) ++{ ++ my ($file, $dir, $tempdir) = @_; ++ my ($fdir, $fbase, $fext); ++ my $data_file; ++ my $errmsg; ++ my %data; ++ my $fd; ++ my $base; ++ my $srcdata; ++ my $is_graph = 0; ++ my ($out, $err, $rc); ++ ++ info("Processing %s\n", abs2rel($file, $dir)); ++ ++ $file = solve_relative_path($cwd, $file); ++ ($fdir, $fbase, $fext) = split_filename($file); ++ ++ $is_graph = 1 if (".$fext" eq $graph_file_extension); ++ ++ if ($is_graph) { ++ # Process graph file - copy to temp directory to prevent ++ # accidental processing of associated data file ++ $data_file = "$tempdir/$fbase$graph_file_extension"; ++ if (!copy($file, $data_file)) { ++ $errmsg = "ERROR: Could not copy file $file"; ++ goto err; ++ } ++ } else { ++ # Process data file in place ++ $data_file = $file; ++ } ++ ++ # Change directory ++ if (!chdir($tempdir)) { ++ $errmsg = "Could not change to directory $tempdir: $!"; ++ goto err; ++ } ++ ++ # Run gcov on data file ++ ($out, $err, $rc) = system_no_output(1 + 2 + 4, $gcov_tool, ++ $data_file, @gcov_options, "-i"); ++ defined($out) && unlink($out); ++ if (defined($err)) { ++ print_gcov_warnings($err, $is_graph, { ++ $data_file => $file, ++ }); ++ unlink($err); ++ } ++ if ($rc) { ++ $errmsg = "GCOV failed for $file"; ++ goto err; ++ } ++ ++ if ($is_graph) { ++ # Remove graph file copy ++ unlink($data_file); ++ } ++ ++ # Parse resulting file(s) ++ for my $gcov_filename (glob("*.gcov")) { ++ read_intermediate_text($gcov_filename, \%data); ++ unlink($gcov_filename); ++ } ++ ++ if (!%data) { ++ warn("WARNING: GCOV did not produce any data for $file\n"); ++ return; ++ } ++ ++ # Determine base directory ++ if (defined($base_directory)) { ++ $base = $base_directory; ++ } else { ++ $base = $fdir; ++ ++ if (is_compat($COMPAT_MODE_LIBTOOL)) { ++ # Avoid files from .libs dirs ++ $base =~ s/\.libs$//; ++ } ++ ++ # Try to find base directory automatically if requested by user ++ if ($rc_auto_base) { ++ $base = find_base_from_source($base, [ keys(%data) ]); ++ } ++ } ++ ++ # Apply base file name to relative source files ++ adjust_source_filenames(\%data, $base); ++ ++ # Remove excluded source files ++ filter_source_files(\%data); ++ ++ # Get data on exclusion markers and checksums if requested ++ if (!$no_markers || $checksum) { ++ $srcdata = get_all_source_data(keys(%data)); ++ } ++ ++ # Generate output ++ $fd = get_output_fd($output_filename, $file); ++ intermediate_text_to_info($fd, \%data, $srcdata); ++ close($fd); ++ ++ chdir($cwd); ++ ++ return; ++ ++err: ++ if ($ignore[$ERROR_GCOV]) { ++ warn("WARNING: $errmsg!\n"); ++ } else { ++ die("ERROR: $errmsg!\n") ++ } ++} ++ ++ + # Map LLVM versions to the version of GCC gcov which they emulate. + + sub map_llvm_version($) +@@ -2151,8 +2481,12 @@ sub int_handler() + # + # MODE & 1: suppress STDOUT + # MODE & 2: suppress STDERR ++# MODE & 4: redirect to temporary files instead of suppressing + # +-# Return 0 on success, non-zero otherwise. ++# Return (stdout, stderr, rc): ++# stdout: path to tempfile containing stdout or undef ++# stderr: path to tempfile containing stderr or undef ++# 0 on success, non-zero otherwise + # + + sub system_no_output($@) +@@ -2161,14 +2495,31 @@ sub system_no_output($@) + my $result; + local *OLD_STDERR; + local *OLD_STDOUT; ++ my $stdout_file; ++ my $stderr_file; ++ my $fd; + + # Save old stdout and stderr handles + ($mode & 1) && open(OLD_STDOUT, ">>&", "STDOUT"); + ($mode & 2) && open(OLD_STDERR, ">>&", "STDERR"); + +- # Redirect to /dev/null +- ($mode & 1) && open(STDOUT, ">", "/dev/null"); +- ($mode & 2) && open(STDERR, ">", "/dev/null"); ++ if ($mode & 4) { ++ # Redirect to temporary files ++ if ($mode & 1) { ++ ($fd, $stdout_file) = tempfile(UNLINK => 1); ++ open(STDOUT, ">", $stdout_file) || warn("$!\n"); ++ close($fd); ++ } ++ if ($mode & 2) { ++ ($fd, $stderr_file) = tempfile(UNLINK => 1); ++ open(STDERR, ">", $stderr_file) || warn("$!\n"); ++ close($fd); ++ } ++ } else { ++ # Redirect to /dev/null ++ ($mode & 1) && open(STDOUT, ">", "/dev/null"); ++ ($mode & 2) && open(STDERR, ">", "/dev/null"); ++ } + + debug("system(".join(' ', @_).")\n"); + system(@_); +@@ -2181,8 +2532,18 @@ sub system_no_output($@) + # Restore old handles + ($mode & 1) && open(STDOUT, ">>&", "OLD_STDOUT"); + ($mode & 2) && open(STDERR, ">>&", "OLD_STDERR"); ++ ++ # Remove empty output files ++ if (defined($stdout_file) && -z $stdout_file) { ++ unlink($stdout_file); ++ $stdout_file = undef; ++ } ++ if (defined($stderr_file) && -z $stderr_file) { ++ unlink($stderr_file); ++ $stderr_file = undef; ++ } + +- return $result; ++ return ($stdout_file, $stderr_file, $result); + } + + +@@ -2260,23 +2621,28 @@ sub apply_config($) + + + # +-# get_exclusion_data(filename) ++# get_source_data(filename) + # +-# Scan specified source code file for exclusion markers and return +-# linenumber -> 1 +-# for all lines which should be excluded. ++# Scan specified source code file for exclusion markers and checksums. Return ++# ( excl, brexcl, checksums ) where ++# excl: lineno -> 1 for all lines for which to exclude all data ++# brexcl: lineno -> 1 for all lines for which to exclude branch data ++# checksums: lineno -> source code checksum + # + +-sub get_exclusion_data($) ++sub get_source_data($) + { + my ($filename) = @_; + my %list; + my $flag = 0; ++ my %brdata; ++ my $brflag = 0; ++ my %checksums; + local *HANDLE; + + if (!open(HANDLE, "<", $filename)) { + warn("WARNING: could not open $filename\n"); +- return undef; ++ return; + } + while () { + if (/$EXCL_STOP/) { +@@ -2287,14 +2653,62 @@ sub get_exclusion_data($) + if (/$excl_line/ || $flag) { + $list{$.} = 1; + } ++ if (/$EXCL_BR_STOP/) { ++ $brflag = 0; ++ } elsif (/$EXCL_BR_START/) { ++ $brflag = 1; ++ } ++ if (/$excl_br_line/ || $brflag) { ++ $brdata{$.} = 1; ++ } ++ if ($checksum) { ++ chomp(); ++ $checksums{$.} = md5_base64($_); ++ } + } + close(HANDLE); + +- if ($flag) { ++ if ($flag || $brflag) { + warn("WARNING: unterminated exclusion section in $filename\n"); + } + +- return \%list; ++ return (\%list, \%brdata, \%checksums); ++} ++ ++ ++# ++# get_all_source_data(filenames) ++# ++# Scan specified source code files for exclusion markers and return ++# filename -> [ excl, brexcl, checksums ] ++# excl: lineno -> 1 for all lines for which to exclude all data ++# brexcl: lineno -> 1 for all lines for which to exclude branch data ++# checksums: lineno -> source code checksum ++# ++ ++sub get_all_source_data(@) ++{ ++ my @filenames = @_; ++ my %data; ++ my $failed = 0; ++ ++ for my $filename (@filenames) { ++ my @d; ++ next if (exists($data{$filename})); ++ ++ @d = get_source_data($filename); ++ if (@d) { ++ $data{$filename} = [ @d ]; ++ } else { ++ $failed = 1; ++ } ++ } ++ ++ if ($failed) { ++ warn("WARNING: some exclusion markers may be ignored\n"); ++ } ++ ++ return \%data; + } + + +@@ -2318,35 +2732,17 @@ sub apply_exclusion_data($$) + { + my ($instr, $graph) = @_; + my $filename; +- my %excl_data; +- my $excl_read_failed = 0; ++ my $excl_data; + +- # Collect exclusion marker data +- foreach $filename (sort_uniq_lex(keys(%{$graph}), keys(%{$instr}))) { +- my $excl = get_exclusion_data($filename); +- +- # Skip and note if file could not be read +- if (!defined($excl)) { +- $excl_read_failed = 1; +- next; +- } +- +- # Add to collection if there are markers +- $excl_data{$filename} = $excl if (keys(%{$excl}) > 0); +- } +- +- # Warn if not all source files could be read +- if ($excl_read_failed) { +- warn("WARNING: some exclusion markers may be ignored\n"); +- } ++ ($excl_data) = get_all_source_data(keys(%{$graph}), keys(%{$instr})); + + # Skip if no markers were found +- return ($instr, $graph) if (keys(%excl_data) == 0); ++ return ($instr, $graph) if (!%$excl_data); + + # Apply exclusion marker data to graph +- foreach $filename (keys(%excl_data)) { ++ foreach $filename (keys(%$excl_data)) { + my $function_data = $graph->{$filename}; +- my $excl = $excl_data{$filename}; ++ my $excl = $excl_data->{$filename}->[0]; + my $function; + + next if (!defined($function_data)); +@@ -2384,9 +2780,9 @@ sub apply_exclusion_data($$) + } + + # Apply exclusion marker data to instr +- foreach $filename (keys(%excl_data)) { ++ foreach $filename (keys(%$excl_data)) { + my $line_data = $instr->{$filename}; +- my $excl = $excl_data{$filename}; ++ my $excl = $excl_data->{$filename}->[0]; + my $line; + my @new_data; + +@@ -2468,10 +2864,12 @@ sub process_graphfile($$) + + # Try to find base directory automatically if requested by user + if ($rc_auto_base) { +- $base_dir = find_base_from_graph($base_dir, $instr, $graph); ++ $base_dir = find_base_from_source($base_dir, ++ [ keys(%{$instr}), keys(%{$graph}) ]); + } + +- ($instr, $graph) = adjust_graph_filenames($base_dir, $instr, $graph); ++ adjust_source_filenames($instr, $base_dir); ++ adjust_source_filenames($graph, $base_dir); + + if (!$no_markers) { + # Apply exclusion marker data to graph file data +@@ -2767,11 +3165,11 @@ sub parent_dir($) + } + + # +-# find_base_from_graph(base_dir, instr, graph) ++# find_base_from_source(base_dir, source_files) + # +-# Try to determine the base directory of the graph file specified by INSTR +-# and GRAPH. The base directory is the base for all relative filenames in +-# the graph file. It is defined by the current working directory at time ++# Try to determine the base directory of the object file built from ++# SOURCE_FILES. The base directory is the base for all relative filenames in ++# the gcov data. It is defined by the current working directory at time + # of compiling the source file. + # + # This function implements a heuristic which relies on the following +@@ -2781,16 +3179,16 @@ sub parent_dir($) + # - files by the same name are not present in multiple parent directories + # + +-sub find_base_from_graph($$$) ++sub find_base_from_source($$) + { +- my ($base_dir, $instr, $graph) = @_; ++ my ($base_dir, $source_files) = @_; + my $old_base; + my $best_miss; + my $best_base; + my %rel_files; + + # Determine list of relative paths +- foreach my $filename (keys(%{$instr}), keys(%{$graph})) { ++ foreach my $filename (@$source_files) { + next if (file_name_is_absolute($filename)); + + $rel_files{$filename} = 1; +@@ -2829,17 +3227,17 @@ sub find_base_from_graph($$$) + } + + # +-# adjust_graph_filenames(base_dir, instr, graph) ++# adjust_source_filenames(hash, base_dir) + # +-# Make relative paths in INSTR and GRAPH absolute and apply +-# geninfo_adjust_src_path setting to graph file data. ++# Transform all keys of HASH to absolute form and apply requested ++# transformations. + # + +-sub adjust_graph_filenames($$$) ++sub adjust_source_filenames($$$) + { +- my ($base_dir, $instr, $graph) = @_; ++ my ($hash, $base_dir) = @_; + +- foreach my $filename (keys(%{$instr})) { ++ foreach my $filename (keys(%{$hash})) { + my $old_filename = $filename; + + # Convert to absolute canonical form +@@ -2851,28 +3249,50 @@ sub adjust_graph_filenames($$$) + } + + if ($filename ne $old_filename) { +- $instr->{$filename} = delete($instr->{$old_filename}); ++ $hash->{$filename} = delete($hash->{$old_filename}); + } + } ++} + +- foreach my $filename (keys(%{$graph})) { +- my $old_filename = $filename; + +- # Make absolute +- # Convert to absolute canonical form +- $filename = solve_relative_path($base_dir, $filename); ++# ++# filter_source_files(hash) ++# ++# Remove unwanted source file data from HASH. ++# + +- # Apply adjustment +- if (defined($adjust_src_pattern)) { +- $filename =~ s/$adjust_src_pattern/$adjust_src_replace/g; ++sub filter_source_files($) ++{ ++ my ($hash) = @_; ++ ++ foreach my $filename (keys(%{$hash})) { ++ # Skip external files if requested ++ goto del if (!$opt_external && is_external($filename)); ++ ++ # Apply include patterns ++ if (@include_patterns) { ++ my $keep; ++ ++ foreach my $pattern (@include_patterns) { ++ if ($filename =~ (/^$pattern$/)) { ++ $keep = 1; ++ last; ++ } ++ } ++ goto del if (!$keep); + } + +- if ($filename ne $old_filename) { +- $graph->{$filename} = delete($graph->{$old_filename}); ++ # Apply exclude patterns ++ foreach my $pattern (@exclude_patterns) { ++ goto del if ($filename =~ (/^$pattern$/)); + } +- } ++ next; + +- return ($instr, $graph); ++del: ++ # Remove file data ++ delete($hash->{$filename}); ++ $excluded_files{$filename} = 1; ++ } + } + + # +@@ -3784,6 +4204,7 @@ sub get_gcov_capabilities() + 'c' => 'branch-counts', + 'f' => 'function-summaries', + 'h' => 'help', ++ 'i' => 'intermediate-format', + 'l' => 'long-file-names', + 'n' => 'no-output', + 'o' => 'object-directory', +diff --git a/lcovrc b/lcovrc +index 40f364f..bd4bc3b 100644 +--- a/lcovrc ++++ b/lcovrc +@@ -134,6 +134,9 @@ genhtml_desc_html=0 + # when collecting coverage data. + geninfo_auto_base = 1 + ++# Use gcov intermediate format? Valid values are 0, 1, auto ++geninfo_intermediate = auto ++ + # Directory containing gcov kernel files + # lcov_gcov_dir = /proc/gcov + +diff --git a/man/lcovrc.5 b/man/lcovrc.5 +index f20d273..bf0ce7a 100644 +--- a/man/lcovrc.5 ++++ b/man/lcovrc.5 +@@ -223,6 +223,11 @@ geninfo_compat_libtool = 0 + geninfo_auto_base = 1 + .br + ++# Use gcov intermediate format? Valid values are 0, 1, auto ++.br ++geninfo_intermediate = auto ++.br ++ + # Directory containing gcov kernel files + .br + lcov_gcov_dir = /proc/gcov +@@ -789,6 +794,25 @@ located, and in addition, is different between files of the same project. + Default is 1. + .PP + ++.BR geninfo_intermediate " =" ++.IR 0 | 1 | auto ++.IP ++Specify whether to use gcov intermediate format ++.br ++ ++Use this option to control whether geninfo should use the gcov intermediate ++format while collecting coverage data. The use of the gcov intermediate format ++should increase processing speed. It also provides branch coverage data when ++using the \-\-initial command line option. ++.br ++ ++Valid values are 0 for off, 1 for on, and "auto" to let geninfo automatically ++use immediate format when supported by gcov. ++.br ++ ++Default is "auto". ++.PP ++ + .BR lcov_gcov_dir " =" + .I path_to_kernel_coverage_data + .IP +-- +2.17.1 + diff --git a/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch b/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch new file mode 100644 index 0000000..7b18063 --- /dev/null +++ b/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch @@ -0,0 +1,247 @@ +From e13b2b6f8443da660cafa0679c3b16240843ce9f Mon Sep 17 00:00:00 2001 +From: Peter Oberparleiter +Date: Fri, 24 May 2019 17:16:56 +0200 +Subject: [PATCH 2/2] geninfo: Add intermediate JSON format support + +This change adds support for parsing the output of gcov's intermediate +JSON file format as implemented by GCC version 9. + +Note: The way that the intermediate file format support is implemented +in geninfo removes the need to parse .gcno files directly. Since geninfo +does not include support for parsing GCC 9 .gcno files, using the +intermediate format is the only option for geninfo to collect coverage +data generated by GCC version 9. + +Signed-off-by: Peter Oberparleiter +--- + bin/geninfo | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 160 insertions(+), 2 deletions(-) + +Upstream-Status: Backport +Download URL: https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da + +diff --git a/bin/geninfo b/bin/geninfo +index 0276666..cceb782 100755 +--- a/bin/geninfo ++++ b/bin/geninfo +@@ -59,6 +59,9 @@ use File::Copy qw(copy); + use Getopt::Long; + use Digest::MD5 qw(md5_base64); + use Cwd qw/abs_path/; ++use PerlIO::gzip; ++use JSON qw(decode_json); ++ + if( $^O eq "msys" ) + { + require File::Spec::Win32; +@@ -474,7 +477,8 @@ if ($rc_intermediate eq "0") { + $intermediate = 1; + } elsif (lc($rc_intermediate) eq "auto") { + # Use intermediate format if supported by gcov +- $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0; ++ $intermediate = ($gcov_caps->{'intermediate-format'} || ++ $gcov_caps->{'json-format'}) ? 1 : 0; + } else { + die("ERROR: invalid value for geninfo_intermediate: ". + "'$rc_intermediate'\n"); +@@ -2084,6 +2088,48 @@ sub read_intermediate_text($$) + } + + ++# ++# read_intermediate_json(gcov_filename, data, basedir_ref) ++# ++# Read gcov intermediate JSON format in GCOV_FILENAME and add the resulting ++# data to DATA in the following format: ++# ++# data: source_filename -> file_data ++# file_data: GCOV JSON data for file ++# ++# Also store the value for current_working_directory to BASEDIR_REF. ++# ++ ++sub read_intermediate_json($$$) ++{ ++ my ($gcov_filename, $data, $basedir_ref) = @_; ++ my $fd; ++ my $text; ++ my $json; ++ ++ open($fd, "<:gzip", $gcov_filename) or ++ die("ERROR: Could not read $gcov_filename: $!\n"); ++ local $/; ++ $text = <$fd>; ++ close($fd); ++ ++ $json = decode_json($text); ++ if (!defined($json) || !exists($json->{"files"}) || ++ ref($json->{"files"} ne "ARRAY")) { ++ die("ERROR: Unrecognized JSON output format in ". ++ "$gcov_filename\n"); ++ } ++ ++ $$basedir_ref = $json->{"current_working_directory"}; ++ ++ for my $file (@{$json->{"files"}}) { ++ my $filename = $file->{"file"}; ++ ++ $data->{$filename} = $file; ++ } ++} ++ ++ + # + # intermediate_text_to_info(fd, data, srcdata) + # +@@ -2173,6 +2219,104 @@ sub intermediate_text_to_info($$$) + } + + ++# ++# intermediate_json_to_info(fd, data, srcdata) ++# ++# Write DATA in info format to file descriptor FD. ++# ++# data: filename -> file_data: ++# file_data: GCOV JSON data for file ++# ++# srcdata: filename -> [ excl, brexcl, checksums ] ++# excl: lineno -> 1 for all lines for which to exclude all data ++# brexcl: lineno -> 1 for all lines for which to exclude branch data ++# checksums: lineno -> source code checksum ++# ++# Note: To simplify processing, gcov data is not combined here, that is counts ++# that appear multiple times for the same lines/branches are not added. ++# This is done by lcov/genhtml when reading the data files. ++# ++ ++sub intermediate_json_to_info($$$) ++{ ++ my ($fd, $data, $srcdata) = @_; ++ my $branch_num = 0; ++ ++ return if (!%{$data}); ++ ++ print($fd "TN:$test_name\n"); ++ for my $filename (keys(%{$data})) { ++ my ($excl, $brexcl, $checksums); ++ my $file_data = $data->{$filename}; ++ ++ if (defined($srcdata->{$filename})) { ++ ($excl, $brexcl, $checksums) = @{$srcdata->{$filename}}; ++ } ++ ++ print($fd "SF:$filename\n"); ++ ++ # Function data ++ if ($func_coverage) { ++ for my $d (@{$file_data->{"functions"}}) { ++ my $line = $d->{"start_line"}; ++ my $count = $d->{"execution_count"}; ++ my $name = $d->{"name"}; ++ ++ next if (!defined($line) || !defined($count) || ++ !defined($name) || $excl->{$line}); ++ ++ print($fd "FN:$line,$name\n"); ++ print($fd "FNDA:$count,$name\n"); ++ } ++ } ++ ++ # Line data ++ for my $d (@{$file_data->{"lines"}}) { ++ my $line = $d->{"line_number"}; ++ my $count = $d->{"count"}; ++ my $c; ++ my $branches = $d->{"branches"}; ++ my $unexec = $d->{"unexecuted_block"}; ++ ++ next if (!defined($line) || !defined($count) || ++ $excl->{$line}); ++ ++ if (defined($unexec) && $unexec && $count == 0) { ++ $unexec = 1; ++ } else { ++ $unexec = 0; ++ } ++ ++ if ($checksum && exists($checksums->{$line})) { ++ $c = ",".$checksums->{$line}; ++ } else { ++ $c = ""; ++ } ++ print($fd "DA:$line,$count$c\n"); ++ ++ $branch_num = 0; ++ # Branch data ++ if ($br_coverage && !$brexcl->{$line}) { ++ for my $b (@$branches) { ++ my $brcount = $b->{"count"}; ++ ++ if (!defined($brcount) || $unexec) { ++ $brcount = "-"; ++ } ++ print($fd "BRDA:$line,0,$branch_num,". ++ "$brcount\n"); ++ ++ $branch_num++; ++ } ++ } ++ ++ } ++ ++ print($fd "end_of_record\n"); ++ } ++} ++ ++ + sub get_output_fd($$) + { + my ($outfile, $file) = @_; +@@ -2243,6 +2387,8 @@ sub process_intermediate($$$) + my $srcdata; + my $is_graph = 0; + my ($out, $err, $rc); ++ my $json_basedir; ++ my $json_format; + + info("Processing %s\n", abs2rel($file, $dir)); + +@@ -2296,6 +2442,12 @@ sub process_intermediate($$$) + unlink($gcov_filename); + } + ++ for my $gcov_filename (glob("*.gcov.json.gz")) { ++ read_intermediate_json($gcov_filename, \%data, \$json_basedir); ++ unlink($gcov_filename); ++ $json_format = 1; ++ } ++ + if (!%data) { + warn("WARNING: GCOV did not produce any data for $file\n"); + return; +@@ -2304,6 +2456,8 @@ sub process_intermediate($$$) + # Determine base directory + if (defined($base_directory)) { + $base = $base_directory; ++ } elsif (defined($json_basedir)) { ++ $base = $json_basedir; + } else { + $base = $fdir; + +@@ -2331,7 +2485,11 @@ sub process_intermediate($$$) + + # Generate output + $fd = get_output_fd($output_filename, $file); +- intermediate_text_to_info($fd, \%data, $srcdata); ++ if ($json_format) { ++ intermediate_json_to_info($fd, \%data, $srcdata); ++ } else { ++ intermediate_text_to_info($fd, \%data, $srcdata); ++ } + close($fd); + + chdir($cwd); +-- +2.17.1 + diff --git a/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-oe/recipes-support/lcov/lcov_1.14.bb index 26e797a..484b1af 100755 --- a/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.14.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" RDEPENDS_${PN} += " \ gcov \ + libjson-perl \ + libperlio-gzip-perl \ perl \ perl-module-filehandle \ perl-module-getopt-std \ @@ -19,6 +21,7 @@ RDEPENDS_${PN} += " \ perl-module-cwd \ perl-module-errno \ perl-module-file-basename \ + perl-module-file-copy \ perl-module-file-find \ perl-module-file-path \ perl-module-file-spec \ @@ -42,7 +45,11 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " -SRC_URI = "http://downloads.sourceforge.net/ltp/${BP}.tar.gz" +SRC_URI = " \ + http://downloads.sourceforge.net/ltp/${BP}.tar.gz \ + file://0001-geninfo-Add-intermediate-text-format-support.patch \ + file://0002-geninfo-Add-intermediate-JSON-format-support.patch \ + " SRC_URI[md5sum] = "0220d01753469f83921f8f41ae5054c1" SRC_URI[sha256sum] = "14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 19:10:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 19:10:12 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: lcov: Add missing missing RDEPEND and enable nativesdk In-Reply-To: <158196660718.13680.12337998928098376983@git.openembedded.org> References: <158196660718.13680.12337998928098376983@git.openembedded.org> Message-ID: <20200217191007.EA37D23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7002e7dd3767755c2b6ea7ccbecf6f78822e8eb0 Author: Viktor Rosendahl AuthorDate: Mon Feb 17 17:39:37 2020 +0100 lcov: Add missing missing RDEPEND and enable nativesdk It seems like geninfo is depending on gcov-symlinks, so it should be added here. Also, lcov is useful in SDKs, so let's enable the building of native and nativesdk packages. Signed-off-by: Viktor Rosendahl Signed-off-by: Khem Raj --- meta-oe/recipes-support/lcov/lcov_1.14.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-oe/recipes-support/lcov/lcov_1.14.bb index 484b1af..1471818 100755 --- a/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.14.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" RDEPENDS_${PN} += " \ gcov \ + gcov-symlinks \ libjson-perl \ libperlio-gzip-perl \ perl \ @@ -58,3 +59,4 @@ do_install() { oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} } +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 23:12:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 23:12:09 +0000 Subject: [oe-commits] [bitbake] branch master updated: cooker/siggen: Empty siggen cache during parsing Message-ID: <158198112934.24489.8717042097986275611@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new 5d98d8e cooker/siggen: Empty siggen cache during parsing 5d98d8e is described below commit 5d98d8e39bba42f458532b1eef3619f2321d8a2b Author: Richard Purdie AuthorDate: Mon Feb 17 16:18:25 2020 +0000 cooker/siggen: Empty siggen cache during parsing When parsing recipes its apparent the memory usage of bitbake rises linearly with number of recipes parsed. It shouldn't. Using tracemalloc (thanks for the tip Joshua Lock) it was clear that the dependency information left behind in siggen was the culprit. Add a new method to allow us to drop this information. We don't need it after the recipe has been parsed and hashes calculated (at runtime its different but only the currently executing task would be in memory). This should give signficant memory usage improvements for bitbake and that in turn should help speed on more constrained systems, as well as when used in multiconfig environments. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 3 ++- lib/bb/siggen.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 1124332..a05630d 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1940,7 +1940,8 @@ class Parser(multiprocessing.Process): except IndexError: break result = self.parse(*job) - + # Clear the siggen cache after parsing to control memory usage, its huge + bb.parse.siggen.postparsing_clean_cache() try: self.results.put(result, timeout=0.25) except queue.Full: diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ffd8fca..c2d0c73 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -51,6 +51,9 @@ class SignatureGenerator(object): def finalise(self, fn, d, varient): return + def postparsing_clean_cache(self): + return + def get_unihash(self, tid): return self.taskhash[tid] @@ -188,6 +191,14 @@ class SignatureGeneratorBasic(SignatureGenerator): for task in taskdeps: d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + ":" + task]) + def postparsing_clean_cache(self): + # + # After parsing we can remove some things from memory to reduce our memory footprint + # + self.gendeps = {} + self.lookupcache = {} + self.taskdeps = {} + def rundep_check(self, fn, recipename, task, dep, depname, dataCache): # Return True if we should keep the dependency, False to drop it # We only manipulate the dependencies for packages not in the whitelist -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 23:12:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 23:12:15 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (b4de909 -> 0771b3a) Message-ID: <158198113541.24735.17336777221669326595@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard b4de909 cooker/siggen: Empty siggen cache during parsing discard 5969cd3 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" discard 6259785 fetch2: Make fetcher_compare_revisions() work discard 39cf3d1 knotty: Make the bb.command.CommandExit event terminate bitbake discard 7ab55bb runqueue: Possible tid handling optimisation add 5d98d8e cooker/siggen: Empty siggen cache during parsing new dc7d32f runqueue: Possible tid handling optimisation new 01ff109 knotty: Make the bb.command.CommandExit event terminate bitbake new 35cf83c fetch2: Make fetcher_compare_revisions() work new 0771b3a fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b4de909) \ N -- N -- N refs/heads/master-next (0771b3a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 23:12:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 23:12:16 +0000 Subject: [oe-commits] [bitbake] 01/04: runqueue: Possible tid handling optimisation In-Reply-To: <158198113541.24735.17336777221669326595@git.openembedded.org> References: <158198113541.24735.17336777221669326595@git.openembedded.org> Message-ID: <20200217231215.8E8C123283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit dc7d32ff46095cacfa71269da7f1ccb97ddf7b1c Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? References: <158198113541.24735.17336777221669326595@git.openembedded.org> Message-ID: <20200217231215.9C78B23283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 01ff1090241ca6c478334046fdd9811985e00a74 Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:53 2020 +0100 knotty: Make the bb.command.CommandExit event terminate bitbake This matches the other bb.command.Command* events and without it, running `bitbake --revisions-changed` will hang indefinitely if there are changed revisions. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index a0340df..cbb289b 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -590,6 +590,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): if isinstance(event, bb.command.CommandExit): if not return_value: return_value = event.exitcode + main.shutdown = 2 continue if isinstance(event, (bb.command.CommandCompleted, bb.cooker.CookerExit)): main.shutdown = 2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 23:12:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 23:12:19 +0000 Subject: [oe-commits] [bitbake] 04/04: fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" In-Reply-To: <158198113541.24735.17336777221669326595@git.openembedded.org> References: <158198113541.24735.17336777221669326595@git.openembedded.org> Message-ID: <20200217231215.C176723283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 0771b3a0f57e40beb184bb484099b16e5e40613a Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:55 2020 +0100 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" Mark any keys used to cache the srcrevs for a recipe as "dontcache" if BB_DONT_CACHE is set for the recipe. Remove any such keys upon the next bitbake run even if BB_SRCREV_POLICY is set to "cache". This will make sure the srcrev is updated as expected if ${AUTOREV} is used. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 5646276..b83347a 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -499,6 +499,11 @@ def fetcher_init(d): srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) + # We still need to remove keys that are marked with "dontcache". + for key in list(revs.keys()): + if key.startswith("dontcache-"): + logger.debug(1, "Removing SRCREV key: %s" % key) + revs.pop(key) elif srcrev_policy == "clear": logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) revs.clear() @@ -729,9 +734,8 @@ def subprocess_setup(): signal.signal(signal.SIGPIPE, signal.SIG_DFL) def get_autorev(d): - # only not cache src rev in autorev case - if d.getVar('BB_SRCREV_POLICY') != "cache": - d.setVar('BB_DONT_CACHE', '1') + # Do not cache the srcrev in the autorev case + d.setVar('BB_DONT_CACHE', '1') return "AUTOINC" def get_srcrev(d, method_name='sortable_revision'): @@ -1594,7 +1598,13 @@ class FetchMethod(object): return True, str(latest_rev) def generate_revision_key(self, ud, d, name): - return self._revision_key(ud, d, name) + key = self._revision_key(ud, d, name) + if d.getVar('BB_DONT_CACHE'): + # Mark the key so it can be removed on the next bitbake run even if + # BB_SRCREV_POLICY is "cache". + return "dontcache-%s" % key + else: + return key def latest_versionstring(self, ud, d): """ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 23:12:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 23:12:18 +0000 Subject: [oe-commits] [bitbake] 03/04: fetch2: Make fetcher_compare_revisions() work In-Reply-To: <158198113541.24735.17336777221669326595@git.openembedded.org> References: <158198113541.24735.17336777221669326595@git.openembedded.org> Message-ID: <20200217231215.AD7EA23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 35cf83cd3d2b41a8353e5bee91bc6c2f8261fb0b Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:54 2020 +0100 fetch2: Make fetcher_compare_revisions() work This seems to have been broken for a very long time. Now it also works regardless of BB_SRCREV_POLICY. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 1b7f573..5646276 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -485,17 +485,22 @@ def fetcher_init(d): Called to initialize the fetchers once the configuration data is known. Calls before this must not hit the cache. """ + + revs = bb.persist_data.persist('BB_URI_HEADREVS', d) + try: + # fetcher_init is called multiple times, so make sure we only save the + # revs the first time it is called. + if not bb.fetch2.saved_headrevs: + bb.fetch2.saved_headrevs = dict(revs) + except: + pass + # When to drop SCM head revisions controlled by user policy srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) elif srcrev_policy == "clear": logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) - revs = bb.persist_data.persist('BB_URI_HEADREVS', d) - try: - bb.fetch2.saved_headrevs = revs.items() - except: - pass revs.clear() else: raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy) @@ -514,22 +519,12 @@ def fetcher_parse_done(): def fetcher_compare_revisions(d): """ - Compare the revisions in the persistant cache with current values and - return true/false on whether they've changed. + Compare the revisions in the persistent cache with the saved values from + when bitbake was started and return true if they have changed. """ - data = bb.persist_data.persist('BB_URI_HEADREVS', d).items() - data2 = bb.fetch2.saved_headrevs - - changed = False - for key in data: - if key not in data2 or data2[key] != data[key]: - logger.debug(1, "%s changed", key) - changed = True - return True - else: - logger.debug(2, "%s did not change", key) - return False + headrevs = dict(bb.persist_data.persist('BB_URI_HEADREVS', d)) + return headrevs != bb.fetch2.saved_headrevs def mirror_from_string(data): mirrors = (data or "").replace('\\n',' ').split() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 17 23:13:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 17 Feb 2020 23:13:17 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: data: Don't allow renameVar calls with equivalent keys Message-ID: <158198119796.25404.13711546727927702776@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new 9c6eb97 data: Don't allow renameVar calls with equivalent keys 9c6eb97 is described below commit 9c6eb9774d9314d4d7c1e3357c9bbfd9fa0b125f Author: Kyle Russell AuthorDate: Mon Feb 17 10:25:52 2020 -0500 data: Don't allow renameVar calls with equivalent keys While usually a programming error, the behavior can cause a Parser instance to eventually gobble up a significant amount of memory, greatly affecting system performance. Try to avoid getting into that situation and alert the user about what they attempted to do. Signed-off-by: Kyle Russell Signed-off-by: Richard Purdie --- lib/bb/data_smart.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index dd5c618..63a32bc 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -607,6 +607,10 @@ class DataSmart(MutableMapping): """ Rename the variable key to newkey """ + if key == newkey: + bb.warn("Calling renameVar with equivalent keys (%s) is invalid" % key) + return + if '_remote_data' in self.dict: connector = self.dict["_remote_data"]["_content"] res = connector.renameVar(key, newkey) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:05 +0000 Subject: [oe-commits] [meta-openembedded] 01/19: nodejs: libatomic patch should be target specific In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.6BCF623283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit ff16275b3f51eb24aa27039b738f74deb914b362 Author: Khem Raj AuthorDate: Thu Nov 21 10:24:10 2019 -0800 nodejs: libatomic patch should be target specific host usually are using gcc/x86_64/aarch64 and all of them have gcc which can support atomic intrinsics, but not all of them install libatomic by default e.g. centos-7, so asking for libatomic unconditionally may not work always Signed-off-by: Khem Raj Acked-by: Andreas M?ller Acked-by: Tim Orling (cherry picked from commit 86d4131dfabdf4bca27d96de6f271565f1a3a5c6) [Fixup for zeus context] Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb index a978eeb..215d5e7 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb @@ -19,10 +19,10 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ file://0006-Use-target-ldflags.patch \ " SRC_URI_append_class-target = " \ + file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:06 +0000 Subject: [oe-commits] [meta-openembedded] 02/19: dnsmasq: CVE-2019-14834 In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.7866223283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 688e19d04d67afa8cc848e91b891ba0a84ec739b Author: Zhixiong Chi AuthorDate: Thu Jan 9 18:18:45 2020 -0800 dnsmasq: CVE-2019-14834 Backport the CVE patch from the upstream to fix the memory leak. Signed-off-by: Zhixiong Chi Signed-off-by: Khem Raj (cherry picked from commit c8ca82feb5d6ceb843aad33dada947b456f7fcac) Signed-off-by: Armin Kuster --- .../0001-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 ++++++++++++++++++++++ .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 + 2 files changed, 50 insertions(+) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch new file mode 100644 index 0000000..ccd6f82 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch @@ -0,0 +1,49 @@ +From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Wed, 14 Aug 2019 20:44:50 +0100 +Subject: [PATCH] Fix memory leak in helper.c + +Thanks to Xu Mingjie for spotting this. + +CVE: CVE-2019-14834 +Upstream-Status: Backport +Signed-off-by: Zhixiong Chi +--- + src/helper.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/helper.c b/src/helper.c +index 33ba120..c392eec 100644 +--- a/src/helper.c ++++ b/src/helper.c +@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + pid_t pid; + int i, pipefd[2]; + struct sigaction sigact; +- ++ unsigned char *alloc_buff = NULL; ++ + /* create the pipe through which the main program sends us commands, + then fork our process. */ + if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) +@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + struct script_data data; + char *p, *action_str, *hostname = NULL, *domain = NULL; + unsigned char *buf = (unsigned char *)daemon->namebuff; +- unsigned char *end, *extradata, *alloc_buff = NULL; ++ unsigned char *end, *extradata; + int is6, err = 0; + int pipeout[2]; + +- free(alloc_buff); ++ /* Free rarely-allocated memory from previous iteration. */ ++ if (alloc_buff) ++ { ++ free(alloc_buff); ++ alloc_buff = NULL; ++ } + + /* we read zero bytes when pipe closed: this is our signal to exit */ + if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) +-- +1.7.10.4 diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb index 6f3d5da..8275650 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb @@ -5,5 +5,6 @@ SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d35 SRC_URI += "\ file://lua.patch \ file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ + file://0001-dnsmasq-fix-memory-leak-in-helper-c.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:07 +0000 Subject: [oe-commits] [meta-openembedded] 03/19: cpprest: fix cmake installation directory In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.84F6723283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 2ce57e0b6c51eda6c7d8ae36ebf36ff9044b03f1 Author: Gianfranco Costamagna AuthorDate: Thu Jan 9 13:07:08 2020 +0100 cpprest: fix cmake installation directory This should help reverse-dependencies find the cmake files also in multiarch locations Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj (cherry picked from commit 2ca15ad3d80172f47b107bb4e346827efa431769) Signed-off-by: Armin Kuster --- meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb index 53f6469..11c8eab 100644 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" DEPENDS = "openssl websocketpp zlib boost brotli" -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ file://disable-float-tests.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:04 +0000 Subject: [oe-commits] [meta-openembedded] branch zeus-next updated (e855ecc -> bb65c27) Message-ID: <158198466496.14291.17443171303627058194@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a change to branch zeus-next in repository meta-openembedded. from e855ecc ruli: Fix install step and build samples too new ff16275 nodejs: libatomic patch should be target specific new 688e19d dnsmasq: CVE-2019-14834 new 2ce57e0 cpprest: fix cmake installation directory new 636660b websocketapp: Fix multilib build new eb8090f websocketpp: add various upstream accepted and proposed patches to fix various issues, including: new c5cf476 websocketpp: Fix clang specific flags in cmake files new ae5aa7b websocketpp: refresh clang patch new 81e186f adduser: set default shell with /sbin/nologin new f64c2d6 libldb: upgrade 1.5.5 -> 1.5.6 new 14acba7 mariadb: fix library LZ4 lookup new 6599629 python-twisted: add required RDEPENDS for twistd new 12390fd pyhamcrest: add python3 version of recipe new b951000 gitpkgv.bbclass: Add support for extending the supported tag formats new 9abf137 squid: Link with libatomic on riscv new 189ba6b grpc: Link with libatomic on clang/x86 new a824942 grpc: Link with libatomic on powerpc new 40d9226 grpc: Link with libatomic on riscv new 9d6b30b netdata: Add libatomic to link step new bb65c27 fluentbit: Fix packaging in multilib env The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-networking/recipes-daemons/squid/squid_4.6.bb | 2 + .../recipes-devtools/grpc/grpc_1.24.1.bb | 16 +++ .../0001-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 ++++++++ .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 + .../libldb/{libldb_1.5.5.bb => libldb_1.5.6.bb} | 4 +- meta-oe/classes/gitpkgv.bbclass | 14 ++- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + .../mariadb/0001-Fix-library-LZ4-lookup.patch | 30 +++++ meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 2 +- .../fluentbit/fluentbit/cmake_multilib.patch | 18 +++ .../fluentbit/fluentbit_0.12.19.bb | 1 + meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb | 2 +- .../0001-Correct-clang-compiler-flags.patch | 32 +++++ .../0001-cmake-Use-GNUInstallDirs.patch | 35 ++++++ .../websocketpp/websocketpp-0.8.1/771.patch | 22 ++++ .../websocketpp/websocketpp-0.8.1/842.patch | 30 +++++ .../websocketpp/websocketpp-0.8.1/855.patch | 23 ++++ .../websocketpp/websocketpp-0.8.1/857.patch | 132 +++++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 17 ++- meta-perl/recipes-perl/adduser/adduser_3.118.bb | 1 + ...duser-set-default-shell-with-sbin-nologin.patch | 34 ++++++ .../recipes-devtools/python/python-twisted.inc | 18 ++- ...mcrest_1.9.0.bb => python3-pyhamcrest_1.9.0.bb} | 4 +- .../recipes-webadmin/netdata/netdata_git.bb | 2 + 24 files changed, 478 insertions(+), 12 deletions(-) create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch rename meta-networking/recipes-support/libldb/{libldb_1.5.5.bb => libldb_1.5.6.bb} (95%) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch create mode 100644 meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch copy meta-python/recipes-devtools/python/{python-pyhamcrest_1.9.0.bb => python3-pyhamcrest_1.9.0.bb} (85%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:08 +0000 Subject: [oe-commits] [meta-openembedded] 04/19: websocketapp: Fix multilib build In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.90B2D23283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 636660b7b2431da724d391d237d3680a72470121 Author: Khem Raj AuthorDate: Thu Dec 19 20:10:33 2019 -0800 websocketapp: Fix multilib build Fixes ERROR: websocketpp-0.8.1-r0 do_package: QA Issue: websocketpp: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/cmake /usr/lib/cmake/websocketpp /usr/lib/cmake/websocketpp/websocketpp-configVersion.cmake /usr/lib/cmake/websocketpp/websocketpp-config.cmake Signed-off-by: Khem Raj (cherry picked from commit b1a85631279b8f04b38562f9cf076f4cc0561a71) Signed-off-by: Armin Kuster --- .../0001-cmake-Use-GNUInstallDirs.patch | 35 ++++++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 1 + 2 files changed, 36 insertions(+) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 0000000..0ef2e12 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,35 @@ +From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Dec 2019 20:07:11 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba..080be3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,11 +39,13 @@ endif() + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + ++include(GNUInstallDirs) ++ + set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") + if (WIN32 AND NOT CYGWIN) + set (DEF_INSTALL_CMAKE_DIR cmake) + else () +- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) ++ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) + endif () + set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + +-- +2.24.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb index 5516217..05f14d2 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb @@ -8,6 +8,7 @@ DEPENDS = "openssl boost zlib" SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://0001-Replace-make_shared-with-new-in-some-cases.patch \ file://0002-Fix-missed-entries-fix-testing.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ " # tag 0.8.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:09 +0000 Subject: [oe-commits] [meta-openembedded] 05/19: websocketpp: add various upstream accepted and proposed patches to fix various issues, including: In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.9C73D232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit eb8090f27afb865878a04aaeff6caac34abdbac0 Author: Gianfranco Costamagna AuthorDate: Thu Jan 9 11:36:51 2020 +0100 websocketpp: add various upstream accepted and proposed patches to fix various issues, including: - build failure with boost 1.71 - bad installation of header files correct version on some OSes. - fix version minor number - fix Scons script not being Python3 ready - build examples and tests only if ptest is enabled in DISTRO_FEATURES - do not depend on websocketpp from -dev package, because this is an header only dev package for now Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj (cherry picked from commit 7cd26041725e57dd0680767a513955193e1f0d63) Signed-off-by: Armin Kuster --- .../websocketpp/websocketpp-0.8.1/771.patch | 22 ++++ .../websocketpp/websocketpp-0.8.1/842.patch | 30 +++++ .../websocketpp/websocketpp-0.8.1/855.patch | 23 ++++ .../websocketpp/websocketpp-0.8.1/857.patch | 132 +++++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 15 ++- 5 files changed, 221 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch new file mode 100644 index 0000000..bc65efb --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch @@ -0,0 +1,22 @@ +From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= +Date: Thu, 1 Nov 2018 20:58:10 +0100 +Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba9..2d13117b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ endif () + ############ Project name and version + set (WEBSOCKETPP_MAJOR_VERSION 0) + set (WEBSOCKETPP_MINOR_VERSION 8) +-set (WEBSOCKETPP_PATCH_VERSION 0) ++set (WEBSOCKETPP_PATCH_VERSION 1) + set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION}) + + if(POLICY CMP0048) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch new file mode 100644 index 0000000..c3651e9 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch @@ -0,0 +1,30 @@ +From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Wed, 18 Sep 2019 11:35:43 +0200 +Subject: [PATCH] Fix "include" directory installation. the variable + INSTALL_INCLUDE_DIR already exists, and defaults to include if not + specificied otherwise. Using it allows people to customize the installation + from outside, fixing issues with other OS like Haiku + +Signed-off-by: Gianfranco Costamagna +Signed-off-by: Gianfranco Costamagna +--- + cmake/CMakeHelpers.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake +index 1478f4b..f603632 100644 +--- a/cmake/CMakeHelpers.cmake ++++ b/cmake/CMakeHelpers.cmake +@@ -80,7 +80,7 @@ macro (final_target) + endif () + + install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME} +- DESTINATION include/ ++ DESTINATION ${INSTALL_INCLUDE_DIR}/ + FILES_MATCHING PATTERN "*.hpp*") + endmacro () + +-- +2.17.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch new file mode 100644 index 0000000..a1ee627 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch @@ -0,0 +1,23 @@ +From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Wed, 8 Jan 2020 17:59:48 +0100 +Subject: [PATCH] Fix cmake find boost with version >= 1.71 + +For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117b..9a46bc10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -213,7 +213,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch new file mode 100644 index 0000000..f221cd6 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch @@ -0,0 +1,132 @@ +From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Thu, 9 Jan 2020 10:07:20 +0100 +Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise + keyword syntax - has_key deprecated method is now removed - commands + deprecated library is replaced by subprocess - print function fixes + +This should fix FTBFS against new scons 3.1.2 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 +--- + SConstruct | 45 +++++++++++++++++++++++---------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) + +diff --git a/SConstruct b/SConstruct +index ae3df10b..9d1c8914 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1,18 +1,19 @@ +-import os, sys, commands ++import os, sys ++from subprocess import check_output + env = Environment(ENV = os.environ) + + # figure out a better way to configure this +-if os.environ.has_key('CXX'): ++if 'CXX' in os.environ: + env['CXX'] = os.environ['CXX'] + +-if os.environ.has_key('DEBUG'): ++if 'DEBUG' in os.environ: + env['DEBUG'] = os.environ['DEBUG'] + +-if os.environ.has_key('CXXFLAGS'): ++if 'CXXFLAGS' in os.environ: + #env['CXXFLAGS'] = os.environ['CXXFLAGS'] + env.Append(CXXFLAGS = os.environ['CXXFLAGS']) + +-if os.environ.has_key('LINKFLAGS'): ++if 'LINKFLAGS' in os.environ: + #env['LDFLAGS'] = os.environ['LDFLAGS'] + env.Append(LINKFLAGS = os.environ['LINKFLAGS']) + +@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'): + ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and + ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu. + ## +-if os.environ.has_key('BOOSTROOT'): ++if 'BOOSTROOT' in os.environ: + os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT'] + +-if os.environ.has_key('BOOST_ROOT'): ++if 'BOOST_ROOT' in os.environ: + env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT'] + env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib') +-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'): ++elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ: + env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES'] + env['BOOST_LIBS'] = os.environ['BOOST_LIBS'] + else: +- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!" ++ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!") + + ## Custom OpenSSL +-if os.environ.has_key('OPENSSL_PATH'): ++if 'OPENSSL_PATH' in os.environ: + env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include')) + env.Append(LIBPATH = os.environ['OPENSSL_PATH']) + +-if os.environ.has_key('WSPP_ENABLE_CPP11'): ++if 'WSPP_ENABLE_CPP11' in os.environ: + env['WSPP_ENABLE_CPP11'] = True + else: + env['WSPP_ENABLE_CPP11'] = False +@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'): + env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags) + env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86' + elif env['PLATFORM'] == 'posix': +- if env.has_key('DEBUG'): ++ if 'DEBUG' in env: + env.Append(CCFLAGS = ['-g', '-O0']) + else: + env.Append(CPPDEFINES = ['NDEBUG']) +@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix': + env.Append(CCFLAGS = ['-Wall']) + #env['LINKFLAGS'] = '' + elif env['PLATFORM'] == 'darwin': +- if not os.environ.has_key('CXX'): ++ if not 'CXX' in os.environ: + env['CXX'] = "clang++" +- if env.has_key('DEBUG'): ++ if 'DEBUG' in env: + env.Append(CCFLAGS = ['-g', '-O0']) + else: + env.Append(CPPDEFINES = ['NDEBUG']) +@@ -157,29 +158,29 @@ env_cpp11 = env.Clone () + + if env_cpp11['CXX'].startswith('g++'): + # TODO: check g++ version +- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion') ++ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion']) + +- if GCC_VERSION > "4.4.0": +- print "C++11 build environment partially enabled" ++ if GCC_VERSION.decode('utf-8') > "4.4.0": ++ print("C++11 build environment partially enabled") + env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) + else: +- print "C++11 build environment is not supported on this version of G++" ++ print("C++11 build environment is not supported on this version of G++") + elif env_cpp11['CXX'].startswith('clang++'): +- print "C++11 build environment enabled" ++ print("C++11 build environment enabled") + env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++']) + env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) + + # look for optional second boostroot compiled with clang's libc++ STL library + # this prevents warnings/errors when linking code built with two different + # incompatible STL libraries. +- if os.environ.has_key('BOOST_ROOT_CPP11'): ++ if 'BOOST_ROOT_CPP11' in os.environ: + env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11'] + env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib') +- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'): ++ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ: + env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11'] + env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11'] + else: +- print "C++11 build environment disabled" ++ print("C++11 build environment disabled") + + # if the build system is known to allow the isystem modifier for library include + # values then use it for the boost libraries. Otherwise just add them to the diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb index 05f14d2..8a2a3e1 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb @@ -3,14 +3,27 @@ SECTION = "libs/network" HOMEPAGE = "https://github.com/zaphoyd/websocketpp" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" -DEPENDS = "openssl boost zlib" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://0001-Replace-make_shared-with-new-in-some-cases.patch \ file://0002-Fix-missed-entries-fix-testing.patch \ file://0001-cmake-Use-GNUInstallDirs.patch \ + file://842.patch \ + file://771.patch \ + file://855.patch \ + file://857.patch \ " +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " + +# this is an header only library, do not depend on the main package +RDEPENDS_${PN}-dev = "" + +# to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this: +# TOOLCHAIN_TARGET_TASK_append = " websocketpp-dev" + # tag 0.8.1 SRCREV= "c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:11 +0000 Subject: [oe-commits] [meta-openembedded] 07/19: websocketpp: refresh clang patch In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.B0995232844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit ae5aa7b7e90b248b84b48541fac9ec75d391116f Author: Gianfranco Costamagna AuthorDate: Tue Jan 14 14:30:13 2020 +0100 websocketpp: refresh clang patch Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj (cherry picked from commit 45476f9d6a9d7b02a549a19f0e841957a808d3ce) Signed-off-by: Armin Kuster --- .../websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch index 4217897..f1d037f 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch @@ -18,7 +18,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d13117..c17354a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -148,7 +148,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) +@@ -150,7 +150,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) endif() set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) set (WEBSOCKETPP_BOOST_LIBS system thread) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:10 +0000 Subject: [oe-commits] [meta-openembedded] 06/19: websocketpp: Fix clang specific flags in cmake files In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.A65BB232843@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit c5cf476e8ab0378253675af5d4b6d39083786de0 Author: Khem Raj AuthorDate: Fri Jan 10 22:01:28 2020 -0800 websocketpp: Fix clang specific flags in cmake files Signed-off-by: Khem Raj (cherry picked from commit f7030891ef062eeb0e9ca01d4a6191b309e6a307) Signed-off-by: Armin Kuster --- .../0001-Correct-clang-compiler-flags.patch | 32 ++++++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch new file mode 100644 index 0000000..4217897 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch @@ -0,0 +1,32 @@ +From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 10 Jan 2020 21:54:39 -0800 +Subject: [PATCH] Correct clang compiler flags + +Fix misplaced quotes, this was leading to spurious ; in compiler cmdline +Remove demanding libc++, clang can link with both libc++ and libstdc++ +and platforms have their own defaults, user can demand non defaults via +adding it to cmake flags + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117..c17354a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,7 +148,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) + set (WEBSOCKETPP_BOOST_LIBS system thread) +- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? + endif () +-- +2.24.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb index 8a2a3e1..97c1df2 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://771.patch \ file://855.patch \ file://857.patch \ + file://0001-Correct-clang-compiler-flags.patch \ " EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:13 +0000 Subject: [oe-commits] [meta-openembedded] 09/19: libldb: upgrade 1.5.5 -> 1.5.6 In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.C53EF23284C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit f64c2d691ea597aa6221e3d7706a4d022e07bfea Author: Yi Zhao AuthorDate: Fri Nov 8 11:24:48 2019 +0800 libldb: upgrade 1.5.5 -> 1.5.6 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj (cherry picked from commit 2b3fd534874aee125a6c79c70c93b1aa498fda3f) [Samba's update via ee5aa6911b2e93b89e67ae6167ee7d9a029b9262 required libldb upgrade to 1.5.6 Yocto # 13750] Signed-off-by: Armin Kuster --- .../recipes-support/libldb/{libldb_1.5.5.bb => libldb_1.5.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/libldb/libldb_1.5.5.bb b/meta-networking/recipes-support/libldb/libldb_1.5.6.bb similarity index 95% rename from meta-networking/recipes-support/libldb/libldb_1.5.5.bb rename to meta-networking/recipes-support/libldb/libldb_1.5.6.bb index b19c964..99eb6f9 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.5.5.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.5.6.bb @@ -33,8 +33,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "339a41ac9efaec680e6d1469dd9aa35b" -SRC_URI[sha256sum] = "199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68" +SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977" +SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b" inherit waf-samba distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:15 +0000 Subject: [oe-commits] [meta-openembedded] 11/19: python-twisted: add required RDEPENDS for twistd In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.D91C723284E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 65996296fa09e62642b2fe5ea76f154cb19d383d Author: Trevor Gamblin AuthorDate: Mon Jan 27 12:43:21 2020 -0800 python-twisted: add required RDEPENDS for twistd python-twisted is currently missing some packages for its /usr/bin/twistd executable to function. Add these to the RDEPENDS list, and also clean up formatting since the list is getting long. Note that a similar patch has already been submitted for master branch, but the python2 version of twisted needs more explicit RDEPENDS than the python3 version submitted to master in order for /usr/bin/twistd to work properly. Signed-off-by: Trevor Gamblin Signed-off-by: Armin Kuster --- meta-python/recipes-devtools/python/python-twisted.inc | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc index d70104d..f55bbb0 100644 --- a/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-python/recipes-devtools/python/python-twisted.inc @@ -56,7 +56,23 @@ RDEPENDS_${PN} = "\ ${PN}-zsh \ " -RDEPENDS_${PN}-core = "${PYTHON_PN}-core ${PYTHON_PN}-zopeinterface ${PYTHON_PN}-incremental ${PYTHON_PN}-constantly ${PYTHON_PN}-hyperlink ${PYTHON_PN}-automat" +RDEPENDS_${PN}-core = "${PYTHON_PN}-core \ + ${PYTHON_PN}-zopeinterface \ + ${PYTHON_PN}-incremental \ + ${PYTHON_PN}-constantly \ + ${PYTHON_PN}-hyperlink \ + ${PYTHON_PN}-automat \ + ${PYTHON_PN}-pyserial \ + ${PYTHON_PN}-pyhamcrest \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-pkg-resources \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-plistlib \ + ${PYTHON_PN}-setuptools \ +" + RDEPENDS_${PN}-test = "${PN}" RDEPENDS_${PN}-conch = "${PN}-core ${PN}-protocols" RDEPENDS_${PN}-mail = "${PN}-core ${PN}-protocols" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:14 +0000 Subject: [oe-commits] [meta-openembedded] 10/19: mariadb: fix library LZ4 lookup In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.CF13523284D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 14acba7937a7bf71dc29e4075ea986e08b97868f Author: Sumit Garg AuthorDate: Tue Jan 21 14:39:04 2020 +0530 mariadb: fix library LZ4 lookup While cross-compiling mariadb package it tries to link lz4 library present in the target sysroot and if not found it tries to link host lz4 library which is incorrect leading to linker errors. So fix that via restricting lz4 library lookup to target sysroot only. Signed-off-by: Sumit Garg Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + .../mariadb/0001-Fix-library-LZ4-lookup.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index e1ae58a..703e172 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,6 +18,7 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ + file://0001-Fix-library-LZ4-lookup.patch \ " SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0" SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch new file mode 100644 index 0000000..574dfd3 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch @@ -0,0 +1,30 @@ +From 1d7612b063eb1fc7bf97bc27b13e1de596748aa1 Mon Sep 17 00:00:00 2001 +From: Sumit Garg +Date: Wed, 8 Jan 2020 04:58:30 +0000 +Subject: [PATCH] Fix library LZ4 lookup. + +Signed-off-by: Sumit Garg +--- + cmake/FindLZ4.cmake | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake +index e97dd63e2b0..2f4694e727c 100644 +--- a/cmake/FindLZ4.cmake ++++ b/cmake/FindLZ4.cmake +@@ -1,5 +1,10 @@ +-find_path(LZ4_INCLUDE_DIR NAMES lz4.h) +-find_library(LZ4_LIBRARY NAMES lz4) ++find_path(LZ4_INCLUDE_DIR ++ NAMES lz4.h ++ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) ++ ++find_library(LZ4_LIBRARY ++ NAMES lz4 ++ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS( +-- +2.17.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:16 +0000 Subject: [oe-commits] [meta-openembedded] 12/19: pyhamcrest: add python3 version of recipe In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.E408A23284F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 12390fd0d6f0ddca04783b2920a5d60fecd78b6a Author: Trevor Gamblin AuthorDate: Thu Jan 30 10:34:05 2020 -0500 pyhamcrest: add python3 version of recipe Twisted requires pyhamcrest for /usr/bin/twistd to work, but in zeus there is only a python2 recipe for this package, thus the twistd daemon won't be able to run properly for python3. Signed-off-by: Trevor Gamblin Signed-off-by: Armin Kuster --- .../recipes-devtools/python/python3-pyhamcrest_1.9.0.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb b/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb new file mode 100644 index 0000000..04aa9b4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Hamcrest framework for matcher objects" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6df1318c6071dd1707f5e3b6c11f24f" + +PYPI_PACKAGE = "PyHamcrest" + +SRC_URI[md5sum] = "8b833a3fa30197455df79424f30c8c3f" +SRC_URI[sha256sum] = "8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd" + +inherit pypi setuptools3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:17 +0000 Subject: [oe-commits] [meta-openembedded] 13/19: gitpkgv.bbclass: Add support for extending the supported tag formats In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.ED4CE232850@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit b95100003df03c22eebe6ae5e4342b5281a2ef64 Author: Peter Kjellerstedt AuthorDate: Fri Jan 17 21:34:21 2020 +0100 gitpkgv.bbclass: Add support for extending the supported tag formats Introduce GITPKGV_TAG_REGEXP (which defaults to "v(\d.*)") to support dropping other unwanted parts of the found tags than just a leading "v". Any matching groups in the regexp will be concatenated to yield the final version. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj (cherry picked from commit b51af6b5b7a41b44d3539f44c10d21624c4cc4a7) Signed-off-by: Armin Kuster --- meta-oe/classes/gitpkgv.bbclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index ab591bd..180421e 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -40,10 +40,16 @@ GITPKGV = "${@get_git_pkgv(d, False)}" GITPKGVTAG = "${@get_git_pkgv(d, True)}" -def gitpkgv_drop_tag_prefix(version): +# This regexp is used to drop unwanted parts of the found tags. Any matching +# groups will be concatenated to yield the final version. +GITPKGV_TAG_REGEXP ??= "v(\d.*)" + +def gitpkgv_drop_tag_prefix(d, version): import re - if re.match("v\d", version): - return version[1:] + + m = re.match(d.getVar('GITPKGV_TAG_REGEXP'), version) + if m: + return ''.join(group for group in m.groups() if group) else: return version @@ -105,7 +111,7 @@ def get_git_pkgv(d, use_tags): output = bb.fetch2.runfetchcmd( "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null" % vars, d, quiet=True).strip() - ver = gitpkgv_drop_tag_prefix(output) + ver = gitpkgv_drop_tag_prefix(d, output) except Exception: ver = "0.0-%s-g%s" % (commits, vars['rev'][:7]) else: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:18 +0000 Subject: [oe-commits] [meta-openembedded] 14/19: squid: Link with libatomic on riscv In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001106.0614823283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 9abf13774ee370824445f122211aec2a56da5643 Author: Khem Raj AuthorDate: Tue Jan 28 13:47:45 2020 -0800 squid: Link with libatomic on riscv Signed-off-by: Khem Raj (cherry picked from commit 626209aabb5684316eba0d4b762980924d783c93) Signed-off-by: Armin Kuster --- meta-networking/recipes-daemons/squid/squid_4.6.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-daemons/squid/squid_4.6.bb b/meta-networking/recipes-daemons/squid/squid_4.6.bb index ca4927d..dfd625b 100644 --- a/meta-networking/recipes-daemons/squid/squid_4.6.bb +++ b/meta-networking/recipes-daemons/squid/squid_4.6.bb @@ -40,6 +40,8 @@ inherit autotools pkgconfig useradd ptest perlnative LDFLAGS_append_mipsarch = " -latomic" LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:12 +0000 Subject: [oe-commits] [meta-openembedded] 08/19: adduser: set default shell with /sbin/nologin In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001105.BB700232847@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 81e186f6141a6e8f4ab3185b00b9f1392bb89ca1 Author: Kai Kang AuthorDate: Thu Jan 9 14:15:58 2020 +0800 adduser: set default shell with /sbin/nologin Shell nologin whether provided by shadow or util-linux is installed to /sbin/nologin in oe-core. But the default shell of adduser is /usr/sbin/nologin and will fail to create a new user. Set the default shell with /sbin/nologin to fix the issue. Signed-off-by: Kai Kang Signed-off-by: Khem Raj (cherry picked from commit d49c0eba5bcd64a0dd1f2e389453f94d7efc988f) Signed-off-by: Armin Kuster --- meta-perl/recipes-perl/adduser/adduser_3.118.bb | 1 + ...duser-set-default-shell-with-sbin-nologin.patch | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/meta-perl/recipes-perl/adduser/adduser_3.118.bb b/meta-perl/recipes-perl/adduser/adduser_3.118.bb index e695c58..80cf142 100644 --- a/meta-perl/recipes-perl/adduser/adduser_3.118.bb +++ b/meta-perl/recipes-perl/adduser/adduser_3.118.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=caed49ab166f22ef31bf1127f558d0ef SRC_URI = "https://launchpad.net/debian/+archive/primary/+sourcefiles/adduser/${PV}/${BPN}_${PV}.tar.xz \ file://adduser-add-M-option-for-useradd.patch \ + file://0001-adduser-set-default-shell-with-sbin-nologin.patch \ " SRC_URI[md5sum] = "44ba2475ebdaafc9613236bdda321c97" diff --git a/meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch b/meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch new file mode 100644 index 0000000..91cc6bc --- /dev/null +++ b/meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch @@ -0,0 +1,34 @@ +From 75e949bf80bf5e3e5bd8f81b258095e662b705c4 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Thu, 9 Jan 2020 13:51:28 +0800 +Subject: [PATCH] adduser: set default shell with /sbin/nologin + +Shell nologin whether provided by shadow or util-linux is installed to +/sbin/nologin in oe-core. But the default shell of adduser is +/usr/sbin/nologin and will fail to create a new user. + +Set the default shell with /sbin/nologin to fix the issue. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Kai Kang +--- + adduser | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/adduser b/adduser +index 0f24cc9..ab554d0 100755 +--- a/adduser ++++ b/adduser +@@ -431,7 +431,7 @@ if ($action eq "addsysuser") { + printf gtx("Adding new user `%s' (UID %d) with group `%s' ...\n"),$new_name,$new_uid,$ingroup_name + if $verbose; + $home_dir = $special_home || &homedir($new_name, $ingroup_name); +- $shell = $special_shell || '/usr/sbin/nologin'; ++ $shell = $special_shell || '/sbin/nologin'; + $undouser = $new_name; + my $useradd = &which('useradd'); + &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s', +-- +2.17.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:19 +0000 Subject: [oe-commits] [meta-openembedded] 15/19: grpc: Link with libatomic on clang/x86 In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001106.10D63232851@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 189ba6b49974934d0aa7b1d77996570b7a65b1a9 Author: Khem Raj AuthorDate: Mon Nov 18 16:46:29 2019 -0800 grpc: Link with libatomic on clang/x86 clang does delegate the atomic calls to libatomic on x86 where as gcc tries to use intrinsics, its debatable who is right, but it does seem that clang is safe in case pointer is unaligned Signed-off-by: Khem Raj (cherry picked from commit f7a7a2aafe87437aefca21612dc156fde645ac89) Signed-off-by: Armin Kuster --- meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb index 8d54dbe..c11b556 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb @@ -44,6 +44,10 @@ do_configure_prepend_mipsarch() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } +do_configure_prepend_toolchain-clang_x86() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + BBCLASSEXTEND = "native nativesdk" SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:20 +0000 Subject: [oe-commits] [meta-openembedded] 16/19: grpc: Link with libatomic on powerpc In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001106.19967232852@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit a82494272d3cd477648c630a84f0005b4f9d1018 Author: Khem Raj AuthorDate: Thu Jan 16 10:24:12 2020 -0800 grpc: Link with libatomic on powerpc Signed-off-by: Khem Raj (cherry picked from commit 2b8c1fa1cbfa21fc0044a172fffa5986a0fd4ad0) Signed-off-by: Armin Kuster --- meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb index c11b556..34b4e31 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb @@ -44,6 +44,10 @@ do_configure_prepend_mipsarch() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } +do_configure_prepend_powerpc() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + do_configure_prepend_toolchain-clang_x86() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:21 +0000 Subject: [oe-commits] [meta-openembedded] 17/19: grpc: Link with libatomic on riscv In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001106.25A1723283A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 40d92260341d9c46d33f6e149298138759b0c14b Author: Khem Raj AuthorDate: Tue Jan 28 13:48:33 2020 -0800 grpc: Link with libatomic on riscv Signed-off-by: Khem Raj (cherry picked from commit e82f1802a60d451f978cdef0f2ff69feb1f12039) Signed-off-by: Armin Kuster --- meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb index 34b4e31..0b5e5c3 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb @@ -48,6 +48,14 @@ do_configure_prepend_powerpc() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } +do_configure_prepend_riscv64() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure_prepend_riscv32() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + do_configure_prepend_toolchain-clang_x86() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:23 +0000 Subject: [oe-commits] [meta-openembedded] 19/19: fluentbit: Fix packaging in multilib env In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001106.3B2FA23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c Author: Khem Raj AuthorDate: Thu Dec 19 19:41:52 2019 -0800 fluentbit: Fix packaging in multilib env Fixes ERROR: fluentbit-0.12.19-r0 do_package: QA Issue: fluentbit: Files/directories were installed but not shipped in any package: /usr/lib/libfluent-bit.so Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. Signed-off-by: Khem Raj (cherry picked from commit 99fe1dec83456100e0bc1c02581defa7aaf04a16) Signed-off-by: Armin Kuster --- .../fluentbit/fluentbit/cmake_multilib.patch | 18 ++++++++++++++++++ .../recipes-extended/fluentbit/fluentbit_0.12.19.bb | 1 + 2 files changed, 19 insertions(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch new file mode 100644 index 0000000..8fe9f3e --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch @@ -0,0 +1,18 @@ +Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib path + +Helps build on platforms where libpaths are not lib/ but say lib64/ + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -182,7 +182,7 @@ if(NOT FLB_WITHOUT_SHARED_LIB) + PROPERTIES OUTPUT_NAME fluent-bit) + + # Library install routines +- install(TARGETS fluent-bit-shared LIBRARY DESTINATION lib) ++ install(TARGETS fluent-bit-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + # Static Library diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb index e50aa71..27b910b 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb @@ -4,6 +4,7 @@ BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ file://jemalloc.patch \ + file://cmake_multilib.patch \ " SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 00:11:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 00:11:22 +0000 Subject: [oe-commits] [meta-openembedded] 18/19: netdata: Add libatomic to link step In-Reply-To: <158198466496.14291.17443171303627058194@git.openembedded.org> References: <158198466496.14291.17443171303627058194@git.openembedded.org> Message-ID: <20200218001106.2FB2623283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. armin_kuster pushed a commit to branch zeus-next in repository meta-openembedded. commit 9d6b30b3da3dcbfb573e3ce1f2a94720d014d997 Author: Khem Raj AuthorDate: Tue Jan 28 13:49:29 2020 -0800 netdata: Add libatomic to link step Signed-off-by: Khem Raj (cherry picked from commit ae4adf2849eb23c7ea1dd53fe5d0c06c840a18a1) Signed-off-by: Armin Kuster --- meta-webserver/recipes-webadmin/netdata/netdata_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index d179e84..d6a5ce0 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -26,6 +26,8 @@ DEPENDS += "zlib util-linux" inherit pkgconfig autotools-brokensep useradd systemd LIBS_toolchain-clang_x86 = "-latomic" +LIBS_riscv64 = "-latomic" +LIBS_riscv32 = "-latomic" export LIBS #systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:16 +0000 Subject: [oe-commits] [meta-openembedded] 01/15: python3-pyflakes: Add python3 version In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.1D6BA23283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dec5ceaacbfc9b56dcf6e8e31d06a390a1185f5f Author: Khem Raj AuthorDate: Mon Feb 17 18:46:50 2020 -0800 python3-pyflakes: Add python3 version Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-pyflakes_2.1.1.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pyflakes_2.1.1.bb b/meta-python/recipes-devtools/python/python3-pyflakes_2.1.1.bb new file mode 100644 index 0000000..c138822 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyflakes_2.1.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "passive checker of Python programs" +HOMEPAGE = "https://github.com/dreamhost/cliff" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=5127315117a8561a1504343d59620647" + +SRC_URI[md5sum] = "a0f71a15724e553c46e03ba5ed56703c" +SRC_URI[sha256sum] = "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:17 +0000 Subject: [oe-commits] [meta-openembedded] 02/15: netplan: rdep on python3 version of pyflakes In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.2811223283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 71c233683d0b32d19108f3026b23a030446f05a9 Author: Khem Raj AuthorDate: Mon Feb 17 18:49:17 2020 -0800 netplan: rdep on python3 version of pyflakes Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/netplan/netplan_0.98.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb b/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb index 860762c..db029a4 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb +++ b/meta-networking/recipes-connectivity/netplan/netplan_0.98.bb @@ -19,7 +19,7 @@ SRC_URI = " \ " DEPENDS = "glib-2.0 libyaml" -RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python-pyflakes util-linux-libuuid" +RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid" inherit pkgconfig systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:18 +0000 Subject: [oe-commits] [meta-openembedded] 03/15: rsyslog: Use python3 in ptests In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.34D0823283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b89254a8bbc518b35289a49f16faf8d38921e221 Author: Khem Raj AuthorDate: Mon Feb 17 19:28:38 2020 -0800 rsyslog: Use python3 in ptests Adjusts rdeps accordingly Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb index 29bba2d..f82caf7 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb @@ -77,6 +77,12 @@ PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," +do_configure_prepend() { + sed -i -e 's|python |python3 |g' ${S}/tests/*.sh + sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/tests/*.py + sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/tests/testsuites/*.py +} + TESTDIR = "tests" do_compile_ptest() { echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile @@ -186,6 +192,6 @@ VALGRIND_riscv64 = "" RDEPENDS_${PN}-ptest += "\ make diffutils gzip bash gawk coreutils procps \ - libgcc python-core python-io \ + libgcc python3-core python3-io \ " RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:15 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (7002e7d -> 988db92) Message-ID: <158200723560.28894.7357338143158803527@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 7002e7d lcov: Add missing missing RDEPEND and enable nativesdk new dec5cea python3-pyflakes: Add python3 version new 71c2336 netplan: rdep on python3 version of pyflakes new b89254a rsyslog: Use python3 in ptests new 7b0d354 x265: Move into meta-multimedia new 0bb390b gssdp: Upgrade to 1.2.2 new 7672f53 gupnp: Upgrade to 1.2.2 new 3857527 gupnp-dlna: Rename patchdir to PN new a067634 rygel: Upgrade to 0.38.3 new d474aab gupnp-tools: Upgrade to 0.10.0 new eb50fb0 gupnp-igd: Upgrade to 0.2.5 new af2be2e gupnp-av: Upgrade to 0.12.11 new fb3c909 Ply: Add recipe for git version new b3c4136 luajit: Add luajit 2.1.0-beta3 recipe new 4c67375 BCC: Add build recipe new 988db92 bpftrace: Add build recipe The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-connectivity/gupnp/gssdp_1.0.2.bb | 24 ----- .../recipes-connectivity/gupnp/gssdp_1.2.2.bb | 20 ++++ .../{gupnp-av_0.12.10.bb => gupnp-av_0.12.11.bb} | 4 +- .../gupnp/{files => gupnp-dlna}/move_vapigen.patch | 0 .../gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch | 101 +++++++++++++++++++++ .../{gupnp-igd_0.2.4.bb => gupnp-igd_0.2.5.bb} | 10 +- .../gupnp/gupnp-tools_0.10.0.bb | 13 +++ .../gupnp/gupnp-tools_0.8.13.bb | 13 --- .../recipes-connectivity/gupnp/gupnp.inc | 14 +-- .../recipes-connectivity/gupnp/gupnp_1.0.2.bb | 8 -- .../recipes-connectivity/gupnp/gupnp_1.2.2.bb | 8 ++ .../rygel/{rygel_0.37.0.bb => rygel_0.38.3.bb} | 6 +- .../recipes-multimedia/x265/x265_3.2.1.bb | 0 .../recipes-connectivity/netplan/netplan_0.98.bb | 2 +- ...build-with-OE-LLVM-cross-compiled-package.patch | 32 +++++++ meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb | 37 ++++++++ ...ild-with-OE-llvm-clang-cross-compiled-pac.patch | 65 +++++++++++++ .../recipes-devtools/bpftrace/bpftrace_0.9.4.bb | 34 +++++++ .../luajit/{luajit_2.0.5.bb => luajit_2.1.0.bb} | 14 +-- meta-oe/recipes-devtools/ply/ply_git.bb | 27 ++++++ .../recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 8 +- .../python/python3-pyflakes_2.1.1.bb | 16 ++++ 22 files changed, 379 insertions(+), 77 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb rename meta-multimedia/recipes-connectivity/gupnp/{gupnp-av_0.12.10.bb => gupnp-av_0.12.11.bb} (65%) rename meta-multimedia/recipes-connectivity/gupnp/{files => gupnp-dlna}/move_vapigen.patch (100%) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch rename meta-multimedia/recipes-connectivity/gupnp/{gupnp-igd_0.2.4.bb => gupnp-igd_0.2.5.bb} (63%) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb rename meta-multimedia/recipes-connectivity/rygel/{rygel_0.37.0.bb => rygel_0.38.3.bb} (95%) rename {meta-openembedded/meta-multimedia => meta-multimedia}/recipes-multimedia/x265/x265_3.2.1.bb (100%) create mode 100644 meta-oe/recipes-devtools/bcc/bcc/0001-Allow-to-build-with-OE-LLVM-cross-compiled-package.patch create mode 100644 meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb create mode 100644 meta-oe/recipes-devtools/bpftrace/bpftrace/0001-Allow-to-build-with-OE-llvm-clang-cross-compiled-pac.patch create mode 100644 meta-oe/recipes-devtools/bpftrace/bpftrace_0.9.4.bb copy meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_2.1.0.bb} (85%) create mode 100644 meta-oe/recipes-devtools/ply/ply_git.bb create mode 100644 meta-python/recipes-devtools/python/python3-pyflakes_2.1.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:19 +0000 Subject: [oe-commits] [meta-openembedded] 04/15: x265: Move into meta-multimedia In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.42D6A232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7b0d354fbee976a957431e0de4b4e5d78e1aae75 Author: Khem Raj AuthorDate: Mon Feb 17 21:58:55 2020 -0800 x265: Move into meta-multimedia Signed-off-by: Khem Raj --- .../recipes-multimedia/x265/x265_3.2.1.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb similarity index 100% rename from meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb rename to meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:22 +0000 Subject: [oe-commits] [meta-openembedded] 07/15: gupnp-dlna: Rename patchdir to PN In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.6B285232847@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 385752703114bd0a2b4e3e3a3bf6bf8684f1fb28 Author: Khem Raj AuthorDate: Mon Feb 17 22:08:41 2020 -0800 gupnp-dlna: Rename patchdir to PN This makes is specific to gupnp-dlna alone since thats only recipe using the patches inside files Signed-off-by: Khem Raj Cc: Andreas M?ller --- .../recipes-connectivity/gupnp/{files => gupnp-dlna}/move_vapigen.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch similarity index 100% rename from meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch rename to meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:23 +0000 Subject: [oe-commits] [meta-openembedded] 08/15: rygel: Upgrade to 0.38.3 In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.769AE23284C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a067634beb431d15eaee085c433621d83657400b Author: Khem Raj AuthorDate: Mon Feb 17 22:14:26 2020 -0800 rygel: Upgrade to 0.38.3 Signed-off-by: Khem Raj Cc: Andreas M?ller --- .../recipes-connectivity/rygel/{rygel_0.37.0.bb => rygel_0.38.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb similarity index 95% rename from meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb rename to meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb index 6ee02fc..3fc8450 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -12,11 +12,11 @@ DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstream RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" RRECOMMENDS_${PN} = "rygel-plugin-media-export" -SRC_URI[archive.md5sum] = "f897167ad82e2e741582f2c393a76843" -SRC_URI[archive.sha256sum] = "dfd3d885da3ac383ba0cfbf119995f4a0c2bca2cc8f8cfcd3df10cfec8f35cd7" - inherit gnomebase vala gobject-introspection gettext systemd +SRC_URI[archive.md5sum] = "7f95401903a3f855b464d5152b9d4c07" +SRC_URI[archive.sha256sum] = "08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00" + EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer" PACKAGECONFIG ?= "external mpris ruih media-export gst-launch" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:24 +0000 Subject: [oe-commits] [meta-openembedded] 09/15: gupnp-tools: Upgrade to 0.10.0 In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.8416223284D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d474aab6aeeeb4b40b478badb5de7f60bccc4ea9 Author: Khem Raj AuthorDate: Mon Feb 17 22:15:45 2020 -0800 gupnp-tools: Upgrade to 0.10.0 Add missing dep on glib-2.0-native inherit gtk-icon-cache Convert to use meson Signed-off-by: Khem Raj Cc: Andreas M?ller --- .../recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb | 13 +++++++++++++ .../recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb new file mode 100644 index 0000000..bf84e7b --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Tools for GUPnP" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" +DEPENDS = "gupnp gupnp-av gtk+3 glib-2.0-native intltool-native" +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "8c66d4aca756478615761a26ed7c8dba" +SRC_URI[sha256sum] = "41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d" +inherit features_check meson pkgconfig gettext gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb deleted file mode 100644 index 7a6b872..0000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Tools for GUPnP" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" -DEPENDS = "gupnp gupnp-av gtk+3 intltool-native" -RRECOMMENDS_${PN} = "adwaita-icon-theme" - -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "212d85ebce89b32468b59e1164050d40" -SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" -inherit features_check autotools pkgconfig gettext - -REQUIRED_DISTRO_FEATURES = "x11" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:20 +0000 Subject: [oe-commits] [meta-openembedded] 05/15: gssdp: Upgrade to 1.2.2 In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.4EC19232843@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0bb390bbb5962f04014a6d49439fd6e3c6ae3ea2 Author: Khem Raj AuthorDate: Mon Feb 17 22:01:27 2020 -0800 gssdp: Upgrade to 1.2.2 Switch to using meson Use sniffer via packageconfig Signed-off-by: Khem Raj Cc: Andreas M?ller --- .../recipes-connectivity/gupnp/gssdp_1.0.2.bb | 24 ---------------------- .../recipes-connectivity/gupnp/gssdp_1.2.2.bb | 20 ++++++++++++++++++ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb deleted file mode 100644 index 6088ef1..0000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Resource discovery and announcement over SSDP" -DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -DEPENDS = "glib-2.0 libsoup-2.4" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "b30c9a406853c6a3a012d151d6e7ad2c" -SRC_URI[sha256sum] = "a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc" - -inherit autotools pkgconfig gobject-introspection vala gtk-doc - -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" - -PACKAGES =+ "gssdp-tools" - -FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb new file mode 100644 index 0000000..ddaddd2 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "Resource discovery and announcement over SSDP" +DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +DEPENDS = "glib-2.0 libsoup-2.4" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "f00a470ebcba96f34def8f83ac5891ed" +SRC_URI[sha256sum] = "cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson pkgconfig gobject-introspection vala gtk-doc + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sniffer', '', d)}" +PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk+3," + +PACKAGES =+ "gssdp-tools" + +FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:21 +0000 Subject: [oe-commits] [meta-openembedded] 06/15: gupnp: Upgrade to 1.2.2 In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.5D5A2232844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7672f53cb601bab663dd24a16b5d8041f8b4f0f6 Author: Khem Raj AuthorDate: Mon Feb 17 22:05:39 2020 -0800 gupnp: Upgrade to 1.2.2 Switch to using meson Depend on py3 since its now supported Relax packaging to include version number in gupnp-binding-tool Signed-off-by: Khem Raj Cc: Andreas M?ller --- meta-multimedia/recipes-connectivity/gupnp/gupnp.inc | 14 ++++---------- meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb | 8 -------- meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb | 8 ++++++++ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc index 6ce9631..2920581 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc @@ -4,22 +4,16 @@ LICENSE = "LGPLv2+" DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" -inherit autotools pkgconfig vala gobject-introspection - -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gupnp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} +inherit meson pkgconfig vala gobject-introspection FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" +FILES_${PN}-dev += "${bindir}/gupnp-binding-tool*" -RDEPENDS_${PN}-dev = "python-textutils python-xml" +RDEPENDS_${PN}-dev = "python3 python3-xml" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" gupnp_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool* ${SYSROOT_DESTDIR}${bindir_crossscripts}/ } diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb deleted file mode 100644 index 1bdf7d7..0000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gupnp.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "afd96fe73856b38aaf1baf7526e08edd" -SRC_URI[sha256sum] = "5173fda779111c6b01cd4a5e41b594322be9d04f8c74d3361f0a0c2069c77610" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb new file mode 100644 index 0000000..e603497 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb @@ -0,0 +1,8 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "2ade3d29c624ad98d70113e6e93908a5" +SRC_URI[sha256sum] = "9a80bd953e5c8772ad26b72f8da01cbe7241a113edd6084903f413ce751c9989" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:26 +0000 Subject: [oe-commits] [meta-openembedded] 11/15: gupnp-av: Upgrade to 0.12.11 In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.9D24A23283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit af2be2e9645069e47bbefa7fc112522ae51c20f2 Author: Khem Raj AuthorDate: Mon Feb 17 22:19:55 2020 -0800 gupnp-av: Upgrade to 0.12.11 Signed-off-by: Khem Raj Cc: Andreas M?ller --- .../gupnp/{gupnp-av_0.12.10.bb => gupnp-av_0.12.11.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb similarity index 65% rename from meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb rename to meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb index cfd0227..1881656 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb @@ -1,7 +1,7 @@ require gupnp-av.inc SRC_URI = "${GNOME_MIRROR}/${BPN}/0.12/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "215f626508d76b767f5da7c9b92e87d8" -SRC_URI[sha256sum] = "8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a" +SRC_URI[md5sum] = "f09e99ae20271b0a8cadce806098ae8b" +SRC_URI[sha256sum] = "689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libgupnp-av/gupnp-av.h;beginline=1;endline=22;md5=2b47b7b5f799d2ebabe62b895e848820" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:27 +0000 Subject: [oe-commits] [meta-openembedded] 12/15: Ply: Add recipe for git version In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.AA72A23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fb3c909eb121a0476ddfdb88a555c212d0f9e3c2 Author: Leo Yan AuthorDate: Tue Feb 18 13:25:41 2020 +0800 Ply: Add recipe for git version Ply is a light-weight eBPF tool which compiles ply script or one-liner to Linux BPF programs and attaches to kprobes and tracepoints. It doesn't require external dependencies except libc, so it's very friendly for embedded system usage. This patch adds the recipe to support ply building for git version. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/ply/ply_git.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb new file mode 100644 index 0000000..b829538 --- /dev/null +++ b/meta-oe/recipes-devtools/ply/ply_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "Ply: A light-weight dynamic tracer for eBPF" +HOMEPAGE = "https://github.com/iovisor/ply" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "bison-native" + +SRC_URI = "git://github.com/iovisor/ply" +SRCREV = "aa5b9ac31307ec1acece818be334ef801c802a12" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + ( cd ${S}; ./autogen.sh; cd - ) +} + +do_configure() { + ( cd ${S}; ./configure --host=${TARGET_SYS} --prefix=${D}${prefix}; cd - ) +} + +do_compile() { + ( cd ${S}; oe_runmake; cd - ) +} + +do_install() { + ( cd ${S}; oe_runmake install; cd - ) +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:25 +0000 Subject: [oe-commits] [meta-openembedded] 10/15: gupnp-igd: Upgrade to 0.2.5 In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.8FA1323284E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit eb50fb0aeb67a88dbf5a17b7eed53b67f4fd692b Author: Khem Raj AuthorDate: Mon Feb 17 22:18:00 2020 -0800 gupnp-igd: Upgrade to 0.2.5 Backport patch to support gupnp 1.2 APIs Add gsspd to deps Signed-off-by: Khem Raj Cc: Andreas M?ller --- .../gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch | 101 +++++++++++++++++++++ .../{gupnp-igd_0.2.4.bb => gupnp-igd_0.2.5.bb} | 10 +- 2 files changed, 107 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch new file mode 100644 index 0000000..ff5a6d9 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch @@ -0,0 +1,101 @@ +From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 1 Dec 2018 21:33:21 +0100 +Subject: [PATCH] Swtich to new GUPnP API + +Signed-off-by: Khem Raj +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e] +--- + configure.ac | 2 +- + gupnp-igd-1.0-uninstalled.pc.in | 2 +- + gupnp-igd-1.0.pc.in | 2 +- + libgupnp-igd/Makefile.am | 2 +- + tests/gtest/gupnp-simple-igd.c | 6 ++++-- + 5 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f03921f..aa7f0ca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,7 @@ AC_STDC_HEADERS + AC_PROG_LIBTOOL + AC_FUNC_MMAP + +-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) ++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) + + # glib-genmarshal + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` +diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in +index 483956f..6db3bee 100644 +--- a/gupnp-igd-1.0-uninstalled.pc.in ++++ b/gupnp-igd-1.0-uninstalled.pc.in +@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ + + Name: gupnp-igd-1.0 + Description: GUPnP Simple IGD library +-Requires: gupnp-1.0 ++Requires: gupnp-1.2 + Version: @VERSION@ + Libs: ${libdir}/libgupnp-av-1.0.la + Cflags: -I${includedir} +diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in +index 6660d63..aa74ed3 100644 +--- a/gupnp-igd-1.0.pc.in ++++ b/gupnp-igd-1.0.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: gupnp-igd-1.0 + Description: GUPnP Simple IGD library +-Requires: gupnp-1.0 ++Requires: gupnp-1.2 + Version: @VERSION@ + Libs: -L${libdir} -lgupnp-igd-1.0 + Cflags: -I${includedir}/gupnp-igd-1.0 +diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am +index fe020b5..e10d857 100644 +--- a/libgupnp-igd/Makefile.am ++++ b/libgupnp-igd/Makefile.am +@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 + GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) + GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) + GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 +-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 ++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 + GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) + + if HAVE_INTROSPECTION +diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c +index 9b32b2a..d051d13 100644 +--- a/tests/gtest/gupnp-simple-igd.c ++++ b/tests/gtest/gupnp-simple-igd.c +@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, + GUPnPDeviceInfo *subdev1; + GUPnPDeviceInfo *subdev2; + const gchar *xml_path = "."; ++ GError *error = NULL; + + g_signal_connect (igd, "context-available", + G_CALLBACK (ignore_non_localhost), NULL); + + if (mainctx) + g_main_context_push_thread_default (mainctx); +- context = gupnp_context_new (NULL, "lo", 0, NULL); ++ context = gupnp_context_new ("lo", 0, NULL); + g_assert (context); + + if (g_getenv ("XML_PATH")) +@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, + gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); + */ + +- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); ++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); + g_assert (dev); ++ g_assert (error == NULL); + + subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), + "urn:schemas-upnp-org:device:WANDevice:1"); +-- +2.25.1 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb similarity index 63% rename from meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb rename to meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb index 0aa594d..1a98ace 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb @@ -3,11 +3,13 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" -DEPENDS = "glib-2.0 gupnp sqlite3" +DEPENDS = "glib-2.0 gssdp gupnp sqlite3" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "124371136b5a7b1056a3681780a62772" -SRC_URI[sha256sum] = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz \ + file://0001-Swtich-to-new-GUPnP-API.patch \ + " +SRC_URI[md5sum] = "d164e096d0f140bb1f5d9503727b424a" +SRC_URI[sha256sum] = "8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20" inherit autotools pkgconfig gtk-doc gobject-introspection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:28 +0000 Subject: [oe-commits] [meta-openembedded] 13/15: luajit: Add luajit 2.1.0-beta3 recipe In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.BC6E723283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b3c413689eb1665dbbfe8d9d0843ada4078d8e1d Author: Leo Yan AuthorDate: Tue Feb 18 13:25:42 2020 +0800 luajit: Add luajit 2.1.0-beta3 recipe Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, this patch adds recipe for luajit 2.1.0-beta3 building. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit_2.1.0.bb | 92 +++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.1.0.bb b/meta-oe/recipes-devtools/luajit/luajit_2.1.0.bb new file mode 100644 index 0000000..167b5d2 --- /dev/null +++ b/meta-oe/recipes-devtools/luajit/luajit_2.1.0.bb @@ -0,0 +1,92 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +HOMEPAGE = "http://luajit.org" + +PV .= "+git${SRCPV}" +SRCREV = "v2.1.0-beta3" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1" + +S = "${WORKDIR}/git" + +inherit pkgconfig binconfig siteinfo + +BBCLASSEXTEND = "native" + +# http://luajit.org/install.html#cross +# Host luajit needs to be compiled with the same pointer size +# If you want to cross-compile to any 32 bit target on an x64 OS, +# you need to install the multilib development package (e.g. +# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part +# (HOST_CC="gcc -m32"). +BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}" + +# The lua makefiles expect the TARGET_SYS to be from uname -s +# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD +LUA_TARGET_OS = "Unknown" +LUA_TARGET_OS_darwin = "Darwin" +LUA_TARGET_OS_linux = "Linux" +LUA_TARGET_OS_linux-gnueabi = "Linux" +LUA_TARGET_OS_mingw32 = "Windows" + +# We don't want the lua buildsystem's compiler optimizations, or its +# stripping, and we don't want it to pick up CFLAGS or LDFLAGS, as those apply +# to both host and target compiles +EXTRA_OEMAKE = "\ + Q= E='@:' \ + \ + CCOPT= CCOPT_x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \ + \ + 'TARGET_SYS=${LUA_TARGET_OS}' \ + \ + 'CC=${CC}' \ + 'TARGET_AR=${AR} rcus' \ + 'TARGET_CFLAGS=${CFLAGS}' \ + 'TARGET_LDFLAGS=${LDFLAGS}' \ + 'TARGET_SHLDFLAGS=${LDFLAGS}' \ + 'HOST_CC=${BUILD_CC}' \ + 'HOST_CFLAGS=${BUILD_CFLAGS}' \ + \ + 'PREFIX=${prefix}' \ + 'MULTILIB=${baselib}' \ + 'LDCONFIG=:' \ +" + +do_compile () { + oe_runmake +} + +# There's INSTALL_LIB and INSTALL_SHARE also, but the lua binary hardcodes the +# '/share' and '/' + LUA_MULTILIB paths, so we don't want to break those +# expectations. +EXTRA_OEMAKEINST = "\ + 'DESTDIR=${D}' \ + 'INSTALL_BIN=${D}${bindir}' \ + 'INSTALL_INC=${D}${includedir}/luajit-$(MAJVER).$(MINVER)' \ + 'INSTALL_MAN=${D}${mandir}/man1' \ +" +do_install () { + oe_runmake ${EXTRA_OEMAKEINST} install + rmdir ${D}${datadir}/lua/5.* \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.* \ + ${D}${libdir}/lua +} + +PACKAGES += 'luajit-common' + +# See the comment for EXTRA_OEMAKEINST. This is needed to ensure the hardcoded +# paths are packaged regardless of what the libdir and datadir paths are. +FILES_${PN} += "${prefix}/${baselib} ${prefix}/share" +FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ + ${libdir}/libluajit-5.1.so.${PV} \ +" +FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" + +# mips64 is not supported in this release +COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST_mipsarchn64 = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:29 +0000 Subject: [oe-commits] [meta-openembedded] 14/15: BCC: Add build recipe In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.C78CD23283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4c6737552e20e7c7c2283caf905dfdf6667f5dcd Author: Sumit Garg AuthorDate: Tue Feb 18 13:25:43 2020 +0800 BCC: Add build recipe BPF Compiler Collection (BCC) is a toolkit for creating efficient kernel tracing and manipulation programs, and includes versatile tools and examples which based on eBPF. This tool is very widely used on server section, but we also can use it for embedded system, e.g. use its function trace utilities (trace.py and argdist.py) to trace kernel function parameters and return values. This patch adds recipe for BCC version 0.12.0. This patch also contains a patch to change cmake file so can look for libraries and headers which are installed in target sysroot-recipe path for cross compilation. Signed-off-by: Sumit Garg Co-developed-by: Leo Yan Signed-off-by: Khem Raj --- ...build-with-OE-LLVM-cross-compiled-package.patch | 32 +++++++++++++++++++ meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb | 37 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/meta-oe/recipes-devtools/bcc/bcc/0001-Allow-to-build-with-OE-LLVM-cross-compiled-package.patch b/meta-oe/recipes-devtools/bcc/bcc/0001-Allow-to-build-with-OE-LLVM-cross-compiled-package.patch new file mode 100644 index 0000000..b5acadc --- /dev/null +++ b/meta-oe/recipes-devtools/bcc/bcc/0001-Allow-to-build-with-OE-LLVM-cross-compiled-package.patch @@ -0,0 +1,32 @@ +From 93cf25ba663e68a6a6f4237fbe0ef8349b3f37ef Mon Sep 17 00:00:00 2001 +From: Sumit Garg +Date: Fri, 14 Feb 2020 07:40:11 +0000 +Subject: [PATCH] Allow to build with OE LLVM cross compiled package + +The default LLVM cmake package requires all libraries, headers and tools +to be present but in case of cross compilation, OE only provides +target specific libraries and headers and requires native llvm tools. + +So instead of looking for a complete llvm package, look for libraries and +headers which are installed in target sysroot-recipe path. + +Signed-off-by: Sumit Garg +--- + CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7bd0f3b2..6f1f12c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,8 +39,6 @@ endif() + if(NOT PYTHON_ONLY AND ENABLE_CLANG_JIT) + find_package(BISON) + find_package(FLEX) +-find_package(LLVM REQUIRED CONFIG) +-message(STATUS "Found LLVM: ${LLVM_INCLUDE_DIRS} ${LLVM_PACKAGE_VERSION}") + find_package(LibElf REQUIRED) + + # clang is linked as a library, but the library path searching is +-- +2.17.1 diff --git a/meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb b/meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb new file mode 100644 index 0000000..687fb64 --- /dev/null +++ b/meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "BPF Compiler Collection (BCC)" +HOMEPAGE = "https://github.com/iovisor/bcc" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e" + +DEPENDS += "bison-native \ + ninja-native \ + elfutils-native \ + flex-native \ + ${MLPREFIX}elfutils \ + ${MLPREFIX}binutils \ + ${MLPREFIX}flex \ + luajit \ + clang \ + " + +RDEPENDS_${PN} += "bash python" + +SRC_URI = "git://github.com/iovisor/bcc \ + file://0001-Allow-to-build-with-OE-LLVM-cross-compiled-package.patch \ + " +SRCREV = "368a5b0714961953f3e3f61607fa16cb71449c1b" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_LLVM_SHARED=ON \ + -DENABLE_CLANG_JIT=ON \ + -DENABLE_MAN=OFF \ + -DLLVM_PACKAGE_VERSION=${LLVMVERSION} \ + -DPYTHON_CMD=python3 \ +" + +FILES_${PN} += "${libdir}/python*/dist-packages" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:27:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:27:30 +0000 Subject: [oe-commits] [meta-openembedded] 15/15: bpftrace: Add build recipe In-Reply-To: <158200723560.28894.7357338143158803527@git.openembedded.org> References: <158200723560.28894.7357338143158803527@git.openembedded.org> Message-ID: <20200218062716.D2060232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 988db92a2d347ec2173e0c8cb6fded338e14dd5d Author: Sumit Garg AuthorDate: Tue Feb 18 13:25:44 2020 +0800 bpftrace: Add build recipe bpftrace is a high-level tracing language for eBPF, its language is inspired by awk and C, and predecessor tracers such as DTrace and SystemTap. bpftrace was created by Alastair Robertson. bpftrace language supports the usages for one-liner and script, it's very powerful for tracing and profiling. bpftrace internal mechanism depends on BCC and LLVM/Clang, so the building dependency has contains these modules. Add recipe for bpftrace version 0.9.4. This patch also contains a patch to change cmake file so can look for libraries and headers which are installed in target sysroot-recipe path for cross compilation. Signed-off-by: Sumit Garg Co-developed-by: Leo Yan Signed-off-by: Khem Raj --- ...ild-with-OE-llvm-clang-cross-compiled-pac.patch | 65 ++++++++++++++++++++++ .../recipes-devtools/bpftrace/bpftrace_0.9.4.bb | 34 +++++++++++ 2 files changed, 99 insertions(+) diff --git a/meta-oe/recipes-devtools/bpftrace/bpftrace/0001-Allow-to-build-with-OE-llvm-clang-cross-compiled-pac.patch b/meta-oe/recipes-devtools/bpftrace/bpftrace/0001-Allow-to-build-with-OE-llvm-clang-cross-compiled-pac.patch new file mode 100644 index 0000000..d6cb322 --- /dev/null +++ b/meta-oe/recipes-devtools/bpftrace/bpftrace/0001-Allow-to-build-with-OE-llvm-clang-cross-compiled-pac.patch @@ -0,0 +1,65 @@ +From cdfd9284c7e83b1bd18c94c0f39c020f31759178 Mon Sep 17 00:00:00 2001 +From: Sumit Garg +Date: Mon, 17 Feb 2020 09:45:38 +0000 +Subject: [PATCH] Allow to build with OE llvm & clang cross compiled packages + +The default llvm and clang cmake packages requires all libraries, headers +and tools to be present but in case of cross compilation, OE only +provides target specific libraries and headers and requires native llvm +or clang tools. + +So instead of looking for a complete llvm & clang packages, look for +libraries and headers which are installed in target sysroot-recipe path. + +Also, fix name for clang library lookup. + +Signed-off-by: Sumit Garg +--- + CMakeLists.txt | 6 +++--- + src/ast/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b766669..e4de1e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ set(STATIC_LIBC OFF CACHE BOOL "Attempt to embed libc, only known to work with m + set(EMBED_LLVM OFF CACHE BOOL "Build LLVM static libs as an ExternalProject and link to these instead of system libs.") + set(EMBED_CLANG OFF CACHE BOOL "Build Clang static libs as an ExternalProject and link to these instead of system libs.") + set(EMBED_LIBCLANG_ONLY OFF CACHE BOOL "Build only libclang.a, and link to system libraries statically") +-set(LLVM_VERSION "8" CACHE STRING "Embedded LLVM/Clang version to build and link against.") ++set(LLVM_VERSION "9" CACHE STRING "Embedded LLVM/Clang version to build and link against.") + set(BUILD_ASAN OFF CACHE BOOL "Build bpftrace with -fsanitize=address") + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +@@ -122,7 +122,7 @@ check_include_file("sys/sdt.h" HAVE_SYSTEMTAP_SYS_SDT_H) + + if (EMBED_LLVM) + include(embed_llvm) +-else() ++elseif(0) + # Some users have multiple versions of llvm installed and would like to specify + # a specific llvm version. + if(${LLVM_REQUESTED_VERSION}) +@@ -142,7 +142,7 @@ endif() + + if(EMBED_CLANG) + include(embed_clang) +-else() ++elseif(0) + find_package(Clang REQUIRED) + include_directories(SYSTEM ${CLANG_INCLUDE_DIRS}) + endif() +diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt +index f280f47..f8b9dff 100644 +--- a/src/ast/CMakeLists.txt ++++ b/src/ast/CMakeLists.txt +@@ -57,5 +57,5 @@ else() + llvm_expand_dependencies(llvm_libs ${_llvm_libs}) + target_link_libraries(ast ${llvm_libs}) + endif() +- target_link_libraries(ast libclang) ++ target_link_libraries(ast clang) + endif() +-- +2.17.1 diff --git a/meta-oe/recipes-devtools/bpftrace/bpftrace_0.9.4.bb b/meta-oe/recipes-devtools/bpftrace/bpftrace_0.9.4.bb new file mode 100644 index 0000000..32a8b0b --- /dev/null +++ b/meta-oe/recipes-devtools/bpftrace/bpftrace_0.9.4.bb @@ -0,0 +1,34 @@ +SUMMARY = "bpftrace" +HOMEPAGE = "https://github.com/iovisor/bpftrace" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS += "bison-native \ + ninja-native \ + elfutils-native \ + flex-native \ + gtest-native \ + git-native \ + ${MLPREFIX}elfutils \ + ${MLPREFIX}binutils \ + ${MLPREFIX}flex \ + clang \ + bcc \ + " + +RDEPENDS_${PN} += "bash python3" + +SRC_URI = "git://github.com/iovisor/bpftrace \ + file://0001-Allow-to-build-with-OE-llvm-clang-cross-compiled-pac.patch \ + " +SRCREV = "85f9eea624c83443816e37654d0c1c93366a2e66" + +S = "${WORKDIR}/git" + +inherit cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 06:31:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 06:31:42 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (988db92 -> af2be2e) Message-ID: <158200750268.991.18268200249435827463@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 988db92 bpftrace: Add build recipe discard 4c67375 BCC: Add build recipe discard b3c4136 luajit: Add luajit 2.1.0-beta3 recipe discard fb3c909 Ply: Add recipe for git version This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master-next (af2be2e) \ O -- O -- O (988db92) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ...build-with-OE-LLVM-cross-compiled-package.patch | 32 -------- meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb | 37 --------- ...ild-with-OE-llvm-clang-cross-compiled-pac.patch | 65 --------------- .../recipes-devtools/bpftrace/bpftrace_0.9.4.bb | 34 -------- meta-oe/recipes-devtools/luajit/luajit_2.1.0.bb | 92 ---------------------- meta-oe/recipes-devtools/ply/ply_git.bb | 27 ------- 6 files changed, 287 deletions(-) delete mode 100644 meta-oe/recipes-devtools/bcc/bcc/0001-Allow-to-build-with-OE-LLVM-cross-compiled-package.patch delete mode 100644 meta-oe/recipes-devtools/bcc/bcc_0.12.0.bb delete mode 100644 meta-oe/recipes-devtools/bpftrace/bpftrace/0001-Allow-to-build-with-OE-llvm-clang-cross-compiled-pac.patch delete mode 100644 meta-oe/recipes-devtools/bpftrace/bpftrace_0.9.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.0.bb delete mode 100644 meta-oe/recipes-devtools/ply/ply_git.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 13:59:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 13:59:28 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (688052a -> 6b74238) Message-ID: <158203436881.15348.4576850077441078922@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 688052a babeltrace: update to 1.5.8 new 0586fcd webkitgtk: Fix errors when api-documentation is enabled new 6b74238 p11-kit: Fix builds with systemd The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++++ meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 13:59:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 13:59:29 +0000 Subject: [oe-commits] [openembedded-core] 01/02: webkitgtk: Fix errors when api-documentation is enabled In-Reply-To: <158203436881.15348.4576850077441078922@git.openembedded.org> References: <158203436881.15348.4576850077441078922@git.openembedded.org> Message-ID: <20200218135928.EC87623283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0586fcdc048d8c9e8b63a954fef2de05ff53400b Author: Richard Purdie AuthorDate: Tue Feb 18 13:27:48 2020 +0000 webkitgtk: Fix errors when api-documentation is enabled This recipe hasn't built correctly since we removed "python" from HOSTTOOLS when api-documentation is enabled. Add in an extra symlink to "python" rather than trying to fix the multiple scripts in webkit to refer to python3. The autobuilder didn't detect this as wekbkit was excluded from the API docs world build but that is changed now so this fixes build failures. Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c7f0d5e..3eb27a1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -58,6 +58,12 @@ PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +# webkitgtk is full of /usr/bin/env python, particular for generating docs +do_configure[postfuncs] += "setup_python_link" +setup_python_link() { + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python +} + EXTRA_OECMAKE = " \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 13:59:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 13:59:30 +0000 Subject: [oe-commits] [openembedded-core] 02/02: p11-kit: Fix builds with systemd In-Reply-To: <158203436881.15348.4576850077441078922@git.openembedded.org> References: <158203436881.15348.4576850077441078922@git.openembedded.org> Message-ID: <20200218135929.0192F23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6b742380b7c96e77d917769fed8f8131076a04ac Author: Richard Purdie AuthorDate: Tue Feb 18 13:52:29 2020 +0000 p11-kit: Fix builds with systemd In systemd enabled builds this was failing with unpackaged unit files. Fix this. Signed-off-by: Richard Purdie --- meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb index 03c8158..19895ec 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb @@ -20,7 +20,8 @@ GTKDOC_MESON_OPTION = 'gtk_doc' FILES_${PN} += " \ ${libdir}/p11-kit-proxy.so \ ${libdir}/pkcs11/*.so \ - ${libdir}/pkcs11/*.la" + ${libdir}/pkcs11/*.la \ + ${systemd_user_unitdir}/*" # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP_${PN} = "dev-so" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 13:59:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 13:59:40 +0000 Subject: [oe-commits] [bitbake] branch 1.42 updated: cooker/siggen: Empty siggen cache during parsing Message-ID: <158203438007.15624.10586416775021809317@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.42 in repository bitbake. The following commit(s) were added to refs/heads/1.42 by this push: new d411b09 cooker/siggen: Empty siggen cache during parsing d411b09 is described below commit d411b097d810c386d35dc561f8812bb3f35c9a36 Author: Richard Purdie AuthorDate: Mon Feb 17 16:18:25 2020 +0000 cooker/siggen: Empty siggen cache during parsing When parsing recipes its apparent the memory usage of bitbake rises linearly with number of recipes parsed. It shouldn't. Using tracemalloc (thanks for the tip Joshua Lock) it was clear that the dependency information left behind in siggen was the culprit. Add a new method to allow us to drop this information. We don't need it after the recipe has been parsed and hashes calculated (at runtime its different but only the currently executing task would be in memory). This should give signficant memory usage improvements for bitbake and that in turn should help speed on more constrained systems, as well as when used in multiconfig environments. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 3 ++- lib/bb/siggen.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 77d18a5..cfac91b 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1934,7 +1934,8 @@ class Parser(multiprocessing.Process): except IndexError: break result = self.parse(*job) - + # Clear the siggen cache after parsing to control memory usage, its huge + bb.parse.siggen.postparsing_clean_cache() try: self.results.put(result, timeout=0.25) except queue.Full: diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 3e2a85f..9c299d4 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -48,6 +48,9 @@ class SignatureGenerator(object): def get_unihash(self, task): return self.taskhash[task] + def postparsing_clean_cache(self): + return + def get_taskhash(self, fn, task, deps, dataCache): return "0" @@ -152,6 +155,14 @@ class SignatureGeneratorBasic(SignatureGenerator): for task in taskdeps: d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + "." + task]) + def postparsing_clean_cache(self): + # + # After parsing we can remove some things from memory to reduce our memory footprint + # + self.gendeps = {} + self.lookupcache = {} + self.taskdeps = {} + def rundep_check(self, fn, recipename, task, dep, depname, dataCache): # Return True if we should keep the dependency, False to drop it # We only manipulate the dependencies for packages not in the whitelist -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 13:59:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 13:59:41 +0000 Subject: [oe-commits] [bitbake] branch 1.44 updated: cooker/siggen: Empty siggen cache during parsing Message-ID: <158203438008.15624.8353769558532725528@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch 1.44 in repository bitbake. The following commit(s) were added to refs/heads/1.44 by this push: new ef29309 cooker/siggen: Empty siggen cache during parsing ef29309 is described below commit ef29309d0b512b64d024e383e7baff22c727711c Author: Richard Purdie AuthorDate: Mon Feb 17 16:18:25 2020 +0000 cooker/siggen: Empty siggen cache during parsing When parsing recipes its apparent the memory usage of bitbake rises linearly with number of recipes parsed. It shouldn't. Using tracemalloc (thanks for the tip Joshua Lock) it was clear that the dependency information left behind in siggen was the culprit. Add a new method to allow us to drop this information. We don't need it after the recipe has been parsed and hashes calculated (at runtime its different but only the currently executing task would be in memory). This should give signficant memory usage improvements for bitbake and that in turn should help speed on more constrained systems, as well as when used in multiconfig environments. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 3 ++- lib/bb/siggen.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 911805a..d2d308a 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1944,7 +1944,8 @@ class Parser(multiprocessing.Process): except IndexError: break result = self.parse(*job) - + # Clear the siggen cache after parsing to control memory usage, its huge + bb.parse.siggen.postparsing_clean_cache() try: self.results.put(result, timeout=0.25) except queue.Full: diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ffd8fca..c2d0c73 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -51,6 +51,9 @@ class SignatureGenerator(object): def finalise(self, fn, d, varient): return + def postparsing_clean_cache(self): + return + def get_unihash(self, tid): return self.taskhash[tid] @@ -188,6 +191,14 @@ class SignatureGeneratorBasic(SignatureGenerator): for task in taskdeps: d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + ":" + task]) + def postparsing_clean_cache(self): + # + # After parsing we can remove some things from memory to reduce our memory footprint + # + self.gendeps = {} + self.lookupcache = {} + self.taskdeps = {} + def rundep_check(self, fn, recipename, task, dep, depname, dataCache): # Return True if we should keep the dependency, False to drop it # We only manipulate the dependencies for packages not in the whitelist -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 16:22:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 16:22:03 +0000 Subject: [oe-commits] [meta-openembedded] branch zeus updated (e855ecc -> bb65c27) Message-ID: <158204292386.17481.5136160008989568782@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch zeus in repository meta-openembedded. from e855ecc ruli: Fix install step and build samples too add ff16275 nodejs: libatomic patch should be target specific add 688e19d dnsmasq: CVE-2019-14834 add 2ce57e0 cpprest: fix cmake installation directory add 636660b websocketapp: Fix multilib build add eb8090f websocketpp: add various upstream accepted and proposed patches to fix various issues, including: add c5cf476 websocketpp: Fix clang specific flags in cmake files add ae5aa7b websocketpp: refresh clang patch add 81e186f adduser: set default shell with /sbin/nologin add f64c2d6 libldb: upgrade 1.5.5 -> 1.5.6 add 14acba7 mariadb: fix library LZ4 lookup add 6599629 python-twisted: add required RDEPENDS for twistd add 12390fd pyhamcrest: add python3 version of recipe add b951000 gitpkgv.bbclass: Add support for extending the supported tag formats add 9abf137 squid: Link with libatomic on riscv add 189ba6b grpc: Link with libatomic on clang/x86 add a824942 grpc: Link with libatomic on powerpc add 40d9226 grpc: Link with libatomic on riscv add 9d6b30b netdata: Add libatomic to link step add bb65c27 fluentbit: Fix packaging in multilib env No new revisions were added by this update. Summary of changes: meta-networking/recipes-daemons/squid/squid_4.6.bb | 2 + .../recipes-devtools/grpc/grpc_1.24.1.bb | 16 +++ .../0001-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 ++++++++ .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 + .../libldb/{libldb_1.5.5.bb => libldb_1.5.6.bb} | 4 +- meta-oe/classes/gitpkgv.bbclass | 14 ++- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + .../mariadb/0001-Fix-library-LZ4-lookup.patch | 30 +++++ meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 2 +- .../fluentbit/fluentbit/cmake_multilib.patch | 18 +++ .../fluentbit/fluentbit_0.12.19.bb | 1 + meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb | 2 +- .../0001-Correct-clang-compiler-flags.patch | 32 +++++ .../0001-cmake-Use-GNUInstallDirs.patch | 35 ++++++ .../websocketpp/websocketpp-0.8.1/771.patch | 22 ++++ .../websocketpp/websocketpp-0.8.1/842.patch | 30 +++++ .../websocketpp/websocketpp-0.8.1/855.patch | 23 ++++ .../websocketpp/websocketpp-0.8.1/857.patch | 132 +++++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 17 ++- meta-perl/recipes-perl/adduser/adduser_3.118.bb | 1 + ...duser-set-default-shell-with-sbin-nologin.patch | 34 ++++++ .../recipes-devtools/python/python-twisted.inc | 18 ++- ...mcrest_1.9.0.bb => python3-pyhamcrest_1.9.0.bb} | 4 +- .../recipes-webadmin/netdata/netdata_git.bb | 2 + 24 files changed, 478 insertions(+), 12 deletions(-) create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch rename meta-networking/recipes-support/libldb/{libldb_1.5.5.bb => libldb_1.5.6.bb} (95%) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch create mode 100644 meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch copy meta-python/recipes-devtools/python/{python-pyhamcrest_1.9.0.bb => python3-pyhamcrest_1.9.0.bb} (85%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 17:30:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 17:30:04 +0000 Subject: [oe-commits] [openembedded-core] 01/03: concurrencytest.py: add outSideTestaddSkip for subunit In-Reply-To: <158204700329.28550.257369537210550735@git.openembedded.org> References: <158204700329.28550.257369537210550735@git.openembedded.org> Message-ID: <20200218173003.8827F23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 94887b7f63ff878c3fb4012e48aa1118845483ea Author: Trevor Gamblin AuthorDate: Tue Feb 18 09:56:18 2020 -0500 concurrencytest.py: add outSideTestaddSkip for subunit see: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 When running oe-selftest in concurrency mode (e.g. with oe-selftest --run-tests oescripts.OEPybootchartguyTests -j 4), if a skip occurred during setUpClass() rather than within individual tests, the entire suite would show "UNKNOWN" as each test's result. This is because subunit doesn't know how to handle skips outside of individual tests. An example of where this occurs is when running the above call to oe-selftest in concurrency mode on a host machine that does not have python3-cairo installed. Patch subunit inside concurrencytest.py to provide a method called outSideTestaddSkip, which will allow subunit to correctly detect the skip in setUpClass(). Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/utils/concurrencytest.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 71ec0df..0d9c01e 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -146,6 +146,20 @@ def outSideTestaddError(self, offset, line): subunit._OutSideTest.addError = outSideTestaddError +# Like outSideTestaddError above, we need an equivalent for skips +# happening at the setUpClass() level, otherwise we will see "UNKNOWN" +# as a result for concurrent tests +# +def outSideTestaddSkip(self, offset, line): + """A 'skip:' directive has been read.""" + test_name = line[offset:-1].decode('utf8') + self.parser._current_test = subunit.RemotedTestCase(test_name) + self.parser.current_test_description = test_name + self.parser._state = self.parser._reading_skip_details + self.parser._reading_skip_details.set_simple() + self.parser.subunitLineReceived(line) + +subunit._OutSideTest.addSkip = outSideTestaddSkip # # A dummy structure to add to io.StringIO so that the .buffer object -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 17:30:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 17:30:03 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6b74238 -> 36ff085) Message-ID: <158204700329.28550.257369537210550735@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 6b74238 p11-kit: Fix builds with systemd new 94887b7 concurrencytest.py: add outSideTestaddSkip for subunit new 8ea40e1 glibc-package.inc: fix multilib headers conflict new 36ff085 perl: Fix encode module reproducibility issues The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/core/utils/concurrencytest.py | 14 ++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 2 +- meta/recipes-devtools/perl/files/encodefix.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 17:30:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 17:30:05 +0000 Subject: [oe-commits] [openembedded-core] 02/03: glibc-package.inc: fix multilib headers conflict In-Reply-To: <158204700329.28550.257369537210550735@git.openembedded.org> References: <158204700329.28550.257369537210550735@git.openembedded.org> Message-ID: <20200218173003.936F623283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ea40e11c867aa3a97726facad880f774fc912af Author: Kai Kang AuthorDate: Tue Feb 11 23:07:41 2020 +0800 glibc-package.inc: fix multilib headers conflict Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in glibc-package.inc to fix files conflict: | Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 3aed7be..285a9aa 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -87,7 +87,7 @@ do_install() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} fi - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h if [ -f ${D}${bindir}/mtrace ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 17:30:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 17:30:06 +0000 Subject: [oe-commits] [openembedded-core] 03/03: perl: Fix encode module reproducibility issues In-Reply-To: <158204700329.28550.257369537210550735@git.openembedded.org> References: <158204700329.28550.257369537210550735@git.openembedded.org> Message-ID: <20200218173003.A0B4A232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 36ff08511bcb158f38b81e1cbd1854bdc678a839 Author: Richard Purdie AuthorDate: Tue Feb 18 17:27:26 2020 +0000 perl: Fix encode module reproducibility issues The code is encoding host compiler parameters into target builds. Avoid this for our target builds. This should resolve builds which aren't reproducible between hosts with different compilers. Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/encodefix.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 23 insertions(+) diff --git a/meta/recipes-devtools/perl/files/encodefix.patch b/meta/recipes-devtools/perl/files/encodefix.patch new file mode 100644 index 0000000..396ed0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/encodefix.patch @@ -0,0 +1,20 @@ +The code is encoding host compiler parameters into target builds. Avoid +this for our target builds (patch is target specific, not native) + +Upstream-Status: Inappropriate [Cross compile hack] +RP 2020/2/18 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/cpan/Encode/bin/enc2xs +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs ++++ perl-5.30.1/cpan/Encode/bin/enc2xs +@@ -195,7 +195,7 @@ sub compiler_info { + # above becomes false. + my $sized = $declaration && !($compat && !$pedantic); + +- return ($cpp, $static, $sized); ++ return (0, 1, 1); + } + + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 5d76271..b37f175 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -26,6 +26,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " +SRC_URI_append_class-target = " \ + file://encodefix.patch \ +" SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 22:37:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 22:37:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: iproute2: add devlink support to iproute2 Message-ID: <158206542592.6265.6674921405746324479@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 499b163 iproute2: add devlink support to iproute2 499b163 is described below commit 499b1630613dfda6c0ad19f9c39c4e0b32efc074 Author: Scott Branden via Openembedded-core AuthorDate: Sun Feb 9 12:26:00 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..6ef9201 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" do_configure_append () { @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ ${PN}-rtacct \ ${PN}-nstat \ ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 22:37:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 22:37:18 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: cooker: Reset loghandler Message-ID: <158206543815.6575.16741149649680722908@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new 65419e3 cooker: Reset loghandler 65419e3 is described below commit 65419e334d337826704287702725017aee73ac4b Author: Richard Purdie AuthorDate: Mon Feb 17 17:30:08 2020 +0000 cooker: Reset loghandler When parsing, reset the loghandler when finished, else the messages can be misleading. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index a05630d..2d937a4 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1949,6 +1949,7 @@ class Parser(multiprocessing.Process): def parse(self, filename, appends): try: + origfilter = bb.event.LogHandler.filter # Record the filename we're parsing into any events generated def parse_filter(self, record): record.taskpid = bb.event.worker_pid @@ -1971,6 +1972,8 @@ class Parser(multiprocessing.Process): # a SystemExit event for example. except BaseException as exc: return True, ParsingFailure(exc, filename) + finally: + bb.event.LogHandler.filter = origfilter class CookerParser(object): def __init__(self, cooker, filelist, masked): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 22:56:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 22:56:27 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (499b163 -> 02df17f) Message-ID: <158206658746.15925.15940460191658282930@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 499b163 iproute2: add devlink support to iproute2 new cb75b68 iproute2: add devlink support to iproute2 new 02df17f glib-2.0: add dependencies to fix ptest failures This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (499b163) \ N -- N -- N refs/heads/master-next (02df17f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 22:56:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 22:56:28 +0000 Subject: [oe-commits] [openembedded-core] 01/02: iproute2: add devlink support to iproute2 In-Reply-To: <158206658746.15925.15940460191658282930@git.openembedded.org> References: <158206658746.15925.15940460191658282930@git.openembedded.org> Message-ID: <20200218225627.9FFE123283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cb75b6806b4fa724a7a0148b02c0e61d86d1a51e Author: Scott Branden via Openembedded-core AuthorDate: Sun Feb 9 12:26:00 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..6ef9201 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" do_configure_append () { @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ ${PN}-rtacct \ ${PN}-nstat \ ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 22:56:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 22:56:29 +0000 Subject: [oe-commits] [openembedded-core] 02/02: glib-2.0: add dependencies to fix ptest failures In-Reply-To: <158206658746.15925.15940460191658282930@git.openembedded.org> References: <158206658746.15925.15940460191658282930@git.openembedded.org> Message-ID: <20200218225627.ABF27232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 02df17f9096f255c4dee871a5f63145a82f2fe57 Author: Mingde (Matthew) Zeng AuthorDate: Tue Feb 18 14:46:49 2020 -0500 glib-2.0: add dependencies to fix ptest failures There are a number of ptest failures due to executables not found in the image. Since these executables are in FILES_${PN}-dev, depending all of -dev which is an overkill. We take them out of -dev and put in -utils, then depend on the latter instead. When starting a glib ptest but decided to Ctrl-c interrupt midway, ./run-ptest cannot be restarted unless running `userdel glib2-test` manually. Therefore adding a check prior to ptest will ensure the ptest can be restarted. Signed-off-by: Matthew Zeng Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index fc50082..7a231b5 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -1,6 +1,9 @@ #! /bin/sh set -eux +if id -u glib2-test; then + userdel glib2-test +fi useradd glib2-test su glib2-test -c 'gnome-desktop-testing-runner glib' userdel glib2-test diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index f4aff29..23c347d 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -58,13 +58,15 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${datadir}/glib-2.0/schemas" + +FILES_${PN}-utils += "${bindir}/glib-genmarshal \ + ${bindir}/glib-gettextize \ + ${bindir}/glib-mkenums \ + ${bindir}/glib-compile-resources" + FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la \ - ${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources \ ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ ${datadir}/glib-2.0/schemas/gschema.dtd \ ${datadir}/glib-2.0/valgrind/glib.supp \ @@ -138,6 +140,8 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = "" RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" +RDEPENDS_${PN}-ptest += "${PN}-utils" + RDEPENDS_${PN}-ptest += "\ coreutils \ libgcc \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:18 +0000 Subject: [oe-commits] [openembedded-core] 02/15: qemux86: do not add vga=0 to kernel parameters In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235416.B4E10232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 857078ba8eda153f4a097683db551a7d310ecc01 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:07 2020 +0100 qemux86: do not add vga=0 to kernel parameters This was added ages ago to enable GL passthrough with vmware driver, and is no longer relevant, as std or virgl is used instead nowadays. Original commit: commit 072545b1111c5efb66289a4866897429f5fcd969 Author: Richard Purdie Date: Wed Jan 21 17:40:51 2009 +0000 scripts/poky-qemu-internal: Add support for GL passthrough in qemux86 images Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-x86.inc | 2 +- scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 495418f..049681b 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -8,7 +8,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index c8d9f12..22b4521 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks @@ -4,5 +4,5 @@ include common.wks.inc -bootloader --timeout=0 --append="vga=0 rw oprofile.timer=1 rootfstype=ext4 " +bootloader --timeout=0 --append="rw oprofile.timer=1 rootfstype=ext4 " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:17 +0000 Subject: [oe-commits] [openembedded-core] 01/15: procps: upstream has switched to gitlab In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235416.A69B723283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7c67cff7683aeb80a07f55589f6c2f2a3dd6b44b Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:06 2020 +0100 procps: upstream has switched to gitlab Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.3.16.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_3.3.16.bb index 60f9097..2810ebd 100644 --- a/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -12,14 +12,19 @@ DEPENDS = "ncurses" inherit autotools gettext pkgconfig update-alternatives -SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ +SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ file://sysctl.conf \ " +SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" -SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" -SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" +S = "${WORKDIR}/git" -S = "${WORKDIR}/procps-ng-${PV}" +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they +# don't ship a po/POTFILES.in (which is silly). Without that file gettext +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. +do_configure_prepend() { + ( cd ${S} && po/update-potfiles ) +} EXTRA_OECONF = "--enable-skill --disable-modern-top" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:20 +0000 Subject: [oe-commits] [openembedded-core] 04/15: weston: add a basic runtime test In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235416.D85B5232844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 57700767f90eea8f2b78187c42581aca42d50bbf Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:11 2020 +0100 weston: add a basic runtime test The test is checking that weston is able to start. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/lib/oeqa/runtime/cases/weston.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75f0f2c..9588f2c 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -57,7 +57,7 @@ BASICTESTSUITE = "\ ping date df ssh scp python perl gi ptest parselogs \ logrotate connman systemd oe_syslog pam stap ldd xorg \ kernelmodule gcc buildcpio buildlzip buildgalculator \ - dnf rpm opkg apt" + dnf rpm opkg apt weston" DEFAULT_TEST_SUITES = "${BASICTESTSUITE}" diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py new file mode 100644 index 0000000..f32599a --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/weston.py @@ -0,0 +1,19 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfNotFeature +from oeqa.runtime.decorator.package import OEHasPackage + +class WestonTest(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['weston']) + def test_weston_running(self): + cmd ='%s | grep [w]eston-desktop-shell' % self.tc.target_cmds['ps'] + status, output = self.target.run(cmd) + msg = ('Weston does not appear to be running %s' % + self.target.run(self.tc.target_cmds['ps'])[1]) + self.assertEqual(status, 0, msg=msg) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:16 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (c9b5802 -> 71cdbf4) Message-ID: <158207005627.4105.2347584696257695027@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from c9b5802 openssh: Upgrade 8.1p1 -> 8.2p1 new 7c67cff procps: upstream has switched to gitlab new 857078b qemux86: do not add vga=0 to kernel parameters new 1cf26f6 qemux86: drop resolution setting via uvesafb new 5770076 weston: add a basic runtime test new 8de634b ptest-packagelists: mention ifupdown ptest in a comment new ee7be51 python3: resolve ncurses host contamination new 9797d3b fix various, innocuous typos new 59dbb6d systemd: upgrade v244.1 -> v244.3 new 8fdceff insane.bbclass: Correct typo inhert->inherit new 7c88483 babeltrace: update to 1.5.8 new c9e520e webkitgtk: Fix errors when api-documentation is enabled new 8101055 p11-kit: Fix builds with systemd new 9b8734b concurrencytest.py: add outSideTestaddSkip for subunit new 0af9ff8 glibc-package.inc: fix multilib headers conflict new 71cdbf4 perl: Fix encode module reproducibility issues The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/insane.bbclass | 2 +- meta/classes/testimage.bbclass | 4 +- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/conf/licenses.conf | 2 +- meta/conf/machine/include/qemuboot-x86.inc | 3 +- meta/conf/machine/qemux86-64.conf | 4 -- meta/conf/machine/qemux86.conf | 4 -- meta/lib/oeqa/core/utils/concurrencytest.py | 14 ++++ meta/lib/oeqa/manual/eclipse-plugin.json | 6 +- meta/lib/oeqa/runtime/cases/parselogs.py | 4 -- meta/lib/oeqa/runtime/cases/{xorg.py => weston.py} | 12 ++-- meta/lib/oeqa/sdk/context.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 2 +- meta/recipes-core/glibc/glibc-package.inc | 2 +- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 26 ++++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 meta/recipes-devtools/perl/files/encodefix.patch | 20 ++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 + ...ysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...c-setup.py-do-not-add-a-curses-include-pa.patch | 48 ++++++++++++++ ...2-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + meta/recipes-extended/procps/procps_3.3.16.bb | 13 ++-- .../{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} | 6 +- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++ meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | 3 +- scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- scripts/pybootchartgui/pybootchartgui/draw.py | 2 +- 35 files changed, 142 insertions(+), 278 deletions(-) copy meta/lib/oeqa/runtime/cases/{xorg.py => weston.py} (58%) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch create mode 100644 meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch rename meta/recipes-kernel/lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} (84%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:19 +0000 Subject: [oe-commits] [openembedded-core] 03/15: qemux86: drop resolution setting via uvesafb In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235416.C6A6D232843@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1cf26f69fd89b43be24cd1232c43e5050b9d718a Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:08 2020 +0100 qemux86: drop resolution setting via uvesafb I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it. The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues. The modern, supported option is video=... kernel parameter documented here: https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst which can be passed directly to runqemu and doesn't require special kernel modules. Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-x86.inc | 3 +-- meta/conf/machine/qemux86-64.conf | 4 ---- meta/conf/machine/qemux86.conf | 4 ---- meta/lib/oeqa/runtime/cases/parselogs.py | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 049681b..5dcc8b6 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -UVESA_MODE ?= "640x480-32" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 648cf2f..db9004e 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 8e0da82..7e6723b 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 9dafb89..3cad070 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -60,7 +60,6 @@ common_errors = [ ] video_related = [ - "uvesafb", ] x86_common = [ @@ -82,11 +81,8 @@ qemux86_common = [ "fail to add MMCONFIG information, can't access extended PCI configuration space under this bridge.", "can't claim BAR ", 'amd_nb: Cannot enumerate AMD northbridges', - 'uvesafb: 5000 ms task timeout, infinitely waiting', 'tsc: HPET/PMTIMER calibration failed', "modeset(0): Failed to initialize the DRI2 extension", - "uvesafb: cannot reserve video memory at", - "uvesafb: probe of uvesafb.0 failed with error", "glamor initialization failed", ] + common_errors -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:21 +0000 Subject: [oe-commits] [openembedded-core] 05/15: ptest-packagelists: mention ifupdown ptest in a comment In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235416.EBCC8232847@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8de634b7b259ceb8d50765968a2faabcab5d12f6 Author: Alexander Kanavin AuthorDate: Sun Feb 16 16:50:14 2020 +0100 ptest-packagelists: mention ifupdown ptest in a comment Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0a13bf0..23865ac 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -57,6 +57,7 @@ PTESTS_FAST = "\ # lz4-ptest \ # Needs a rewrite # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design +# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py #" PTESTS_SLOW = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:25 +0000 Subject: [oe-commits] [openembedded-core] 09/15: insane.bbclass: Correct typo inhert->inherit In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.36ACC23284F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8fdceff7a9581173726c2a2636a5815accca73e2 Author: Khem Raj AuthorDate: Sat Feb 15 15:23:38 2020 -0800 insane.bbclass: Correct typo inhert->inherit Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7425b8c..478240f 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -194,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages): """ if d.getVar("datadir") + "/mime/packages" in path and path.endswith('.xml') and not bb.data.inherits_class("mime", d): - package_qa_add_message(messages, "mime", "package contains mime types but does not inhert mime: %s path '%s'" % \ + package_qa_add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:23 +0000 Subject: [oe-commits] [openembedded-core] 07/15: fix various, innocuous typos In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.19F6223284D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9797d3b45b4e1b9d77f0f2ee299c17b48d8d3cf6 Author: Robert P. J. Day AuthorDate: Sun Feb 16 08:23:02 2020 -0500 fix various, innocuous typos Corrections: - environment - accommodate - conversion - compatible Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/conf/licenses.conf | 2 +- meta/lib/oeqa/manual/eclipse-plugin.json | 6 +++--- meta/lib/oeqa/sdk/context.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 2 +- scripts/pybootchartgui/pybootchartgui/draw.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 9588f2c..01d8598 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -243,7 +243,7 @@ def testimage_main(d): if d.getVar("TEST_TARGET") == "qemu": fstypes = [fs for fs in fstypes if fs in supported_fstypes] if not fstypes: - bb.fatal('Unsupported image type built. Add a comptible image to ' + bb.fatal('Unsupported image type built. Add a compatible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) qfstype = fstypes[0] diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 1c586a3..751424d 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -1,7 +1,7 @@ # Standards are great! Everyone has their own. In an effort to standardize licensing # names, common-licenses will use the SPDX standard license names. In order to not # break the non-standardized license names that we find in LICENSE, we'll set -# up a bunch of VarFlags to accomodate non-SPDX license names. +# up a bunch of VarFlags to accommodate non-SPDX license names. # # We should really discuss standardizing this field, but that's a longer term goal. # For now, we can do this and it should grab the most common LICENSE naming variations. diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json index 9869150..d77d0e6 100644 --- a/meta/lib/oeqa/manual/eclipse-plugin.json +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -82,7 +82,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -164,7 +164,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -319,4 +319,4 @@ "summary": "Eclipse_Poky_installation_and_setup" } } -] \ No newline at end of file +] diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 09e77c1..01c38c2 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) if not sdk_envs: raise argparse_oe.ArgumentUsageError("No available SDK "\ - "enviroments found at %s" % args.sdk_dir, self.name) + "environments found at %s" % args.sdk_dir, self.name) if args.list_sdk_env: self._display_sdk_envs(logger.info, args, sdk_envs) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index e2f91bc..5886862 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): when building the kernel. """ kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') - # Clean up the enviroment + # Clean up the environment bitbake('%s -c clean' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 6d80827..d4664bd 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): def test_blob_to_dict(self): """ - Test convertion of git blobs to dictionary + Test conversion of git blobs to dictionary """ from oe.buildhistory_analysis import blob_to_dict valuesmap = { "foo" : "1", "bar" : "2" } diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py index add5c53..53324b9 100644 --- a/scripts/pybootchartgui/pybootchartgui/draw.py +++ b/scripts/pybootchartgui/pybootchartgui/draw.py @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second proc_h = 16 # the height of a process leg_s = 10 MIN_IMG_W = 800 -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs OPTIONS = None def extents(options, xscale, trace): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:22 +0000 Subject: [oe-commits] [openembedded-core] 06/15: python3: resolve ncurses host contamination In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.091B823284C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ee7be51444b609a5cc1fd223b9395e9642d3bfac Author: Alexander Kanavin AuthorDate: Sun Feb 16 20:16:05 2020 +0100 python3: resolve ncurses host contamination Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...ysconfig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...c-setup.py-do-not-add-a-curses-include-pa.patch | 48 ++++++++++++++++++++++ ...2-distutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 03f6008..e7af3c6 100644 --- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001 +From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch new file mode 100644 index 0000000..e04a916 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch @@ -0,0 +1,48 @@ +From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 17:50:25 +0100 +Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from + the host + +This leads to host contamination, and particularly can cause +curses modules to fail at runtime if the host curses is configured +differently to native curses (observed on current OpenSuse Tumbleweed +as dnf failures). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 6 ------ + setup.py | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 915f475..c911011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4828,12 +4828,6 @@ then + [Define if you have struct stat.st_mtimensec]) + fi + +-# first curses header check +-ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +-fi +- + AC_CHECK_HEADERS(curses.h ncurses.h) + + # On Solaris, term.h requires curses.h +diff --git a/setup.py b/setup.py +index b0f1541..7208cd0 100644 +--- a/setup.py ++++ b/setup.py +@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 6fe9839..61ac3e7 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001 +From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index c836066..7796852 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ + file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ " SRC_URI_append_class-native = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:24 +0000 Subject: [oe-commits] [openembedded-core] 08/15: systemd: upgrade v244.1 -> v244.3 In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.28A3323284E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 59dbb6d8ed32227c26db1982099ea845d92fff81 Author: Alex Kiernan AuthorDate: Sun Feb 16 11:42:24 2020 +0000 systemd: upgrade v244.1 -> v244.3 Drop all systemd-boot patches and use an additional cross-file instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 26 ++++---- ...systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ----------------- ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ---------- ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ---------------------- ...dd-Defi-objcopy-option-to-specify-objcopy.patch | 48 -------------- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 14 insertions(+), 234 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc2..f92c639 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,27 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf6..0000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4..0000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:26 +0000 Subject: [oe-commits] [openembedded-core] 10/15: babeltrace: update to 1.5.8 In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.441FF232850@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7c88483a32ded0f94165aced25ac604de43b8ef7 Author: Anders Wallin AuthorDate: Mon Feb 17 14:34:05 2020 +0100 babeltrace: update to 1.5.8 updated HOMEPAGE to http://babeltrace.org/ updated LICENSE to include LGPLv2.1 Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- .../lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb similarity index 84% rename from meta/recipes-kernel/lttng/babeltrace_1.5.7.bb rename to meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index 05ef6d0..b6b7653 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -1,14 +1,14 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower" DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." -HOMEPAGE = "http://www.efficios.com/babeltrace/" +HOMEPAGE = "http://babeltrace.org/" BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" -LICENSE = "MIT & GPLv2" +LICENSE = "MIT & GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" -SRCREV = "d4014aeef4b89a4aaab1af42d7b0d143d62da0ff" +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:27 +0000 Subject: [oe-commits] [openembedded-core] 11/15: webkitgtk: Fix errors when api-documentation is enabled In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.5025223283F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c9e520e0996ab524e38de19a22b64395d14c635a Author: Richard Purdie AuthorDate: Tue Feb 18 13:27:48 2020 +0000 webkitgtk: Fix errors when api-documentation is enabled This recipe hasn't built correctly since we removed "python" from HOSTTOOLS when api-documentation is enabled. Add in an extra symlink to "python" rather than trying to fix the multiple scripts in webkit to refer to python3. The autobuilder didn't detect this as wekbkit was excluded from the API docs world build but that is changed now so this fixes build failures. Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c7f0d5e..3eb27a1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -58,6 +58,12 @@ PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +# webkitgtk is full of /usr/bin/env python, particular for generating docs +do_configure[postfuncs] += "setup_python_link" +setup_python_link() { + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python +} + EXTRA_OECMAKE = " \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:28 +0000 Subject: [oe-commits] [openembedded-core] 12/15: p11-kit: Fix builds with systemd In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.5E0D423283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 81010555a29fe4ddae9a9c3abe35fcbddd8887b2 Author: Richard Purdie AuthorDate: Tue Feb 18 13:52:29 2020 +0000 p11-kit: Fix builds with systemd In systemd enabled builds this was failing with unpackaged unit files. Fix this. Signed-off-by: Richard Purdie --- meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb index 03c8158..19895ec 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb @@ -20,7 +20,8 @@ GTKDOC_MESON_OPTION = 'gtk_doc' FILES_${PN} += " \ ${libdir}/p11-kit-proxy.so \ ${libdir}/pkcs11/*.so \ - ${libdir}/pkcs11/*.la" + ${libdir}/pkcs11/*.la \ + ${systemd_user_unitdir}/*" # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP_${PN} = "dev-so" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:29 +0000 Subject: [oe-commits] [openembedded-core] 13/15: concurrencytest.py: add outSideTestaddSkip for subunit In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.69A9F232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9b8734b584d6e8d9c32ff2a721b29f3f3e61cca7 Author: Trevor Gamblin AuthorDate: Tue Feb 18 09:56:18 2020 -0500 concurrencytest.py: add outSideTestaddSkip for subunit see: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 When running oe-selftest in concurrency mode (e.g. with oe-selftest --run-tests oescripts.OEPybootchartguyTests -j 4), if a skip occurred during setUpClass() rather than within individual tests, the entire suite would show "UNKNOWN" as each test's result. This is because subunit doesn't know how to handle skips outside of individual tests. An example of where this occurs is when running the above call to oe-selftest in concurrency mode on a host machine that does not have python3-cairo installed. Patch subunit inside concurrencytest.py to provide a method called outSideTestaddSkip, which will allow subunit to correctly detect the skip in setUpClass(). Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/utils/concurrencytest.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 71ec0df..0d9c01e 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -146,6 +146,20 @@ def outSideTestaddError(self, offset, line): subunit._OutSideTest.addError = outSideTestaddError +# Like outSideTestaddError above, we need an equivalent for skips +# happening at the setUpClass() level, otherwise we will see "UNKNOWN" +# as a result for concurrent tests +# +def outSideTestaddSkip(self, offset, line): + """A 'skip:' directive has been read.""" + test_name = line[offset:-1].decode('utf8') + self.parser._current_test = subunit.RemotedTestCase(test_name) + self.parser.current_test_description = test_name + self.parser._state = self.parser._reading_skip_details + self.parser._reading_skip_details.set_simple() + self.parser.subunitLineReceived(line) + +subunit._OutSideTest.addSkip = outSideTestaddSkip # # A dummy structure to add to io.StringIO so that the .buffer object -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:30 +0000 Subject: [oe-commits] [openembedded-core] 14/15: glibc-package.inc: fix multilib headers conflict In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.7708E232843@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0af9ff84348197b8b314f7c0d3757cab629daa94 Author: Kai Kang AuthorDate: Tue Feb 11 23:07:41 2020 +0800 glibc-package.inc: fix multilib headers conflict Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in glibc-package.inc to fix files conflict: | Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 3aed7be..285a9aa 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -87,7 +87,7 @@ do_install() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} fi - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h if [ -f ${D}${bindir}/mtrace ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:31 +0000 Subject: [oe-commits] [openembedded-core] 15/15: perl: Fix encode module reproducibility issues In-Reply-To: <158207005627.4105.2347584696257695027@git.openembedded.org> References: <158207005627.4105.2347584696257695027@git.openembedded.org> Message-ID: <20200218235417.83756232844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 71cdbf426e46e3ca1b5038f40e9f7ba958abc537 Author: Richard Purdie AuthorDate: Tue Feb 18 17:27:26 2020 +0000 perl: Fix encode module reproducibility issues The code is encoding host compiler parameters into target builds. Avoid this for our target builds. This should resolve builds which aren't reproducible between hosts with different compilers. Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/encodefix.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 23 insertions(+) diff --git a/meta/recipes-devtools/perl/files/encodefix.patch b/meta/recipes-devtools/perl/files/encodefix.patch new file mode 100644 index 0000000..396ed0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/encodefix.patch @@ -0,0 +1,20 @@ +The code is encoding host compiler parameters into target builds. Avoid +this for our target builds (patch is target specific, not native) + +Upstream-Status: Inappropriate [Cross compile hack] +RP 2020/2/18 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/cpan/Encode/bin/enc2xs +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs ++++ perl-5.30.1/cpan/Encode/bin/enc2xs +@@ -195,7 +195,7 @@ sub compiler_info { + # above becomes false. + my $sized = $declaration && !($compat && !$pedantic); + +- return ($cpp, $static, $sized); ++ return (0, 1, 1); + } + + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 5d76271..b37f175 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -26,6 +26,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " +SRC_URI_append_class-target = " \ + file://encodefix.patch \ +" SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:48 +0000 Subject: [oe-commits] [openembedded-core] 01/10: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.2C3A6232842@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4f70517bd73dc35fa316f9d9b609f9812d13cb28 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (02df17f -> 674602b) Message-ID: <158207008697.6096.5502392249120100558@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 02df17f glib-2.0: add dependencies to fix ptest failures discard cb75b68 iproute2: add devlink support to iproute2 discard 36ff085 perl: Fix encode module reproducibility issues discard 8ea40e1 glibc-package.inc: fix multilib headers conflict discard 94887b7 concurrencytest.py: add outSideTestaddSkip for subunit discard 6b74238 p11-kit: Fix builds with systemd discard 0586fcd webkitgtk: Fix errors when api-documentation is enabled discard 688052a babeltrace: update to 1.5.8 discard 250608b insane.bbclass: Correct typo inhert->inherit discard beb5431 systemd: upgrade v244.1 -> v244.3 discard b4b251a fix various, innocuous typos discard 03fb910 python3: resolve ncurses host contamination discard a69d801 ptest-packagelists: mention ifupdown ptest in a comment discard d9db0bb weston: add a basic runtime test discard a7658b2 qemux86: drop resolution setting via uvesafb discard 9087ae6 qemux86: do not add vga=0 to kernel parameters discard ad48167 procps: upstream has switched to gitlab discard e133b7f newlib: Move syscalls from newlib to libgloss discard 1a4872c HACK: extra debug discard 7a9fa16 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 59328e8 sstatesig: Log timestamps for hashequiv in reprodubile builds discard a112eb6 HACK: signing: Add extra test debug discard 59e9c52 glew/curl: specify exclusive package configs discard 5414e25 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 13e1363 oescripts.py: use unittest.SkipUnless for class skip add 7c67cff procps: upstream has switched to gitlab add 857078b qemux86: do not add vga=0 to kernel parameters add 1cf26f6 qemux86: drop resolution setting via uvesafb add 5770076 weston: add a basic runtime test add 8de634b ptest-packagelists: mention ifupdown ptest in a comment add ee7be51 python3: resolve ncurses host contamination add 9797d3b fix various, innocuous typos add 59dbb6d systemd: upgrade v244.1 -> v244.3 add 8fdceff insane.bbclass: Correct typo inhert->inherit add 7c88483 babeltrace: update to 1.5.8 add c9e520e webkitgtk: Fix errors when api-documentation is enabled add 8101055 p11-kit: Fix builds with systemd add 9b8734b concurrencytest.py: add outSideTestaddSkip for subunit add 0af9ff8 glibc-package.inc: fix multilib headers conflict add 71cdbf4 perl: Fix encode module reproducibility issues new 4f70517 oescripts.py: use unittest.SkipUnless for class skip new 2614484 base.bbclass: extend PACKAGECONFIG for conflict package configs new bb2ac5a glew/curl: specify exclusive package configs new 96aeace HACK: signing: Add extra test debug new 8ae4185 sstatesig: Log timestamps for hashequiv in reprodubile builds new c6ab64d rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 6cce7c4 HACK: extra debug new e777c88 newlib: Move syscalls from newlib to libgloss new 88f1347 rpm2cpio.sh: fix to handle newline character new 674602b glib-2.0: add dependencies to fix ptest failures This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (02df17f) \ N -- N -- N refs/heads/master-next (674602b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++------- scripts/rpm2cpio.sh | 3 ++- 2 files changed, 5 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:51 +0000 Subject: [oe-commits] [openembedded-core] 04/10: HACK: signing: Add extra test debug In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.4EA66232847@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 96aeaceeec67390b70a6dfb14625924822713eb4 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:49 +0000 Subject: [oe-commits] [openembedded-core] 02/10: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.37615232843@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2614484925602368aa713cad5cbfe658bfb50528 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:50 +0000 Subject: [oe-commits] [openembedded-core] 03/10: glew/curl: specify exclusive package configs In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.42A9A232844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bb2ac5ad6b67677e99aea6ce9f094c45e0c8e77e Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:52 +0000 Subject: [oe-commits] [openembedded-core] 05/10: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.5B68223284C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ae4185a15496804e7772b5a5533a072c16dcb8b Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:55 +0000 Subject: [oe-commits] [openembedded-core] 08/10: newlib: Move syscalls from newlib to libgloss In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.81AF123284F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e777c882693552c3ddd070c5943a0cadcae0bf43 Author: Mark Hatle AuthorDate: Fri Feb 14 12:34:14 2020 -0600 newlib: Move syscalls from newlib to libgloss By passing --disabled-newlib-supplied-syscalls, newlib will disable the generation of builtin syscalls and move this to libgloss. (This also affects the generation of crt0.o.) libgloss SHOULD then provide the syscalls, crt0.o and other functions that are no longer part of newlib itself. This now means that you must link with both newlib and libgloss, whereas before newlib would run in many configurations by itself. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index d7ac8bf..5edea8a 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -42,6 +42,7 @@ EXTRA_OECONF = " \ --with-gnu-as \ --with-gnu-ld \ --disable-multilib \ + --disable-newlib-supplied-syscalls \ " do_configure[cleandirs] = "${B}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:54 +0000 Subject: [oe-commits] [openembedded-core] 07/10: HACK: extra debug In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.72D5F23284E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6cce7c4bac7efb57552dd75da7ba63a20ef66eee Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:53 +0000 Subject: [oe-commits] [openembedded-core] 06/10: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.67A5E23284D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c6ab64d6b77c70f00264c162330362a7feb06463 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:56 +0000 Subject: [oe-commits] [openembedded-core] 09/10: rpm2cpio.sh: fix to handle newline character In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.8E1BF232850@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 88f13471bc9d838890a4d018192cf3238b7851a1 Author: Lori Hikichi AuthorDate: Tue Feb 18 11:14:22 2020 -0800 rpm2cpio.sh: fix to handle newline character This script is attempting to read binary data from an rpm file. If any of the bytes it is attempt to read is the binary value 0xa (i.e. a newline) then the script does not properly deal with this special case. Due to the behavior of command substitution, instead of fetching the value 0xa, the script makes an error and get the value 0 instead. The fix and the following explantion was taken from this post... https://unix.stackexchange.com/questions/10801/ how-to-use-bash-script-to-read-binary-file-content Command substitution $(?) strips final newlines in the command output. There's a fairly easy workaround. Make sure the output ends in a character other than a newline, then strip that one character. Signed-off-by: Lori Hikichi Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- scripts/rpm2cpio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh index 876c53c..7cd771b 100755 --- a/scripts/rpm2cpio.sh +++ b/scripts/rpm2cpio.sh @@ -22,7 +22,8 @@ calcsize() { i=0 while [ $i -lt 8 ]; do - b="$(_dd $(($offset + $i)) bs=1 count=1)" + b=$(_dd $(($offset + $i)) bs=1 count=1; echo X) + b=${b%X} [ -z "$b" ] && b="0" || b="$(exec printf '%u\n' "'$b")" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:54:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:54:57 +0000 Subject: [oe-commits] [openembedded-core] 10/10: glib-2.0: add dependencies to fix ptest failures In-Reply-To: <158207008697.6096.5502392249120100558@git.openembedded.org> References: <158207008697.6096.5502392249120100558@git.openembedded.org> Message-ID: <20200218235447.98725232851@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 674602bf4eca88f090e14e0b528ae1751e50c71c Author: Mingde (Matthew) Zeng AuthorDate: Tue Feb 18 14:46:49 2020 -0500 glib-2.0: add dependencies to fix ptest failures There are a number of ptest failures due to executables not found in the image. Since these executables are in FILES_${PN}-dev, depending all of -dev which is an overkill. We take them out of -dev and put in -utils, then depend on the latter instead. When starting a glib ptest but decided to Ctrl-c interrupt midway, ./run-ptest cannot be restarted unless running `userdel glib2-test` manually. Therefore adding a check prior to ptest will ensure the ptest can be restarted. Signed-off-by: Matthew Zeng Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index fc50082..7a231b5 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -1,6 +1,9 @@ #! /bin/sh set -eux +if id -u glib2-test; then + userdel glib2-test +fi useradd glib2-test su glib2-test -c 'gnome-desktop-testing-runner glib' userdel glib2-test diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index f4aff29..23c347d 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -58,13 +58,15 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${datadir}/glib-2.0/schemas" + +FILES_${PN}-utils += "${bindir}/glib-genmarshal \ + ${bindir}/glib-gettextize \ + ${bindir}/glib-mkenums \ + ${bindir}/glib-compile-resources" + FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la \ - ${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources \ ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ ${datadir}/glib-2.0/schemas/gschema.dtd \ ${datadir}/glib-2.0/valgrind/glib.supp \ @@ -138,6 +140,8 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = "" RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" +RDEPENDS_${PN}-ptest += "${PN}-utils" + RDEPENDS_${PN}-ptest += "\ coreutils \ libgcc \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:57:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:57:28 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (65419e3 -> 6fbcb1c) Message-ID: <158207024830.12734.9795059913331268718@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from 65419e3 cooker: Reset loghandler new db6dc22 bitbake/lib/bb/event.py: Remove duplicated ones from close matches new e595612 bitbake: fetch2: svn: care for path_spec new 6fbcb1c bitbake: layerindex: allow clones to be shallow The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lib/bb/event.py | 2 +- lib/bb/fetch2/svn.py | 2 +- lib/bblayers/layerindex.py | 16 ++++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:57:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:57:29 +0000 Subject: [oe-commits] [bitbake] 01/03: bitbake/lib/bb/event.py: Remove duplicated ones from close matches In-Reply-To: <158207024830.12734.9795059913331268718@git.openembedded.org> References: <158207024830.12734.9795059913331268718@git.openembedded.org> Message-ID: <20200218235728.6F1DA232843@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit db6dc22c7e755cd495f9c7909e65344f17c21999 Author: Robert Yang AuthorDate: Tue Feb 18 18:48:02 2020 +0800 bitbake/lib/bb/event.py: Remove duplicated ones from close matches It printed duplicated ones when there are multiple similar recipes in differrent layers, for example, if python-lockfile in different layers, and there is no python3-lockfile: $ bitbake python3-lockfile ERROR: Nothing PROVIDES 'python3-lockfile'. Close matches: python-lockfile python-lockfile python3-aiofiles Remove the duplicated ones to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- lib/bb/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/event.py b/lib/bb/event.py index 5cfbf36..d1359f0 100644 --- a/lib/bb/event.py +++ b/lib/bb/event.py @@ -508,7 +508,7 @@ class NoProvider(Event): extra = '' if not self._reasons: if self._close_matches: - extra = ". Close matches:\n %s" % '\n '.join(self._close_matches) + extra = ". Close matches:\n %s" % '\n '.join(sorted(set(self._close_matches))) if self._dependees: msg = "Nothing %sPROVIDES '%s' (but %s %sDEPENDS on or otherwise requires it)%s" % (r, self._item, ", ".join(self._dependees), r, extra) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:57:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:57:30 +0000 Subject: [oe-commits] [bitbake] 02/03: bitbake: fetch2: svn: care for path_spec In-Reply-To: <158207024830.12734.9795059913331268718@git.openembedded.org> References: <158207024830.12734.9795059913331268718@git.openembedded.org> Message-ID: <20200218235728.7A279232844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit e595612f02d5edb5c5578b781d7947b02f71165d Author: Jens Rehsack AuthorDate: Tue Feb 18 06:40:53 2020 +0100 bitbake: fetch2: svn: care for path_spec Documentation says: "path_spec": A specific directory in which to checkout the specified svn module. but existing svn fetcher uses "module" always as path of checked out svn-module, regardless whether path_spec was given or not. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- lib/bb/fetch2/svn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 6c8caf5..385a6b2 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -47,7 +47,7 @@ class Svn(FetchMethod): svndir = d.getVar("SVNDIR") or (d.getVar("DL_DIR") + "/svn") relpath = self._strip_leading_slashes(ud.path) ud.pkgdir = os.path.join(svndir, ud.host, relpath) - ud.moddir = os.path.join(ud.pkgdir, ud.module) + ud.moddir = os.path.join(ud.pkgdir, ud.path_spec) # Protects the repository from concurrent updates, e.g. from two # recipes fetching different revisions at the same time ud.svnlock = os.path.join(ud.pkgdir, "svn.lock") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 18 23:57:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 18 Feb 2020 23:57:31 +0000 Subject: [oe-commits] [bitbake] 03/03: bitbake: layerindex: allow clones to be shallow In-Reply-To: <158207024830.12734.9795059913331268718@git.openembedded.org> References: <158207024830.12734.9795059913331268718@git.openembedded.org> Message-ID: <20200218235728.84AE7232847@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 6fbcb1c476e631809fb9883a3988980b3fc34ae2 Author: Jan-Simon Moeller AuthorDate: Tue Feb 18 14:55:54 2020 +0100 bitbake: layerindex: allow clones to be shallow When bitbake-layers fetch-layerindex clones the repositories, these are full clones. Allow the user to specify '-s' and do shallow clones instead for faster downloads. Signed-off-by: Jan-Simon Moeller Signed-off-by: Richard Purdie --- lib/bblayers/layerindex.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/bblayers/layerindex.py b/lib/bblayers/layerindex.py index aa3b682..95b67a6 100644 --- a/lib/bblayers/layerindex.py +++ b/lib/bblayers/layerindex.py @@ -24,7 +24,7 @@ class LayerIndexPlugin(ActionPlugin): This class inherits ActionPlugin to get do_add_layer. """ - def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch): + def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch, shallow=False): layername = self.get_layer_name(url) if os.path.splitext(layername)[1] == '.git': layername = os.path.splitext(layername)[0] @@ -32,10 +32,12 @@ class LayerIndexPlugin(ActionPlugin): layerdir = os.path.join(repodir, subdir) if not os.path.exists(repodir): if fetch_layer: - cmd = ['git', 'clone', '-b' , branch, url, repodir] - if not branch: - # Branch really shouldn't be empty, but use the repo default if it is - cmd = ['git', 'clone', url, repodir] + cmd = ['git', 'clone'] + if shallow: + cmd.extend(['--depth', '1']) + if branch: + cmd.extend(['-b' , branch]) + cmd.extend([url, repodir]) result = subprocess.call(cmd) if result: logger.error("Failed to download %s (%s)" % (url, branch)) @@ -176,7 +178,8 @@ class LayerIndexPlugin(ActionPlugin): layerBranch.layer.vcs_url, layerBranch.vcs_subdir, not args.show_only, - layerBranch.actual_branch) + layerBranch.actual_branch, + args.shallow) if not name: # Error already shown return 1 @@ -209,6 +212,7 @@ class LayerIndexPlugin(ActionPlugin): parser_layerindex_fetch = self.add_command(sp, 'layerindex-fetch', self.do_layerindex_fetch, parserecipes=False) parser_layerindex_fetch.add_argument('-n', '--show-only', help='show dependencies and do nothing else', action='store_true') parser_layerindex_fetch.add_argument('-b', '--branch', help='branch name to fetch') + parser_layerindex_fetch.add_argument('-s', '--shallow', help='do only shallow clones (--depth=1)', action='store_true') parser_layerindex_fetch.add_argument('-i', '--ignore', help='assume the specified layers do not need to be fetched/added (separate multiple layers with commas, no spaces)', metavar='LAYER') parser_layerindex_fetch.add_argument('layername', nargs='+', help='layer to fetch') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:23 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (af2be2e -> c9a5d39) Message-ID: <158207864335.22494.5404475622221611574@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from af2be2e gupnp-av: Upgrade to 0.12.11 new 8abbe51 fetchmail: upgrade 6.4.1 -> 6.4.2 new afa8a4e libnet-dns-perl: upgrade 1.21 -> 1.22 new 5de43a6 cifs-utils: upgrade 6.9 -> 6.10 new 07757a0 dleyna-core: Update to latest to support gupnp 1.2 new 0f9f197 dleyna-server: Bump version to support 1.2 gupnp new b934d3b graphviz: Depend on py3 at runtime new ee45667 cfengine: Upgrade to 3.15 new 140846d dleyna-renderer: Fix build with gupnp 1.2+ new c90be40 mariadb: Add pam_auth to server package. new c9a5d39 pm-graph: Provide analyze-suspend as well The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-multimedia/dleyna/dleyna-core_0.6.0.bb | 6 +- .../0001-add-gupnp-1.2-API-support.patch | 123 +++++++++++++++++++++ .../dleyna/dleyna-renderer_0.6.0.bb | 4 +- .../dleyna/dleyna-server_0.6.0.bb | 3 +- ...x-Modify-the-dir-of-install-exec-hook-and.patch | 43 +++++++ .../cifs/{cifs-utils_6.9.bb => cifs-utils_6.10.bb} | 8 +- .../{fetchmail_6.4.1.bb => fetchmail_6.4.2.bb} | 4 +- .../analyze-suspend/analyze-suspend_5.5.bb | 29 ----- .../packagegroups/packagegroup-meta-oe.bb | 2 +- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + .../cfengine/cfengine-masterfiles/python3.patch | 16 +++ ...es_3.12.0.bb => cfengine-masterfiles_3.15.0.bb} | 15 ++- .../{cfengine_3.12.0.bb => cfengine_3.15.0.bb} | 10 +- .../recipes-graphics/graphviz/graphviz_2.40.1.bb | 4 +- meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb | 11 ++ ...et-dns-perl_1.21.bb => libnet-dns-perl_1.22.bb} | 4 +- 16 files changed, 231 insertions(+), 52 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer/0001-add-gupnp-1.2-API-support.patch create mode 100644 meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch rename meta-networking/recipes-support/cifs/{cifs-utils_6.9.bb => cifs-utils_6.10.bb} (89%) rename meta-networking/recipes-support/fetchmail/{fetchmail_6.4.1.bb => fetchmail_6.4.2.bb} (86%) delete mode 100644 meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb create mode 100644 meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.12.0.bb => cfengine-masterfiles_3.15.0.bb} (74%) rename meta-oe/recipes-extended/cfengine/{cfengine_3.12.0.bb => cfengine_3.15.0.bb} (89%) rename meta-perl/recipes-perl/libnet/{libnet-dns-perl_1.21.bb => libnet-dns-perl_1.22.bb} (92%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:24 +0000 Subject: [oe-commits] [meta-openembedded] 01/10: fetchmail: upgrade 6.4.1 -> 6.4.2 In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021723.E226723284E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8abbe51e67d3be728e28182377432c35c8b05526 Author: Wang Mingyu AuthorDate: Tue Feb 18 05:40:39 2020 -0800 fetchmail: upgrade 6.4.1 -> 6.4.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../fetchmail/{fetchmail_6.4.1.bb => fetchmail_6.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.2.bb similarity index 86% rename from meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb rename to meta-networking/recipes-support/fetchmail/fetchmail_6.4.2.bb index 0faf196..236c32b 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.2.bb @@ -9,8 +9,8 @@ DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "c2b836a919cdd4ec53b06b70e0aa3e63" -SRC_URI[sha256sum] = "3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0" +SRC_URI[md5sum] = "039b49a4f41f8544a51d82d2f4599dfc" +SRC_URI[sha256sum] = "e21f6b3326f29fdb0c4786b5602aa4b9e668805424d0708eb42be6395c1ca630" inherit autotools gettext python3-dir python3native -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:25 +0000 Subject: [oe-commits] [meta-openembedded] 02/10: libnet-dns-perl: upgrade 1.21 -> 1.22 In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021723.F129A23284F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit afa8a4e9ca47fbdcee5469c7dc2266a5ee2536b9 Author: Wang Mingyu AuthorDate: Tue Feb 18 05:40:40 2020 -0800 libnet-dns-perl: upgrade 1.21 -> 1.22 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libnet/{libnet-dns-perl_1.21.bb => libnet-dns-perl_1.22.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.22.bb similarity index 92% rename from meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb rename to meta-perl/recipes-perl/libnet/libnet-dns-perl_1.22.bb index 58b8eec..621908b 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.22.bb @@ -9,8 +9,8 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[md5sum] = "91e8593eb6eed41995e6edc567fb6fec" -SRC_URI[sha256sum] = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a" +SRC_URI[md5sum] = "f9b4f0b2613398d27434d94b456583ef" +SRC_URI[sha256sum] = "03cd6a733e1cab6f817b4c4dcb7b29575002f8c543fb85e94c6290bc224d4c12" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P(\d+\.\d+))(?!_\d+).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:27 +0000 Subject: [oe-commits] [meta-openembedded] 04/10: dleyna-core: Update to latest to support gupnp 1.2 In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.19973232851@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 07757a06129dcd8c73caee5b88c2e064df04aa25 Author: Khem Raj AuthorDate: Tue Feb 18 08:15:49 2020 -0800 dleyna-core: Update to latest to support gupnp 1.2 License-Update: Changed copyright years Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb index a3b2793..8939cd3 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb @@ -7,12 +7,14 @@ HOMEPAGE = "https://01.org/dleyna/" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://libdleyna/core/core.c;endline=21;md5=139cba0c634344abc9456694fbb5083b" + file://libdleyna/core/core.c;endline=21;md5=68602998351825b0844aae34c684c54e" DEPENDS = "glib-2.0 gupnp" +PV .= "+git${SRCPV}" + SRC_URI = "git://github.com/01org/${BPN}.git" -SRCREV = "27a3786ec013f64fd58243410a60798f824acec3" +SRCREV = "1c6853f5bc697dc0a8774fd70dbc915c4dbe7c5b" S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:26 +0000 Subject: [oe-commits] [meta-openembedded] 03/10: cifs-utils: upgrade 6.9 -> 6.10 In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.0BAD5232850@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5de43a6f0db09b7804fe9d3588211099a8bea9e4 Author: Wang Mingyu AuthorDate: Tue Feb 18 06:31:11 2020 -0800 cifs-utils: upgrade 6.9 -> 6.10 add the following patch to solve build error: 0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch Error message: (cd /sbin && ln -sf mount.cifs mount.smb3) /yocto/work001/fnst/wangmy/build/tmp/hosttools/install -c mount.cifs '/yocto/work001/fnst/wangmy/build/tmp/work/core2-64-poky-linux/cifs-utils/6.10-r0/image/sbin' make install-data-hook ln: failed to create symbolic link 'mount.smb3': Permission denied Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...x-Modify-the-dir-of-install-exec-hook-and.patch | 43 ++++++++++++++++++++++ .../cifs/{cifs-utils_6.9.bb => cifs-utils_6.10.bb} | 8 +++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch b/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch new file mode 100644 index 0000000..233ae40 --- /dev/null +++ b/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch @@ -0,0 +1,43 @@ +From f61f5f8a328207867b5c523b1c6bef6aaecaab88 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 15 Feb 2020 16:05:58 +0800 +Subject: [PATCH] Bugfix: Modify the dir of install-exec-hook and + install-data-hook + +Error message: +(cd /sbin && ln -sf mount.cifs mount.smb3) + /yocto/work001/fnst/wangmy/build/tmp/hosttools/install -c mount.cifs +'/yocto/work001/fnst/wangmy/build/tmp/work/core2-64-poky-linux/cifs-utils/6.10-r0/image/sbin' +make install-data-hook +ln: failed to create symbolic link 'mount.smb3': Permission denied + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fe9cd34..e9be6b3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -119,11 +119,11 @@ endif + SUBDIRS = contrib + + install-exec-hook: +- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) ++ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) + + install-data-hook: +- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) ++ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) + + uninstall-hook: +- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) +- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) ++ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) ++ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) +-- +2.17.1 + diff --git a/meta-networking/recipes-support/cifs/cifs-utils_6.9.bb b/meta-networking/recipes-support/cifs/cifs-utils_6.10.bb similarity index 89% rename from meta-networking/recipes-support/cifs/cifs-utils_6.9.bb rename to meta-networking/recipes-support/cifs/cifs-utils_6.10.bb index 51dcb23..8d82ee4 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_6.9.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_6.10.bb @@ -4,9 +4,9 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PV = "6.9" +PV = "6.10" -SRCREV = "9a8c21ad9e4510a83a3a41f7a04f763a4fe9ec09" +SRCREV = "5ff5fc2ecc10353fd39ad508db5c2828fd2d8d9a" SRC_URI = "git://git.samba.org/cifs-utils.git" S = "${WORKDIR}/git" @@ -22,6 +22,10 @@ PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samb PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" +SRC_URI += " \ + file://0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch \ + " + inherit autotools pkgconfig do_install_append() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:32 +0000 Subject: [oe-commits] [meta-openembedded] 09/10: mariadb: Add pam_auth to server package. In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.529CA23285E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c90be40eb9f4028368ab5030e7f9a78d05707572 Author: Jeremy A. Puhlman AuthorDate: Tue Feb 18 13:55:22 2020 -0800 mariadb: Add pam_auth to server package. When pam is enabled, the pam plugin in pulled into the server package but not the auth tool which results in following error on boot: Starting to install database for mariadb chown: cannot access '/usr/lib/plugin/auth_pam_tool_dir': No such file or directory Cannot change ownership of the '/usr/lib/plugin/auth_pam_tool_dir' directory to the 'mysql' user. Check that you have the necessary permissions and try again. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 23de69d..6888c64 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -299,6 +299,7 @@ FILES_${PN}-server = "\ ${sbindir}/ndbd \ ${sbindir}/ndb_mgmd \ ${libdir}/plugin/*.so \ + ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \ ${datadir}/mysql/ \ ${localstatedir}/mysql/ \ ${sysconfdir}/init.d/mysqld \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:29 +0000 Subject: [oe-commits] [meta-openembedded] 06/10: graphviz: Depend on py3 at runtime In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.319B6232853@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b934d3bf846ee544d8786d1b851a5baf82fff70b Author: Khem Raj AuthorDate: Tue Feb 18 09:34:49 2020 -0800 graphviz: Depend on py3 at runtime These packages are empty but python scripts generally do not depend on python2 Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb index 176cf44..12ecb99 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb @@ -66,8 +66,8 @@ FILES_${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/" FILES_${PN}-demo += "${datadir}/graphviz/demo/" RDEPENDS_${PN}-perl += "perl" -RDEPENDS_${PN}-python += "python" -RDEPENDS_${PN}-demo += "python perl" +RDEPENDS_${PN}-python += "python3" +RDEPENDS_${PN}-demo += "python3 perl" INSANE_SKIP_${PN}-perl = "dev-so" INSANE_SKIP_${PN}-python = "dev-so" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:28 +0000 Subject: [oe-commits] [meta-openembedded] 05/10: dleyna-server: Bump version to support 1.2 gupnp In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.25FE3232852@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0f9f197fdc97720e233491efbc41fbc44b01e37c Author: Khem Raj AuthorDate: Tue Feb 18 08:47:04 2020 -0800 dleyna-server: Bump version to support 1.2 gupnp Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb index a8e5406..e31b7ae 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb @@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0 gssdp gupnp gupnp-av gupnp-dlna libsoup-2.4 libxml2 dleyna-core" RDEPENDS_${PN} = "dleyna-connector-dbus" +PV .= "+git${SRCPV}" SRC_URI = "git://github.com/01org/${BPN}.git" -SRCREV = "776950d5d96ac9dbf5c5c47bde8ac06f50a3cf46" +SRCREV = "eb895ae82715e9889a948ffa810c0f828b4f4c76" S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:30 +0000 Subject: [oe-commits] [meta-openembedded] 07/10: cfengine: Upgrade to 3.15 In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.3CEFD232854@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ee45667af882ed9cf025d55ae5b4c3905186adf9 Author: Khem Raj AuthorDate: Tue Feb 18 12:59:32 2020 -0800 cfengine: Upgrade to 3.15 License-Update: Change in Company name Cfengine AS a Norwegian company -> Northern.tech Python3 fixes to needed scripts Signed-off-by: Khem Raj --- .../cfengine/cfengine-masterfiles/python3.patch | 16 ++++++++++++++++ ...terfiles_3.12.0.bb => cfengine-masterfiles_3.15.0.bb} | 15 ++++++++++----- .../cfengine/{cfengine_3.12.0.bb => cfengine_3.15.0.bb} | 10 +++++----- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch new file mode 100644 index 0000000..a6f6701 --- /dev/null +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch @@ -0,0 +1,16 @@ +--- a/modules/packages/apt_get ++++ b/modules/packages/apt_get +@@ -1,4 +1,4 @@ +-#!/var/cfengine/bin/python ++#!/var/cfengine/bin/python3 + + import sys + import os +--- a/modules/packages/apt_get.in ++++ b/modules/packages/apt_get.in +@@ -1,4 +1,4 @@ +-#!@bindir@/python ++#!@bindir@/python3 + + import sys + import os diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb similarity index 74% rename from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb rename to meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index dda6af9..79269d3 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -20,10 +20,11 @@ HOMEPAGE = "http://cfengine.com" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" -SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz" - -SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860" -SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65" +SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ + file://python3.patch \ + " +SRC_URI[md5sum] = "6d456fdd9bd24ff6617eeaa05efae602" +SRC_URI[sha256sum] = "4a071c0c4ba7df9bad93144cff5fbc0566e5172afd66201072e3193b76c55a38" inherit autotools @@ -31,6 +32,10 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" +do_install_append() { + rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} +} + FILES_${PN} = "${datadir}/cfengine" -RDEPENDS_${PN} += "python-core" +RDEPENDS_${PN} += "python3-core" diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb similarity index 89% rename from meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb rename to meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb index 9d0123d..fa08be3 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb @@ -11,18 +11,17 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit." HOMEPAGE = "http://cfengine.com" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494" +LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f" DEPENDS = "attr tokyocabinet" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ file://set-path-of-default-config-file.patch \ " +SRC_URI[md5sum] = "d4dabfa46d8afa151be5610f184354e7" +SRC_URI[sha256sum] = "fa53e137f850eb268a8e7ae4578b5db5dc383656341f5053dc1a353ed0288265" -SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5" -SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec" - -inherit autotools systemd +inherit autotools-brokensep systemd export EXPLICIT_VERSION="${PV}" @@ -67,6 +66,7 @@ EOF install -m 0755 -D ${D}${sysconfdir}/init.d/cfengine3 ${D}${datadir}/${BPN}/cfengine3 sed -i -e 's#/etc/init.d#${datadir}/${BPN}#' ${D}${systemd_system_unitdir}/*.service fi + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper } RDEPENDS_${PN} += "${BPN}-masterfiles" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:31 +0000 Subject: [oe-commits] [meta-openembedded] 08/10: dleyna-renderer: Fix build with gupnp 1.2+ In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.4702423285D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 140846ddc57d00f20128c76c631a7bd7a4ffefaf Author: Khem Raj AuthorDate: Tue Feb 18 14:20:43 2020 -0800 dleyna-renderer: Fix build with gupnp 1.2+ Signed-off-by: Khem Raj --- .../0001-add-gupnp-1.2-API-support.patch | 123 +++++++++++++++++++++ .../dleyna/dleyna-renderer_0.6.0.bb | 4 +- 2 files changed, 126 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer/0001-add-gupnp-1.2-API-support.patch b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer/0001-add-gupnp-1.2-API-support.patch new file mode 100644 index 0000000..8f54658 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer/0001-add-gupnp-1.2-API-support.patch @@ -0,0 +1,123 @@ +From 7c945e7960cf7dffd9dd0bb5f7ec6bee4dc0bca3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Feb 2020 14:17:55 -0800 +Subject: [PATCH] add gupnp 1.2 API support + +Takes from https://git.archlinux.org/svntogit/packages.git/tree/trunk/gupnp-1.2.diff?h=packages/dleyna-renderer +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 4 +-- + libdleyna/renderer/device.c | 51 +++++++++++++++++++++++++++++++++++-- + libdleyna/renderer/upnp.c | 4 +-- + 3 files changed, 53 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 271ee92..364659d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,8 +38,8 @@ LT_LANG([C]) + PKG_PROG_PKG_CONFIG(0.16) + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) + PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) +-PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2]) +-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5]) ++PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 1.2.0]) ++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0]) + PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5]) + PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4]) + PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2]) +diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c +index 783fb52..c7b9fc3 100644 +--- a/libdleyna/renderer/device.c ++++ b/libdleyna/renderer/device.c +@@ -2121,6 +2121,53 @@ exit: + return; + } + ++typedef struct ++{ ++ GMainLoop *loop; ++ GUPnPServiceIntrospection *introspection; ++ GError **error; ++} GetIntrospectionAsyncData; ++ ++static void ++get_introspection_async_cb (GUPnPServiceInfo *info, ++ GUPnPServiceIntrospection *introspection, ++ const GError *error, ++ gpointer user_data) ++{ ++ GetIntrospectionAsyncData *data = user_data; ++ data->introspection = introspection; ++ if (data->error) ++ *data->error = g_error_copy (error); ++ g_main_loop_quit (data->loop); ++} ++ ++static GUPnPServiceIntrospection * ++_gupnp_service_info_get_introspection (GUPnPServiceInfo *info, ++ GError **error) ++{ ++ GetIntrospectionAsyncData data; ++ GMainContext *context; ++ ++ context = g_main_context_new (); ++ data.loop = g_main_loop_new (context, FALSE); ++ data.error = error; ++ ++ g_main_context_push_thread_default (context); ++ ++ gupnp_service_info_get_introspection_async (info, ++ get_introspection_async_cb, ++ &data); ++ ++ g_main_loop_run (data.loop); ++ ++ g_main_context_pop_thread_default (context); ++ ++ g_main_loop_unref (data.loop); ++ g_main_context_unref (context); ++ ++ return data.introspection; ++} ++ + static gboolean prv_get_av_service_states_values(GUPnPServiceProxy *av_proxy, + GVariant **mpris_tp_speeds, + GPtrArray **upnp_tp_speeds, +@@ -2147,7 +2194,7 @@ static gboolean prv_get_av_service_states_values(GUPnPServiceProxy *av_proxy, + weak_ref = av_proxy; + g_object_add_weak_pointer(G_OBJECT(av_proxy), &weak_ref); + +- introspection = gupnp_service_info_get_introspection( ++ introspection = _gupnp_service_info_get_introspection( + GUPNP_SERVICE_INFO(av_proxy), + &error); + +@@ -2215,7 +2262,7 @@ static gboolean prv_get_rc_service_states_values(GUPnPServiceProxy *rc_proxy, + weak_ref = rc_proxy; + g_object_add_weak_pointer(G_OBJECT(rc_proxy), &weak_ref); + +- introspection = gupnp_service_info_get_introspection( ++ introspection = _gupnp_service_info_get_introspection( + GUPNP_SERVICE_INFO(rc_proxy), + &error); + +diff --git a/libdleyna/renderer/upnp.c b/libdleyna/renderer/upnp.c +index ac1b08a..b762226 100644 +--- a/libdleyna/renderer/upnp.c ++++ b/libdleyna/renderer/upnp.c +@@ -243,8 +243,8 @@ static void prv_server_unavailable_cb(GUPnPControlPoint *cp, + + udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy); + +- ip_address = gupnp_context_get_host_ip( +- gupnp_control_point_get_context(cp)); ++ ip_address = gssdp_client_get_host_ip( ++ GSSDP_CLIENT(gupnp_control_point_get_context(cp))); + + if (!udn || !ip_address) + goto on_error; +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb index b30aee9..642f21b 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0 gssdp gupnp gupnp-av gupnp-dlna libsoup-2.4 dleyna-core" RDEPENDS_${PN} = "dleyna-connector-dbus" -SRC_URI = "git://github.com/01org/${BPN}.git" +SRC_URI = "git://github.com/01org/${BPN}.git \ + file://0001-add-gupnp-1.2-API-support.patch \ + " SRCREV = "50fd1ec9d51328e7dea98874129dc8d6fe3ea1dd" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 02:17:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 02:17:33 +0000 Subject: [oe-commits] [meta-openembedded] 10/10: pm-graph: Provide analyze-suspend as well In-Reply-To: <158207864335.22494.5404475622221611574@git.openembedded.org> References: <158207864335.22494.5404475622221611574@git.openembedded.org> Message-ID: <20200219021724.5D93023285F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c9a5d3913778951b526b8b694c86616fcd481dc7 Author: Khem Raj AuthorDate: Tue Feb 18 11:22:31 2020 -0800 pm-graph: Provide analyze-suspend as well Remove stale analyze-suspend recipe Signed-off-by: Khem Raj --- .../analyze-suspend/analyze-suspend_5.5.bb | 29 ---------------------- .../packagegroups/packagegroup-meta-oe.bb | 2 +- meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb | 11 ++++++++ 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb b/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb deleted file mode 100644 index bb0aad3..0000000 --- a/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Analyze Suspend" -DESCRIPTION = "analyze-suspend is a tool for system developers to visualize \ -the activity between suspend and resume, allowing them to identify \ -inefficiencies and bottlenecks." -HOMEPAGE = "https://01.org/suspendresume" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -# Apart from the listed RDEPENDS, analyze-suspend depends on some features -# provided by the kernel. These options are: -# - CONFIG_PM_DEBUG=y -# - CONFIG_PM_SLEEP_DEBUG=y -# - CONFIG_FTRACE=y -# - CONFIG_FUNCTION_TRACER=y -# - CONFIG_FUNCTION_GRAPH_TRACER=y - -RDEPENDS_${PN} += "python-core python-datetime python-stringold" - -SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" -SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" - -S = "${WORKDIR}/git" - -do_install() { - install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py - install -Dm 0644 README ${D}${docdir}/analyze-suspend/README -} - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index bad4aa7..3933619 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -46,7 +46,7 @@ RDEPENDS_packagegroup-meta-oe = "\ " RDEPENDS_packagegroup-meta-oe-benchmarks = "\ - analyze-suspend dhrystone iperf2 linpack phoronix-test-suite \ + pm-graph dhrystone iperf2 linpack phoronix-test-suite \ tiobench bonnie++ fio iperf2 iperf3 lmbench s-suite whetstone \ libc-bench memtester sysbench dbench iozone3 libhugetlbfs \ nbench-byte tinymembench \ diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index 63a9fa8..a137886 100644 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -12,11 +12,22 @@ SRC_URI = "git://github.com/intel/pm-graph.git \ " S = "${WORKDIR}/git" +# Apart from the listed RDEPENDS, analyze-suspend depends on some features +# provided by the kernel. These options are: +# - CONFIG_PM_DEBUG=y +# - CONFIG_PM_SLEEP_DEBUG=y +# - CONFIG_FTRACE=y +# - CONFIG_FUNCTION_TRACER=y +# - CONFIG_FUNCTION_GRAPH_TRACER=y + COMPATIBLE_HOST='(i.86|x86_64).*' EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" do_install() { oe_runmake install + install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py } RDEPENDS_${PN} += "python3-core python3-threading python3-datetime python3-compression" +RPROVIDES_${PN} = "analyze-suspend" +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:39 +0000 Subject: [oe-commits] [openembedded-core] 02/03: rpm2cpio.sh: fix to handle newline character In-Reply-To: <158211147725.28190.4140696929874886269@git.openembedded.org> References: <158211147725.28190.4140696929874886269@git.openembedded.org> Message-ID: <20200219112437.73CCA234F7D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a40a93e81766513cf710e713093ab74c6ec936c3 Author: Lori Hikichi AuthorDate: Tue Feb 18 11:14:22 2020 -0800 rpm2cpio.sh: fix to handle newline character This script is attempting to read binary data from an rpm file. If any of the bytes it is attempt to read is the binary value 0xa (i.e. a newline) then the script does not properly deal with this special case. Due to the behavior of command substitution, instead of fetching the value 0xa, the script makes an error and get the value 0 instead. The fix and the following explantion was taken from this post... https://unix.stackexchange.com/questions/10801/ how-to-use-bash-script-to-read-binary-file-content Command substitution $(?) strips final newlines in the command output. There's a fairly easy workaround. Make sure the output ends in a character other than a newline, then strip that one character. Signed-off-by: Lori Hikichi Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- scripts/rpm2cpio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh index 876c53c..7cd771b 100755 --- a/scripts/rpm2cpio.sh +++ b/scripts/rpm2cpio.sh @@ -22,7 +22,8 @@ calcsize() { i=0 while [ $i -lt 8 ]; do - b="$(_dd $(($offset + $i)) bs=1 count=1)" + b=$(_dd $(($offset + $i)) bs=1 count=1; echo X) + b=${b%X} [ -z "$b" ] && b="0" || b="$(exec printf '%u\n' "'$b")" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:37 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (71cdbf4 -> b649cf5) Message-ID: <158211147725.28190.4140696929874886269@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 71cdbf4 perl: Fix encode module reproducibility issues new f495e1f newlib: Move syscalls from newlib to libgloss new a40a93e rpm2cpio.sh: fix to handle newline character new b649cf5 glib-2.0: add dependencies to fix ptest failures The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- meta/recipes-core/newlib/newlib.inc | 1 + scripts/rpm2cpio.sh | 3 ++- 4 files changed, 14 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:38 +0000 Subject: [oe-commits] [openembedded-core] 01/03: newlib: Move syscalls from newlib to libgloss In-Reply-To: <158211147725.28190.4140696929874886269@git.openembedded.org> References: <158211147725.28190.4140696929874886269@git.openembedded.org> Message-ID: <20200219112437.68368234F7C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f495e1f771b60d2db11ffa351adf56ba664fe7e1 Author: Mark Hatle AuthorDate: Fri Feb 14 12:34:14 2020 -0600 newlib: Move syscalls from newlib to libgloss By passing --disabled-newlib-supplied-syscalls, newlib will disable the generation of builtin syscalls and move this to libgloss. (This also affects the generation of crt0.o.) libgloss SHOULD then provide the syscalls, crt0.o and other functions that are no longer part of newlib itself. This now means that you must link with both newlib and libgloss, whereas before newlib would run in many configurations by itself. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index d7ac8bf..5edea8a 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -42,6 +42,7 @@ EXTRA_OECONF = " \ --with-gnu-as \ --with-gnu-ld \ --disable-multilib \ + --disable-newlib-supplied-syscalls \ " do_configure[cleandirs] = "${B}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:40 +0000 Subject: [oe-commits] [openembedded-core] 03/03: glib-2.0: add dependencies to fix ptest failures In-Reply-To: <158211147725.28190.4140696929874886269@git.openembedded.org> References: <158211147725.28190.4140696929874886269@git.openembedded.org> Message-ID: <20200219112437.80FC5234F7E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b649cf5c09a45df2df9a8f8f0920c6dfb07b8d76 Author: Mingde (Matthew) Zeng AuthorDate: Tue Feb 18 14:46:49 2020 -0500 glib-2.0: add dependencies to fix ptest failures There are a number of ptest failures due to executables not found in the image. Since these executables are in FILES_${PN}-dev, depending all of -dev which is an overkill. We take them out of -dev and put in -utils, then depend on the latter instead. When starting a glib ptest but decided to Ctrl-c interrupt midway, ./run-ptest cannot be restarted unless running `userdel glib2-test` manually. Therefore adding a check prior to ptest will ensure the ptest can be restarted. Signed-off-by: Matthew Zeng Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index fc50082..7a231b5 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -1,6 +1,9 @@ #! /bin/sh set -eux +if id -u glib2-test; then + userdel glib2-test +fi useradd glib2-test su glib2-test -c 'gnome-desktop-testing-runner glib' userdel glib2-test diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index f4aff29..23c347d 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -58,13 +58,15 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${datadir}/glib-2.0/schemas" + +FILES_${PN}-utils += "${bindir}/glib-genmarshal \ + ${bindir}/glib-gettextize \ + ${bindir}/glib-mkenums \ + ${bindir}/glib-compile-resources" + FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la \ - ${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources \ ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ ${datadir}/glib-2.0/schemas/gschema.dtd \ ${datadir}/glib-2.0/valgrind/glib.supp \ @@ -138,6 +140,8 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = "" RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" +RDEPENDS_${PN}-ptest += "${PN}-utils" + RDEPENDS_${PN}-ptest += "\ coreutils \ libgcc \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:42 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (674602b -> 29e1b3d) Message-ID: <158211148269.28454.17958056390455944079@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 674602b glib-2.0: add dependencies to fix ptest failures discard 88f1347 rpm2cpio.sh: fix to handle newline character discard e777c88 newlib: Move syscalls from newlib to libgloss discard 6cce7c4 HACK: extra debug discard c6ab64d rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 8ae4185 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 96aeace HACK: signing: Add extra test debug discard bb2ac5a glew/curl: specify exclusive package configs discard 2614484 base.bbclass: extend PACKAGECONFIG for conflict package configs discard 4f70517 oescripts.py: use unittest.SkipUnless for class skip add f495e1f newlib: Move syscalls from newlib to libgloss add a40a93e rpm2cpio.sh: fix to handle newline character add b649cf5 glib-2.0: add dependencies to fix ptest failures new c0352e9 oescripts.py: use unittest.SkipUnless for class skip new aa2243f base.bbclass: extend PACKAGECONFIG for conflict package configs new 161c946 glew/curl: specify exclusive package configs new 63763a0 HACK: signing: Add extra test debug new db5a33c sstatesig: Log timestamps for hashequiv in reprodubile builds new 38deb0f rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 29e1b3d HACK: extra debug This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (674602b) \ N -- N -- N refs/heads/master-next (29e1b3d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:43 +0000 Subject: [oe-commits] [openembedded-core] 01/07: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112442.CEEA3234F7C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c0352e90602129860f8f978f510cab34abe9d892 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:46 +0000 Subject: [oe-commits] [openembedded-core] 04/07: HACK: signing: Add extra test debug In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112442.E9BBA234F7F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 63763a0353add1f470cc2f0405555b5c4810c7dc Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:44 +0000 Subject: [oe-commits] [openembedded-core] 02/07: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112442.D8C57234F7D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa2243f8be4b2ad73aef12f0aa0a30b02bc715ff Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:45 +0000 Subject: [oe-commits] [openembedded-core] 03/07: glew/curl: specify exclusive package configs In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112442.E19FB234F7E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 161c946e77206ebc6da85959f5d691e9bcc94c28 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:47 +0000 Subject: [oe-commits] [openembedded-core] 05/07: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112443.0020C234F80@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit db5a33c85ef9f5d8e8c6d04dbe7cef131ea495b6 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:49 +0000 Subject: [oe-commits] [openembedded-core] 07/07: HACK: extra debug In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112443.132ED234F82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 29e1b3dc006894f0feb086c15f35698e4ac02531 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:24:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:24:48 +0000 Subject: [oe-commits] [openembedded-core] 06/07: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158211148269.28454.17958056390455944079@git.openembedded.org> References: <158211148269.28454.17958056390455944079@git.openembedded.org> Message-ID: <20200219112443.0AE8E234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 38deb0fa45b7a48afcbbe24a67fb364653fac782 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:41 +0000 Subject: [oe-commits] [bitbake] branch master updated (5d98d8e -> a0c8b27) Message-ID: <158211160126.29597.469951010865899727@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository bitbake. from 5d98d8e cooker/siggen: Empty siggen cache during parsing new 40520d2 knotty: Make the bb.command.CommandExit event terminate bitbake new ffd663a fetch2: Make fetcher_compare_revisions() work new ba093a3 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" new 01bf091 data: Don't allow renameVar calls with equivalent keys new 7af80cd cooker: Reset loghandler new 5612192 event: Remove duplicated items from close matches new 7522364 fetch2: svn: care for path_spec new a0c8b27 layerindex: allow clones to be shallow The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lib/bb/cooker.py | 3 +++ lib/bb/data_smart.py | 4 ++++ lib/bb/event.py | 2 +- lib/bb/fetch2/__init__.py | 51 +++++++++++++++++++++++++--------------------- lib/bb/fetch2/svn.py | 2 +- lib/bb/ui/knotty.py | 1 + lib/bblayers/layerindex.py | 16 +++++++++------ 7 files changed, 48 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:42 +0000 Subject: [oe-commits] [bitbake] 01/08: knotty: Make the bb.command.CommandExit event terminate bitbake In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.6661C234F7E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 40520d229c8ea51ee9784184ab5d13a82dd1eb61 Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:53 2020 +0100 knotty: Make the bb.command.CommandExit event terminate bitbake This matches the other bb.command.Command* events and without it, running `bitbake --revisions-changed` will hang indefinitely if there are changed revisions. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index a0340df..cbb289b 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -590,6 +590,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): if isinstance(event, bb.command.CommandExit): if not return_value: return_value = event.exitcode + main.shutdown = 2 continue if isinstance(event, (bb.command.CommandCompleted, bb.cooker.CookerExit)): main.shutdown = 2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:43 +0000 Subject: [oe-commits] [bitbake] 02/08: fetch2: Make fetcher_compare_revisions() work In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.7049B234F7F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit ffd663a8e07e2e39e8ca2d2493f4f98037c5f9e4 Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:54 2020 +0100 fetch2: Make fetcher_compare_revisions() work This seems to have been broken for a very long time. Now it also works regardless of BB_SRCREV_POLICY. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 1b7f573..5646276 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -485,17 +485,22 @@ def fetcher_init(d): Called to initialize the fetchers once the configuration data is known. Calls before this must not hit the cache. """ + + revs = bb.persist_data.persist('BB_URI_HEADREVS', d) + try: + # fetcher_init is called multiple times, so make sure we only save the + # revs the first time it is called. + if not bb.fetch2.saved_headrevs: + bb.fetch2.saved_headrevs = dict(revs) + except: + pass + # When to drop SCM head revisions controlled by user policy srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) elif srcrev_policy == "clear": logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) - revs = bb.persist_data.persist('BB_URI_HEADREVS', d) - try: - bb.fetch2.saved_headrevs = revs.items() - except: - pass revs.clear() else: raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy) @@ -514,22 +519,12 @@ def fetcher_parse_done(): def fetcher_compare_revisions(d): """ - Compare the revisions in the persistant cache with current values and - return true/false on whether they've changed. + Compare the revisions in the persistent cache with the saved values from + when bitbake was started and return true if they have changed. """ - data = bb.persist_data.persist('BB_URI_HEADREVS', d).items() - data2 = bb.fetch2.saved_headrevs - - changed = False - for key in data: - if key not in data2 or data2[key] != data[key]: - logger.debug(1, "%s changed", key) - changed = True - return True - else: - logger.debug(2, "%s did not change", key) - return False + headrevs = dict(bb.persist_data.persist('BB_URI_HEADREVS', d)) + return headrevs != bb.fetch2.saved_headrevs def mirror_from_string(data): mirrors = (data or "").replace('\\n',' ').split() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:44 +0000 Subject: [oe-commits] [bitbake] 03/08: fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.7C961234F80@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit ba093a38539960e645e994a66ed7872a604c00a9 Author: Peter Kjellerstedt AuthorDate: Sat Feb 15 04:29:55 2020 +0100 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" Mark any keys used to cache the srcrevs for a recipe as "dontcache" if BB_DONT_CACHE is set for the recipe. Remove any such keys upon the next bitbake run even if BB_SRCREV_POLICY is set to "cache". This will make sure the srcrev is updated as expected if ${AUTOREV} is used. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 5646276..b83347a 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -499,6 +499,11 @@ def fetcher_init(d): srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) + # We still need to remove keys that are marked with "dontcache". + for key in list(revs.keys()): + if key.startswith("dontcache-"): + logger.debug(1, "Removing SRCREV key: %s" % key) + revs.pop(key) elif srcrev_policy == "clear": logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) revs.clear() @@ -729,9 +734,8 @@ def subprocess_setup(): signal.signal(signal.SIGPIPE, signal.SIG_DFL) def get_autorev(d): - # only not cache src rev in autorev case - if d.getVar('BB_SRCREV_POLICY') != "cache": - d.setVar('BB_DONT_CACHE', '1') + # Do not cache the srcrev in the autorev case + d.setVar('BB_DONT_CACHE', '1') return "AUTOINC" def get_srcrev(d, method_name='sortable_revision'): @@ -1594,7 +1598,13 @@ class FetchMethod(object): return True, str(latest_rev) def generate_revision_key(self, ud, d, name): - return self._revision_key(ud, d, name) + key = self._revision_key(ud, d, name) + if d.getVar('BB_DONT_CACHE'): + # Mark the key so it can be removed on the next bitbake run even if + # BB_SRCREV_POLICY is "cache". + return "dontcache-%s" % key + else: + return key def latest_versionstring(self, ud, d): """ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:45 +0000 Subject: [oe-commits] [bitbake] 04/08: data: Don't allow renameVar calls with equivalent keys In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.93B7C234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 01bf0912eef5700d61c6e3c9138cb4b6825ee782 Author: Kyle Russell AuthorDate: Mon Feb 17 10:25:52 2020 -0500 data: Don't allow renameVar calls with equivalent keys While usually a programming error, the behavior can cause a Parser instance to eventually gobble up a significant amount of memory, greatly affecting system performance. Try to avoid getting into that situation and alert the user about what they attempted to do. Signed-off-by: Kyle Russell Signed-off-by: Richard Purdie --- lib/bb/data_smart.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index dd5c618..63a32bc 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -607,6 +607,10 @@ class DataSmart(MutableMapping): """ Rename the variable key to newkey """ + if key == newkey: + bb.warn("Calling renameVar with equivalent keys (%s) is invalid" % key) + return + if '_remote_data' in self.dict: connector = self.dict["_remote_data"]["_content"] res = connector.renameVar(key, newkey) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:46 +0000 Subject: [oe-commits] [bitbake] 05/08: cooker: Reset loghandler In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.A14B5234F82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 7af80cd1dd577b05d39a3cc5d5c547a2549e39df Author: Richard Purdie AuthorDate: Mon Feb 17 17:30:08 2020 +0000 cooker: Reset loghandler When parsing, reset the loghandler when finished, else the messages can be misleading. Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index a05630d..2d937a4 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1949,6 +1949,7 @@ class Parser(multiprocessing.Process): def parse(self, filename, appends): try: + origfilter = bb.event.LogHandler.filter # Record the filename we're parsing into any events generated def parse_filter(self, record): record.taskpid = bb.event.worker_pid @@ -1971,6 +1972,8 @@ class Parser(multiprocessing.Process): # a SystemExit event for example. except BaseException as exc: return True, ParsingFailure(exc, filename) + finally: + bb.event.LogHandler.filter = origfilter class CookerParser(object): def __init__(self, cooker, filelist, masked): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:47 +0000 Subject: [oe-commits] [bitbake] 06/08: event: Remove duplicated items from close matches In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.ADAD7234F83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 5612192cec9f467e2ab5a86482cb34876d198bc6 Author: Robert Yang AuthorDate: Tue Feb 18 18:48:02 2020 +0800 event: Remove duplicated items from close matches It printed duplicated ones when there are multiple similar recipes in differrent layers, for example, if python-lockfile in different layers, and there is no python3-lockfile: $ bitbake python3-lockfile ERROR: Nothing PROVIDES 'python3-lockfile'. Close matches: python-lockfile python-lockfile python3-aiofiles Remove the duplicated ones to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- lib/bb/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/event.py b/lib/bb/event.py index 5cfbf36..d1359f0 100644 --- a/lib/bb/event.py +++ b/lib/bb/event.py @@ -508,7 +508,7 @@ class NoProvider(Event): extra = '' if not self._reasons: if self._close_matches: - extra = ". Close matches:\n %s" % '\n '.join(self._close_matches) + extra = ". Close matches:\n %s" % '\n '.join(sorted(set(self._close_matches))) if self._dependees: msg = "Nothing %sPROVIDES '%s' (but %s %sDEPENDS on or otherwise requires it)%s" % (r, self._item, ", ".join(self._dependees), r, extra) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:49 +0000 Subject: [oe-commits] [bitbake] 08/08: layerindex: allow clones to be shallow In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.C1033234F85@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit a0c8b27675a590d9deeb3cbc462c0eb0e113cf3b Author: Jan-Simon Moeller AuthorDate: Tue Feb 18 14:55:54 2020 +0100 layerindex: allow clones to be shallow When bitbake-layers fetch-layerindex clones the repositories, these are full clones. Allow the user to specify '-s' and do shallow clones instead for faster downloads. Signed-off-by: Jan-Simon Moeller Signed-off-by: Richard Purdie --- lib/bblayers/layerindex.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/bblayers/layerindex.py b/lib/bblayers/layerindex.py index aa3b682..95b67a6 100644 --- a/lib/bblayers/layerindex.py +++ b/lib/bblayers/layerindex.py @@ -24,7 +24,7 @@ class LayerIndexPlugin(ActionPlugin): This class inherits ActionPlugin to get do_add_layer. """ - def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch): + def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch, shallow=False): layername = self.get_layer_name(url) if os.path.splitext(layername)[1] == '.git': layername = os.path.splitext(layername)[0] @@ -32,10 +32,12 @@ class LayerIndexPlugin(ActionPlugin): layerdir = os.path.join(repodir, subdir) if not os.path.exists(repodir): if fetch_layer: - cmd = ['git', 'clone', '-b' , branch, url, repodir] - if not branch: - # Branch really shouldn't be empty, but use the repo default if it is - cmd = ['git', 'clone', url, repodir] + cmd = ['git', 'clone'] + if shallow: + cmd.extend(['--depth', '1']) + if branch: + cmd.extend(['-b' , branch]) + cmd.extend([url, repodir]) result = subprocess.call(cmd) if result: logger.error("Failed to download %s (%s)" % (url, branch)) @@ -176,7 +178,8 @@ class LayerIndexPlugin(ActionPlugin): layerBranch.layer.vcs_url, layerBranch.vcs_subdir, not args.show_only, - layerBranch.actual_branch) + layerBranch.actual_branch, + args.shallow) if not name: # Error already shown return 1 @@ -209,6 +212,7 @@ class LayerIndexPlugin(ActionPlugin): parser_layerindex_fetch = self.add_command(sp, 'layerindex-fetch', self.do_layerindex_fetch, parserecipes=False) parser_layerindex_fetch.add_argument('-n', '--show-only', help='show dependencies and do nothing else', action='store_true') parser_layerindex_fetch.add_argument('-b', '--branch', help='branch name to fetch') + parser_layerindex_fetch.add_argument('-s', '--shallow', help='do only shallow clones (--depth=1)', action='store_true') parser_layerindex_fetch.add_argument('-i', '--ignore', help='assume the specified layers do not need to be fetched/added (separate multiple layers with commas, no spaces)', metavar='LAYER') parser_layerindex_fetch.add_argument('layername', nargs='+', help='layer to fetch') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:48 +0000 Subject: [oe-commits] [bitbake] 07/08: fetch2: svn: care for path_spec In-Reply-To: <158211160126.29597.469951010865899727@git.openembedded.org> References: <158211160126.29597.469951010865899727@git.openembedded.org> Message-ID: <20200219112641.B66D7234F84@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. commit 75223644ab9bc94fc268f1bab775e66c4188f279 Author: Jens Rehsack AuthorDate: Tue Feb 18 06:40:53 2020 +0100 fetch2: svn: care for path_spec Documentation says: "path_spec": A specific directory in which to checkout the specified svn module. but existing svn fetcher uses "module" always as path of checked out svn-module, regardless whether path_spec was given or not. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- lib/bb/fetch2/svn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 6c8caf5..385a6b2 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -47,7 +47,7 @@ class Svn(FetchMethod): svndir = d.getVar("SVNDIR") or (d.getVar("DL_DIR") + "/svn") relpath = self._strip_leading_slashes(ud.path) ud.pkgdir = os.path.join(svndir, ud.host, relpath) - ud.moddir = os.path.join(ud.pkgdir, ud.module) + ud.moddir = os.path.join(ud.pkgdir, ud.path_spec) # Protects the repository from concurrent updates, e.g. from two # recipes fetching different revisions at the same time ud.svnlock = os.path.join(ud.pkgdir, "svn.lock") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:50 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (6fbcb1c -> 68d2e8a) Message-ID: <158211161028.30051.9718367706301398024@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard 6fbcb1c bitbake: layerindex: allow clones to be shallow discard e595612 bitbake: fetch2: svn: care for path_spec discard db6dc22 bitbake/lib/bb/event.py: Remove duplicated ones from close matches discard 65419e3 cooker: Reset loghandler discard 9c6eb97 data: Don't allow renameVar calls with equivalent keys discard 0771b3a fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" discard 35cf83c fetch2: Make fetcher_compare_revisions() work discard 01ff109 knotty: Make the bb.command.CommandExit event terminate bitbake discard dc7d32f runqueue: Possible tid handling optimisation add 40520d2 knotty: Make the bb.command.CommandExit event terminate bitbake add ffd663a fetch2: Make fetcher_compare_revisions() work add ba093a3 fetch2: Allow ${AUTOREV} to be used when BB_SRCREV_POLICY is "cache" add 01bf091 data: Don't allow renameVar calls with equivalent keys add 7af80cd cooker: Reset loghandler add 5612192 event: Remove duplicated items from close matches add 7522364 fetch2: svn: care for path_spec add a0c8b27 layerindex: allow clones to be shallow new 68d2e8a runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6fbcb1c) \ N -- N -- N refs/heads/master-next (68d2e8a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 11:26:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 11:26:51 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158211161028.30051.9718367706301398024@git.openembedded.org> References: <158211161028.30051.9718367706301398024@git.openembedded.org> Message-ID: <20200219112650.687FA234F7E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 68d2e8a9d78252fb08d668b1d0062a9a4b437076 Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? dd862ba) Message-ID: <158212340057.6342.5382116975636907793@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 29e1b3d HACK: extra debug new 98a28da jquery: Add recipe new eba10fb oeqa: reproducible: Include jquery in results new f2dc138 iproute2: add devlink support to iproute2 new dd862ba perl: Fix makefile race causing configuration differences The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/maintainers.inc | 1 + meta/lib/oeqa/selftest/cases/reproducible.py | 13 +++++++--- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 29 +++++++++++++++++++++ meta/recipes-devtools/perl/files/racefix.patch | 24 +++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 6 files changed, 88 insertions(+), 14 deletions(-) create mode 100644 meta/recipes-devtools/jquery/jquery_3.4.1.bb create mode 100644 meta/recipes-devtools/perl/files/racefix.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 14:43:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 14:43:22 +0000 Subject: [oe-commits] [openembedded-core] 02/04: oeqa: reproducible: Include jquery in results In-Reply-To: <158212340057.6342.5382116975636907793@git.openembedded.org> References: <158212340057.6342.5382116975636907793@git.openembedded.org> Message-ID: <20200219144320.E9EC9234F7F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eba10fb17cfd23fdc065a302a4d45333947e7d75 Author: Joshua Watt AuthorDate: Tue Feb 18 18:44:44 2020 -0600 oeqa: reproducible: Include jquery in results Includes jquery in the output directory to make the diffoscope output easier to navigate Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index d3fd8c3..5d3959b 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -174,9 +174,10 @@ class ReproducibleTests(OESelftestTestCase): # Build native utilities self.write_config('') - bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native jquery-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") + jquery_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "jquery-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -225,8 +226,14 @@ class ReproducibleTests(OESelftestTestCase): os.rmdir(save_dir) else: self.logger.info('Running diffoscope') - runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], - native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + package_dir = os.path.join(save_dir, 'packages') + package_html_dir = os.path.join(package_dir, 'diff-html') + + # Copy jquery to improve the diffoscope output usability + self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js')) + + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', package_html_dir, 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) if fails: self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 14:43:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 14:43:21 +0000 Subject: [oe-commits] [openembedded-core] 01/04: jquery: Add recipe In-Reply-To: <158212340057.6342.5382116975636907793@git.openembedded.org> References: <158212340057.6342.5382116975636907793@git.openembedded.org> Message-ID: <20200219144320.D7866234F7E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 98a28da9cad68388f0906e565d97a07e425af931 Author: Joshua Watt AuthorDate: Tue Feb 18 18:44:43 2020 -0600 jquery: Add recipe Adds a recipe that packages jQuery in a manner borrowed from debian. The primary purpose is to make the diffoscope output from the autobuilder easier to navigate. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/jquery/jquery_3.4.1.bb | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4a267fa..901d607 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -284,6 +284,7 @@ RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal " RECIPE_MAINTAINER_pn-json-c = "Yi Zhao " RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao " +RECIPE_MAINTAINER_pn-jquery = "Joshua Watt " RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield " diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb new file mode 100644 index 0000000..e1080ae --- /dev/null +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "jQuery is a fast, small, and feature-rich JavaScript library" +HOMEPAGE = "https://jquery.com/" +LICENSE = "MIT" +SECTION = "devel" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}.js;startline=8;endline=10;md5=cdb86f5bda90caec023592d2e768357c" + +SRC_URI = "\ + https://code.jquery.com/${BP}.js;name=js \ + https://code.jquery.com/${BP}.min.js;name=min \ + https://code.jquery.com/${BP}.min.map;name=map \ + " + +SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4d8395bd55" +SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" +SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/javascript/${BPN}/ + install -m 644 ${WORKDIR}/${BP}.js ${D}${datadir}/javascript/${BPN}/${BPN}.js + install -m 644 ${WORKDIR}/${BP}.min.js ${D}${datadir}/javascript/${BPN}/${BPN}.min.js + install -m 644 ${WORKDIR}/${BP}.min.map ${D}${datadir}/javascript/${BPN}/${BPN}.min.map +} + +PACKAGES = "${PN}" +FILES_${PN} = "${datadir}" + +BBCLASSEXTEND += "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 14:43:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 14:43:23 +0000 Subject: [oe-commits] [openembedded-core] 03/04: iproute2: add devlink support to iproute2 In-Reply-To: <158212340057.6342.5382116975636907793@git.openembedded.org> References: <158212340057.6342.5382116975636907793@git.openembedded.org> Message-ID: <20200219144321.03270234F80@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f2dc13809c94f5dfeac51aac3354a3cec7f65a40 Author: Scott Branden AuthorDate: Tue Feb 18 16:38:01 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..8efc0ec 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)} \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 14:43:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 14:43:24 +0000 Subject: [oe-commits] [openembedded-core] 04/04: perl: Fix makefile race causing configuration differences In-Reply-To: <158212340057.6342.5382116975636907793@git.openembedded.org> References: <158212340057.6342.5382116975636907793@git.openembedded.org> Message-ID: <20200219144321.11531234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dd862badbb8a0c0ad8a6e4f970681feaf2fb7033 Author: Richard Purdie AuthorDate: Wed Feb 19 14:38:23 2020 +0000 perl: Fix makefile race causing configuration differences Add a missing makefile dependency which can cause differences in configuration (submitted upstream). Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 0000000..bac42d2 --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +In our builds Config_heavy.pl sometimes has lines: +cwarnflags=XXX +ccstdflags=XXX +and sometimes does not. +The reason is that this information is pulled from cflags by configpm and yet +there is no dependency in the Makefile. Add one to fix this. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] +RP 2020/2/19 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/Makefile +=================================================================== +--- perl-5.30.1.orig/Makefile ++++ perl-5.30.1/Makefile +@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) + git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X + ./miniperl_top make_patchnum.pl + +-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ ++lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ + lib/Config_git.pl Porting/Glossary | miniperl$X + ./miniperl_top configpm + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index b37f175..4869012 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 14:48:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 14:48:36 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: lttng-tools: upgrade 2.11.0 -> 2.11.2 Message-ID: <158212371627.8961.6303764287745209841@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new edeaf3f lttng-tools: upgrade 2.11.0 -> 2.11.2 edeaf3f is described below commit edeaf3fe2b660c3535926606ee9c5279142cb0b4 Author: Richard Purdie AuthorDate: Tue Feb 18 14:09:00 2020 -0800 lttng-tools: upgrade 2.11.0 -> 2.11.2 Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb8963..36a19ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:26:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:26:20 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: gstreamer: Fix reproducibility issue around libcap Message-ID: <158212598009.30515.6358158916714349087@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new b8f52c5 gstreamer: Fix reproducibility issue around libcap b8f52c5 is described below commit b8f52c5d22479f03fc0984ea6c098637454a1d92 Author: Richard Purdie AuthorDate: Wed Feb 19 15:15:19 2020 +0000 gstreamer: Fix reproducibility issue around libcap Add an option to avoid builds depending on the presence of setcap from the host system. Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/capfix.patch | 37 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 ++ 2 files changed, 39 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file mode 100644 index 0000000..7ca3d5a --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch @@ -0,0 +1,37 @@ +Currently gstreamer configuration depends on whether setcap is found on the host +system. Turn this into a configure option to make builds deterinistic. + +RP 2020/2/19 +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build +@@ -73,7 +73,12 @@ if have_ptp + endif + endif + +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ setcap_feature = get_option('setcap') ++ if setcap_feature.disabled() ++ setcap = find_program('dontexist', required : false) ++ else ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ endif + + # user/group to change to in gst-ptp-helper + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') +Index: gstreamer-1.16.1/meson_options.txt +=================================================================== +--- gstreamer-1.16.1.orig/meson_options.txt ++++ gstreamer-1.16.1/meson_options.txt +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') + + # Common feature options + option('examples', type : 'feature', value : 'auto', yield : true) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb index 6b8a5a0..68f5ca6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0003-meson-Add-valgrind-feature.patch \ file://0004-meson-Add-option-for-installed-tests.patch \ + file://capfix.patch \ " SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:29:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:29:15 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b8f52c5 -> 6afe9a6) Message-ID: <158212615550.5788.3486627528194681958@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard b8f52c5 gstreamer: Fix reproducibility issue around libcap discard edeaf3f lttng-tools: upgrade 2.11.0 -> 2.11.2 discard dd862ba perl: Fix makefile race causing configuration differences new 9f9f56d perl: Fix makefile race causing configuration differences new c97762b lttng-tools: upgrade 2.11.0 -> 2.11.2 new 6afe9a6 gstreamer: Fix reproducibility issue around libcap This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b8f52c5) \ N -- N -- N refs/heads/master-next (6afe9a6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:29:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:29:17 +0000 Subject: [oe-commits] [openembedded-core] 02/03: lttng-tools: upgrade 2.11.0 -> 2.11.2 In-Reply-To: <158212615550.5788.3486627528194681958@git.openembedded.org> References: <158212615550.5788.3486627528194681958@git.openembedded.org> Message-ID: <20200219152915.B4CC2234F82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c97762bd5f34a111b5219042066fccb1c51d11b7 Author: Richard Purdie AuthorDate: Tue Feb 18 14:09:00 2020 -0800 lttng-tools: upgrade 2.11.0 -> 2.11.2 Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb8963..36a19ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:29:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:29:16 +0000 Subject: [oe-commits] [openembedded-core] 01/03: perl: Fix makefile race causing configuration differences In-Reply-To: <158212615550.5788.3486627528194681958@git.openembedded.org> References: <158212615550.5788.3486627528194681958@git.openembedded.org> Message-ID: <20200219152915.AA3C2234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9f9f56d47fec7f1c6c4719a764f941d55ac02363 Author: Richard Purdie AuthorDate: Wed Feb 19 14:38:23 2020 +0000 perl: Fix makefile race causing configuration differences Add a missing makefile dependency which can cause differences in configuration (submitted upstream). [YOCTO #13800] Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 0000000..bac42d2 --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +In our builds Config_heavy.pl sometimes has lines: +cwarnflags=XXX +ccstdflags=XXX +and sometimes does not. +The reason is that this information is pulled from cflags by configpm and yet +there is no dependency in the Makefile. Add one to fix this. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] +RP 2020/2/19 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/Makefile +=================================================================== +--- perl-5.30.1.orig/Makefile ++++ perl-5.30.1/Makefile +@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) + git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X + ./miniperl_top make_patchnum.pl + +-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ ++lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ + lib/Config_git.pl Porting/Glossary | miniperl$X + ./miniperl_top configpm + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index b37f175..4869012 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:29:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:29:18 +0000 Subject: [oe-commits] [openembedded-core] 03/03: gstreamer: Fix reproducibility issue around libcap In-Reply-To: <158212615550.5788.3486627528194681958@git.openembedded.org> References: <158212615550.5788.3486627528194681958@git.openembedded.org> Message-ID: <20200219152915.BE56A234F83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6afe9a617789cb9447060f734cbd23b564935deb Author: Richard Purdie AuthorDate: Wed Feb 19 15:15:19 2020 +0000 gstreamer: Fix reproducibility issue around libcap Add an option to avoid builds depending on the presence of setcap from the host system. [YOCTO #13786] Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/capfix.patch | 37 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 ++ 2 files changed, 39 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file mode 100644 index 0000000..7ca3d5a --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch @@ -0,0 +1,37 @@ +Currently gstreamer configuration depends on whether setcap is found on the host +system. Turn this into a configure option to make builds deterinistic. + +RP 2020/2/19 +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build +@@ -73,7 +73,12 @@ if have_ptp + endif + endif + +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ setcap_feature = get_option('setcap') ++ if setcap_feature.disabled() ++ setcap = find_program('dontexist', required : false) ++ else ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ endif + + # user/group to change to in gst-ptp-helper + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') +Index: gstreamer-1.16.1/meson_options.txt +=================================================================== +--- gstreamer-1.16.1.orig/meson_options.txt ++++ gstreamer-1.16.1/meson_options.txt +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') + + # Common feature options + option('examples', type : 'feature', value : 'auto', yield : true) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb index 6b8a5a0..68f5ca6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0003-meson-Add-valgrind-feature.patch \ file://0004-meson-Add-option-for-installed-tests.patch \ + file://capfix.patch \ " SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:46:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:46:51 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6afe9a6 -> 23d1387) Message-ID: <158212721179.9406.13563716321310308522@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 6afe9a6 gstreamer: Fix reproducibility issue around libcap new 23d1387 gstreamer: Fix reproducibility issue around libcap This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6afe9a6) \ N -- N -- N refs/heads/master-next (23d1387) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 15:46:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 15:46:52 +0000 Subject: [oe-commits] [openembedded-core] 01/01: gstreamer: Fix reproducibility issue around libcap In-Reply-To: <158212721179.9406.13563716321310308522@git.openembedded.org> References: <158212721179.9406.13563716321310308522@git.openembedded.org> Message-ID: <20200219154651.F224D234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 23d1387ca5a77659e0d6b46eb35d02ea95e7b1d3 Author: Richard Purdie AuthorDate: Wed Feb 19 15:15:19 2020 +0000 gstreamer: Fix reproducibility issue around libcap Add an option to avoid builds depending on the presence of setcap from the host system. [YOCTO #13786] Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/capfix.patch | 37 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 ++ 2 files changed, 39 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file mode 100644 index 0000000..7ca3d5a --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch @@ -0,0 +1,37 @@ +Currently gstreamer configuration depends on whether setcap is found on the host +system. Turn this into a configure option to make builds deterinistic. + +RP 2020/2/19 +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build +@@ -73,7 +73,12 @@ if have_ptp + endif + endif + +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ setcap_feature = get_option('setcap') ++ if setcap_feature.disabled() ++ setcap = find_program('dontexist', required : false) ++ else ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ endif + + # user/group to change to in gst-ptp-helper + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') +Index: gstreamer-1.16.1/meson_options.txt +=================================================================== +--- gstreamer-1.16.1.orig/meson_options.txt ++++ gstreamer-1.16.1/meson_options.txt +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') + + # Common feature options + option('examples', type : 'feature', value : 'auto', yield : true) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb index 6b8a5a0..d2beafd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0003-meson-Add-valgrind-feature.patch \ file://0004-meson-Add-option-for-installed-tests.patch \ + file://capfix.patch \ " SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap libcap-native" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 16:32:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 16:32:06 +0000 Subject: [oe-commits] [openembedded-core] 01/03: perl: Fix makefile race causing configuration differences In-Reply-To: <158212992498.944.14913870339816519900@git.openembedded.org> References: <158212992498.944.14913870339816519900@git.openembedded.org> Message-ID: <20200219163205.31D62234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a68a55a266d16948af270b18384745ce29e459b Author: Richard Purdie AuthorDate: Wed Feb 19 14:38:23 2020 +0000 perl: Fix makefile race causing configuration differences Add a missing makefile dependency which can cause differences in configuration (submitted upstream). [YOCTO #13800] Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 0000000..bac42d2 --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +In our builds Config_heavy.pl sometimes has lines: +cwarnflags=XXX +ccstdflags=XXX +and sometimes does not. +The reason is that this information is pulled from cflags by configpm and yet +there is no dependency in the Makefile. Add one to fix this. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] +RP 2020/2/19 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/Makefile +=================================================================== +--- perl-5.30.1.orig/Makefile ++++ perl-5.30.1/Makefile +@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) + git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X + ./miniperl_top make_patchnum.pl + +-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ ++lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ + lib/Config_git.pl Porting/Glossary | miniperl$X + ./miniperl_top configpm + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index b37f175..4869012 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 16:32:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 16:32:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (23d1387 -> 73c3c85) Message-ID: <158212992498.944.14913870339816519900@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 23d1387 gstreamer: Fix reproducibility issue around libcap discard c97762b lttng-tools: upgrade 2.11.0 -> 2.11.2 discard 9f9f56d perl: Fix makefile race causing configuration differences discard f2dc138 iproute2: add devlink support to iproute2 new 7a68a55 perl: Fix makefile race causing configuration differences new f969c3a lttng-tools: upgrade 2.11.0 -> 2.11.2 new 73c3c85 gstreamer: Fix reproducibility issue around libcap This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (23d1387) \ N -- N -- N refs/heads/master-next (73c3c85) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-connectivity/iproute2/iproute2.inc | 34 ++++++++----------------- 1 file changed, 11 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 16:32:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 16:32:07 +0000 Subject: [oe-commits] [openembedded-core] 02/03: lttng-tools: upgrade 2.11.0 -> 2.11.2 In-Reply-To: <158212992498.944.14913870339816519900@git.openembedded.org> References: <158212992498.944.14913870339816519900@git.openembedded.org> Message-ID: <20200219163205.3F371234F82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f969c3ad692a094a5a95abaf8e7506529bed079d Author: Richard Purdie AuthorDate: Tue Feb 18 14:09:00 2020 -0800 lttng-tools: upgrade 2.11.0 -> 2.11.2 Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb8963..36a19ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 16:32:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 16:32:08 +0000 Subject: [oe-commits] [openembedded-core] 03/03: gstreamer: Fix reproducibility issue around libcap In-Reply-To: <158212992498.944.14913870339816519900@git.openembedded.org> References: <158212992498.944.14913870339816519900@git.openembedded.org> Message-ID: <20200219163205.519B0234F83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 73c3c85c3f2454695652ede263824474159857bf Author: Richard Purdie AuthorDate: Wed Feb 19 15:15:19 2020 +0000 gstreamer: Fix reproducibility issue around libcap Add an option to avoid builds depending on the presence of setcap from the host system. [YOCTO #13786] Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/capfix.patch | 37 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 ++ 2 files changed, 39 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file mode 100644 index 0000000..7ca3d5a --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch @@ -0,0 +1,37 @@ +Currently gstreamer configuration depends on whether setcap is found on the host +system. Turn this into a configure option to make builds deterinistic. + +RP 2020/2/19 +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build +@@ -73,7 +73,12 @@ if have_ptp + endif + endif + +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ setcap_feature = get_option('setcap') ++ if setcap_feature.disabled() ++ setcap = find_program('dontexist', required : false) ++ else ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ endif + + # user/group to change to in gst-ptp-helper + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') +Index: gstreamer-1.16.1/meson_options.txt +=================================================================== +--- gstreamer-1.16.1.orig/meson_options.txt ++++ gstreamer-1.16.1/meson_options.txt +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') + + # Common feature options + option('examples', type : 'feature', value : 'auto', yield : true) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb index 6b8a5a0..d2beafd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0003-meson-Add-valgrind-feature.patch \ file://0004-meson-Add-option-for-installed-tests.patch \ + file://capfix.patch \ " SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap libcap-native" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:33:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:33:07 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (d459ead -> 696408c) Message-ID: <158213358753.21278.8655537601031337032@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from d459ead xfce4-whiskermenu-plugin: upgrade 2.3.5 -> 2.4.2 add 9f3e738 mpv: Disable lua support for riscv add cbe0b43 libgphoto2: remove executable permission bits of udev rule file add 416c4f7 perl: Add libperlio-gzip-perl and libjson-perl add 64441dc lcov: Add support for intermediate JSON format add 7002e7d lcov: Add missing missing RDEPEND and enable nativesdk add dec5cea python3-pyflakes: Add python3 version add 71c2336 netplan: rdep on python3 version of pyflakes add b89254a rsyslog: Use python3 in ptests add 7b0d354 x265: Move into meta-multimedia add 0bb390b gssdp: Upgrade to 1.2.2 add 7672f53 gupnp: Upgrade to 1.2.2 add 3857527 gupnp-dlna: Rename patchdir to PN add a067634 rygel: Upgrade to 0.38.3 add d474aab gupnp-tools: Upgrade to 0.10.0 add eb50fb0 gupnp-igd: Upgrade to 0.2.5 add af2be2e gupnp-av: Upgrade to 0.12.11 add 8abbe51 fetchmail: upgrade 6.4.1 -> 6.4.2 add afa8a4e libnet-dns-perl: upgrade 1.21 -> 1.22 add 5de43a6 cifs-utils: upgrade 6.9 -> 6.10 add 07757a0 dleyna-core: Update to latest to support gupnp 1.2 add 0f9f197 dleyna-server: Bump version to support 1.2 gupnp add b934d3b graphviz: Depend on py3 at runtime add ee45667 cfengine: Upgrade to 3.15 add 140846d dleyna-renderer: Fix build with gupnp 1.2+ add c90be40 mariadb: Add pam_auth to server package. new 696408c pm-graph: Provide analyze-suspend as well The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-connectivity/gupnp/gssdp_1.0.2.bb | 24 - .../recipes-connectivity/gupnp/gssdp_1.2.2.bb | 20 + .../{gupnp-av_0.12.10.bb => gupnp-av_0.12.11.bb} | 4 +- .../gupnp/{files => gupnp-dlna}/move_vapigen.patch | 0 .../gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch | 101 +++ .../{gupnp-igd_0.2.4.bb => gupnp-igd_0.2.5.bb} | 10 +- .../gupnp/gupnp-tools_0.10.0.bb | 13 + .../gupnp/gupnp-tools_0.8.13.bb | 13 - .../recipes-connectivity/gupnp/gupnp.inc | 14 +- .../recipes-connectivity/gupnp/gupnp_1.0.2.bb | 8 - .../recipes-connectivity/gupnp/gupnp_1.2.2.bb | 8 + .../rygel/{rygel_0.37.0.bb => rygel_0.38.3.bb} | 6 +- .../recipes-multimedia/dleyna/dleyna-core_0.6.0.bb | 6 +- .../0001-add-gupnp-1.2-API-support.patch | 123 +++ .../dleyna/dleyna-renderer_0.6.0.bb | 4 +- .../dleyna/dleyna-server_0.6.0.bb | 3 +- .../recipes-multimedia/x265/x265_3.2.1.bb | 0 .../recipes-connectivity/netplan/netplan_0.98.bb | 2 +- ...x-Modify-the-dir-of-install-exec-hook-and.patch | 43 + .../cifs/{cifs-utils_6.9.bb => cifs-utils_6.10.bb} | 8 +- .../{fetchmail_6.4.1.bb => fetchmail_6.4.2.bb} | 4 +- .../analyze-suspend/analyze-suspend_5.5.bb | 29 - .../packagegroups/packagegroup-meta-oe.bb | 5 +- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + .../recipes-devtools/perl/libjson-perl_4.02000.bb | 22 + .../perl/libperlio-gzip-perl_0.20.bb | 30 + .../cfengine/cfengine-masterfiles/python3.patch | 16 + ...es_3.12.0.bb => cfengine-masterfiles_3.15.0.bb} | 15 +- .../{cfengine_3.12.0.bb => cfengine_3.15.0.bb} | 10 +- .../recipes-extended/rsyslog/rsyslog_8.1911.0.bb | 8 +- .../recipes-graphics/gphoto2/libgphoto2_2.5.23.bb | 2 +- .../recipes-graphics/graphviz/graphviz_2.40.1.bb | 4 +- meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb | 11 + meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 2 + ...info-Add-intermediate-text-format-support.patch | 898 +++++++++++++++++++++ ...info-Add-intermediate-JSON-format-support.patch | 247 ++++++ meta-oe/recipes-support/lcov/lcov_1.14.bb | 11 +- ...et-dns-perl_1.21.bb => libnet-dns-perl_1.22.bb} | 4 +- .../python/python3-pyflakes_2.1.1.bb | 16 + 39 files changed, 1625 insertions(+), 120 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb rename meta-multimedia/recipes-connectivity/gupnp/{gupnp-av_0.12.10.bb => gupnp-av_0.12.11.bb} (65%) rename meta-multimedia/recipes-connectivity/gupnp/{files => gupnp-dlna}/move_vapigen.patch (100%) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch rename meta-multimedia/recipes-connectivity/gupnp/{gupnp-igd_0.2.4.bb => gupnp-igd_0.2.5.bb} (63%) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb rename meta-multimedia/recipes-connectivity/rygel/{rygel_0.37.0.bb => rygel_0.38.3.bb} (95%) create mode 100644 meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer/0001-add-gupnp-1.2-API-support.patch rename {meta-openembedded/meta-multimedia => meta-multimedia}/recipes-multimedia/x265/x265_3.2.1.bb (100%) create mode 100644 meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch rename meta-networking/recipes-support/cifs/{cifs-utils_6.9.bb => cifs-utils_6.10.bb} (89%) rename meta-networking/recipes-support/fetchmail/{fetchmail_6.4.1.bb => fetchmail_6.4.2.bb} (86%) delete mode 100644 meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb create mode 100644 meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb create mode 100644 meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb create mode 100644 meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.12.0.bb => cfengine-masterfiles_3.15.0.bb} (74%) rename meta-oe/recipes-extended/cfengine/{cfengine_3.12.0.bb => cfengine_3.15.0.bb} (89%) create mode 100644 meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch create mode 100644 meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch rename meta-perl/recipes-perl/libnet/{libnet-dns-perl_1.21.bb => libnet-dns-perl_1.22.bb} (92%) create mode 100644 meta-python/recipes-devtools/python/python3-pyflakes_2.1.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:33:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:33:08 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: pm-graph: Provide analyze-suspend as well In-Reply-To: <158213358753.21278.8655537601031337032@git.openembedded.org> References: <158213358753.21278.8655537601031337032@git.openembedded.org> Message-ID: <20200219173308.0C2A9234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master in repository meta-openembedded. commit 696408ce3661b663a7895f75a01613e6cfeb8186 Author: Khem Raj AuthorDate: Tue Feb 18 11:22:31 2020 -0800 pm-graph: Provide analyze-suspend as well Remove stale analyze-suspend recipe Signed-off-by: Khem Raj --- .../analyze-suspend/analyze-suspend_5.5.bb | 29 ---------------------- .../packagegroups/packagegroup-meta-oe.bb | 5 +++- meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb | 11 ++++++++ 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb b/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb deleted file mode 100644 index bb0aad3..0000000 --- a/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Analyze Suspend" -DESCRIPTION = "analyze-suspend is a tool for system developers to visualize \ -the activity between suspend and resume, allowing them to identify \ -inefficiencies and bottlenecks." -HOMEPAGE = "https://01.org/suspendresume" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -# Apart from the listed RDEPENDS, analyze-suspend depends on some features -# provided by the kernel. These options are: -# - CONFIG_PM_DEBUG=y -# - CONFIG_PM_SLEEP_DEBUG=y -# - CONFIG_FTRACE=y -# - CONFIG_FUNCTION_TRACER=y -# - CONFIG_FUNCTION_GRAPH_TRACER=y - -RDEPENDS_${PN} += "python-core python-datetime python-stringold" - -SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" -SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" - -S = "${WORKDIR}/git" - -do_install() { - install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py - install -Dm 0644 README ${D}${docdir}/analyze-suspend/README -} - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index bad4aa7..d2e8ea4 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -46,7 +46,7 @@ RDEPENDS_packagegroup-meta-oe = "\ " RDEPENDS_packagegroup-meta-oe-benchmarks = "\ - analyze-suspend dhrystone iperf2 linpack phoronix-test-suite \ + dhrystone iperf2 linpack phoronix-test-suite \ tiobench bonnie++ fio iperf2 iperf3 lmbench s-suite whetstone \ libc-bench memtester sysbench dbench iozone3 libhugetlbfs \ nbench-byte tinymembench \ @@ -196,6 +196,9 @@ RDEPENDS_packagegroup-meta-oe-kernel ="\ agent-proxy broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ " +RDEPENDS_packagegroup-meta-oe-kernel_append_x86 = " pm-graph " +RDEPENDS_packagegroup-meta-oe-kernel_append_x86-64 = " pm-graph " + RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash minicoredumper" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index 63a9fa8..a137886 100644 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -12,11 +12,22 @@ SRC_URI = "git://github.com/intel/pm-graph.git \ " S = "${WORKDIR}/git" +# Apart from the listed RDEPENDS, analyze-suspend depends on some features +# provided by the kernel. These options are: +# - CONFIG_PM_DEBUG=y +# - CONFIG_PM_SLEEP_DEBUG=y +# - CONFIG_FTRACE=y +# - CONFIG_FUNCTION_TRACER=y +# - CONFIG_FUNCTION_GRAPH_TRACER=y + COMPATIBLE_HOST='(i.86|x86_64).*' EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" do_install() { oe_runmake install + install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py } RDEPENDS_${PN} += "python3-core python3-threading python3-datetime python3-compression" +RPROVIDES_${PN} = "analyze-suspend" +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:36:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:36:19 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c9a5d39 -> 7cd9fcb) Message-ID: <158213377957.22562.16170842452693853334@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard c9a5d39 pm-graph: Provide analyze-suspend as well add 696408c pm-graph: Provide analyze-suspend as well new 876f4ce meta-oe: master: remmina - use PACKAGECONFIG for spice new 33eeb4a libharu: New recipe new 46e90f0 quagga: fix tmpfiles snippet to refer to /run instead of /var/run new 7cd9fcb quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c9a5d39) \ N -- N -- N refs/heads/master-next (7cd9fcb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-protocols/quagga/quagga.inc | 8 ++-- .../packagegroups/packagegroup-meta-oe.bb | 5 ++- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 24 ++++++++++ meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 ++--- 5 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch create mode 100644 meta-oe/recipes-support/libharu/libharu_2.3.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:36:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:36:20 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: meta-oe: master: remmina - use PACKAGECONFIG for spice In-Reply-To: <158213377957.22562.16170842452693853334@git.openembedded.org> References: <158213377957.22562.16170842452693853334@git.openembedded.org> Message-ID: <20200219173620.1ABF3234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 876f4ce7639def476664834acafbf87cc227fb05 Author: dl9pf at gmx.de AuthorDate: Wed Feb 19 12:56:54 2020 +0100 meta-oe: master: remmina - use PACKAGECONFIG for spice remmina depends on spice and spice-protocol but they are in meta-networking. Use the PACKAGECONFIG flag to avoid hardcoding the dependency. Signed-off-by: Jan-Simon Moeller Signed-off-by: Khem Raj --- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index f9963ff..f9860a1 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" -DEPENDS_append_x86 = " spice spice-protocol" -DEPENDS_append_x86-64 = " spice spice-protocol" DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" @@ -23,11 +21,7 @@ inherit cmake features_check mime-xdg # depends on avahi-ui with this restriction ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" - -EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON" -EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON" - +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" do_install_append(){ # We dont need the extra stuff form other desktop environments @@ -36,6 +30,8 @@ do_install_append(){ rm -rf ${D}/${datadir}/gnome-session } +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" + RDEPENDS_${PN} = "bash" FILES_${PN}_append = " ${datadir}/icons/hicolor/*" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:36:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:36:21 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: libharu: New recipe In-Reply-To: <158213377957.22562.16170842452693853334@git.openembedded.org> References: <158213377957.22562.16170842452693853334@git.openembedded.org> Message-ID: <20200219173620.263D6234F82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 33eeb4a4e47c911e104259d9b54665bb52342997 Author: Zheng Ruoqin AuthorDate: Wed Feb 19 17:21:35 2020 +0800 libharu: New recipe libHaru is a library for generating PDF files. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 24 ++++++++++ 2 files changed, 76 insertions(+) diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch new file mode 100644 index 0000000..332be1b --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch @@ -0,0 +1,52 @@ +Backport from Fedora Project. +https://src.fedoraproject.org/rpms/libharu + +Fix the install destination of some files. + +Upstream-Status: inappropriate + +Signed-off-by: Zheng Ruoqin + +diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt +--- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 +@@ -25,7 +25,7 @@ endif(MSVC) + + # information about libharu + set(LIBHPDF_MAJOR 2) +-set(LIBHPDF_MINOR 2) ++set(LIBHPDF_MINOR 3) + set(LIBHPDF_PATCH 0) + set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) + set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") +@@ -210,9 +210,9 @@ set( + install(FILES ${haru_HDRS} DESTINATION include) + + # install various files +-install(FILES README CHANGES INSTALL DESTINATION .) ++install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + if(NOT DEVPAK) +- install(DIRECTORY if DESTINATION .) ++ install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + endif(NOT DEVPAK) + if(DEVPAK) + install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) +diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt +--- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 +@@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) + target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) + if(WIN32 AND NOT CYGWIN) + set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ else(WIN32 AND NOT CYGWIN) ++ set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) + endif(WIN32 AND NOT CYGWIN) + install( + TARGETS ${LIBHPDF_NAME} +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ) + endif(LIBHPDF_SHARED) diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb new file mode 100644 index 0000000..359f615 --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" + +SRC_URI = "https://github.com/libharu/${BPN}/archive/RELEASE_${@d.getVar('PV').replace('.','_')}.tar.gz \ + file://libharu-RELEASE_2_3_0_cmake.patch \ + " + +SRC_URI[md5sum] = "4f916aa49c3069b3a10850013c507460" +SRC_URI[sha256sum] = "8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2" + +S = "${WORKDIR}/${BPN}-RELEASE_${@d.getVar('PV').replace('.','_')}" + +inherit cmake +DEPENDS += "libpng zlib" + +do_install_append() { + mkdir -p ${D}/${datadir}/libharu + mv ${D}/libharu ${D}/${datadir} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:36:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:36:22 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: quagga: fix tmpfiles snippet to refer to /run instead of /var/run In-Reply-To: <158213377957.22562.16170842452693853334@git.openembedded.org> References: <158213377957.22562.16170842452693853334@git.openembedded.org> Message-ID: <20200219173620.33B67234F83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 46e90f065db1464724f6df2bd5860f22010965e4 Author: Callaghan, Dan AuthorDate: Tue Feb 11 16:08:33 2020 +1000 quagga: fix tmpfiles snippet to refer to /run instead of /var/run This fixes a complaint from systemd on boot: systemd-tmpfiles[393]: [/etc/tmpfiles.d/quagga.conf:1] Line references path below legacy directory /var/run/, updating /var/run/quagga ? /run/quagga; please update the tmpfiles.d/ drop-in file accordingly. Signed-off-by: Dan Callaghan Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index dfd6aa7..2673a89 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -117,7 +117,7 @@ do_install () { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/run/quagga 0755 quagga quagga -" \ + echo "d /run/quagga 0755 quagga quagga -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 17:36:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 17:36:23 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d In-Reply-To: <158213377957.22562.16170842452693853334@git.openembedded.org> References: <158213377957.22562.16170842452693853334@git.openembedded.org> Message-ID: <20200219173620.3E98D234F84@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7cd9fcb9726c73622a75722564e3f33753063748 Author: Callaghan, Dan AuthorDate: Wed Feb 19 22:08:03 2020 +1000 quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d Package-owned tmpfiles snippets belong in /usr/lib/tmpfiles.d, /etc/tmpfiles.d is for administrator customisations. Signed-off-by: Dan Callaghan Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 2673a89..310bc7e 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -116,9 +116,9 @@ do_install () { done if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d + install -d ${D}${nonarch_libdir}/tmpfiles.d echo "d /run/quagga 0755 quagga quagga -" \ - > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf fi # Remove sysinit script if sysvinit is not in DISTRO_FEATURES @@ -166,6 +166,8 @@ FILES_${PN}-ospfclient = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.* FILES_${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \ ${sysconfdir}/init.d/watchquagga" +FILES_${PN} += "${nonarch_libdir}/tmpfiles.d/*.conf" + # Indicate that the default files are configuration files CONFFILES_${PN} = "${sysconfdir}/default/quagga \ ${sysconfdir}/quagga/bgpd.conf \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 18:38:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 18:38:54 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (73c3c85 -> eced700) Message-ID: <158213753444.24389.11847919219433144025@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 73c3c85 gstreamer: Fix reproducibility issue around libcap new 76246d4 selftest/context: Avoid tracebacks from tests using multiprocessing new 55781ba oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest new eced700 oeqa/selftest: Drop 'backup' code and SIGTERM handler The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/core/context.py | 12 ++-- meta/lib/oeqa/core/utils/concurrencytest.py | 35 +---------- meta/lib/oeqa/selftest/case.py | 30 +--------- meta/lib/oeqa/selftest/context.py | 93 ++++++++++++++++------------- 4 files changed, 62 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 18:38:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 18:38:55 +0000 Subject: [oe-commits] [openembedded-core] 01/03: selftest/context: Avoid tracebacks from tests using multiprocessing In-Reply-To: <158213753444.24389.11847919219433144025@git.openembedded.org> References: <158213753444.24389.11847919219433144025@git.openembedded.org> Message-ID: <20200219183854.90BFE234F81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 76246d4c6c042e8839bad8b82dc913fa76751350 Author: Richard Purdie AuthorDate: Wed Feb 19 17:27:26 2020 +0000 selftest/context: Avoid tracebacks from tests using multiprocessing We can see tracebacks where the SIGTERM handler catches things it shouldn't. Avoid exit(1) unless we're the process that it was intended for. [YOCTO #13664] Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c4eb5d6..3d3b19c 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -280,11 +280,15 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc def _signal_clean_handler(self, signum, frame): - sys.exit(1) + if self.ourpid == os.getpid(): + sys.exit(1) def run(self, logger, args): self._process_args(logger, args) + # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf + # but don't interfer with other processes + self.ourpid = os.getpid() signal.signal(signal.SIGTERM, self._signal_clean_handler) rc = None -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 18:38:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 18:38:57 +0000 Subject: [oe-commits] [openembedded-core] 03/03: oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <158213753444.24389.11847919219433144025@git.openembedded.org> References: <158213753444.24389.11847919219433144025@git.openembedded.org> Message-ID: <20200219183854.A5EB4234F83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eced7003ab209e59ddecf9acfdce23f418d4b671 Author: Richard Purdie AuthorDate: Wed Feb 19 18:32:19 2020 +0000 oeqa/selftest: Drop 'backup' code and SIGTERM handler Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------------ meta/lib/oeqa/selftest/context.py | 47 +++------------------------------------ 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d..dcad4f7 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 2cb6c76..0ab6462 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 18:38:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 18:38:56 +0000 Subject: [oe-commits] [openembedded-core] 02/03: oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <158213753444.24389.11847919219433144025@git.openembedded.org> References: <158213753444.24389.11847919219433144025@git.openembedded.org> Message-ID: <20200219183854.9BBE0234F82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 55781baf87fbe12e2fd7f23b1ee052d19dad9f1b Author: Richard Purdie AuthorDate: Wed Feb 19 18:19:49 2020 +0000 oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++---- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------------ meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a5..16320af 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e..fac59f7 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c..2cb6c76 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting") + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 18:46:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 18:46:40 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: fetch2/svn: Avoid UnboundLocalError exception Message-ID: <158213800059.25996.10433203577312174835@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new 8c965a1 fetch2/svn: Avoid UnboundLocalError exception 8c965a1 is described below commit 8c965a1b9a624610d3f8af968d4fb7e560eac950 Author: Richard Purdie AuthorDate: Wed Feb 19 18:43:39 2020 +0000 fetch2/svn: Avoid UnboundLocalError exception The update codepath would trigger: Exception: UnboundLocalError: local variable 'svnfetchcmd' referenced before assignment Fix this so the code functions as intended in both fetch and update cases. [YOCTO #13798] Signed-off-by: Richard Purdie --- lib/bb/fetch2/svn.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 385a6b2..971a5ad 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -122,30 +122,30 @@ class Svn(FetchMethod): try: if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK): - svnupdatecmd = self._buildsvncommand(ud, d, "update") + svncmd = self._buildsvncommand(ud, d, "update") logger.info("Update " + ud.url) # We need to attempt to run svn upgrade first in case its an older working format try: runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir) except FetchError: pass - logger.debug(1, "Running %s", svnupdatecmd) - bb.fetch2.check_network_access(d, svnupdatecmd, ud.url) - runfetchcmd(svnupdatecmd, d, workdir=ud.moddir) + logger.debug(1, "Running %s", svncmd) + bb.fetch2.check_network_access(d, svncmd, ud.url) + runfetchcmd(svncmd, d, workdir=ud.moddir) else: - svnfetchcmd = self._buildsvncommand(ud, d, "fetch") + svncmd = self._buildsvncommand(ud, d, "fetch") logger.info("Fetch " + ud.url) # check out sources there bb.utils.mkdirhier(ud.pkgdir) - logger.debug(1, "Running %s", svnfetchcmd) - bb.fetch2.check_network_access(d, svnfetchcmd, ud.url) - runfetchcmd(svnfetchcmd, d, workdir=ud.pkgdir) + logger.debug(1, "Running %s", svncmd) + bb.fetch2.check_network_access(d, svncmd, ud.url) + runfetchcmd(svncmd, d, workdir=ud.pkgdir) if not ("externals" in ud.parm and ud.parm["externals"] == "nowarn"): # Warn the user if this had externals (won't catch them all) output = runfetchcmd("svn propget svn:externals || true", d, workdir=ud.moddir) if output: - if "--ignore-externals" in svnfetchcmd.split(): + if "--ignore-externals" in svncmd.split(): bb.warn("%s contains svn:externals." % ud.url) bb.warn("These should be added to the recipe SRC_URI as necessary.") bb.warn("svn fetch has ignored externals:\n%s" % output) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 18:53:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 18:53:32 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated: Revert "bash: Fix CVE-2019-18276" Message-ID: <158213841286.31673.10460741226271605958@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch zeus in repository openembedded-core. The following commit(s) were added to refs/heads/zeus by this push: new f39285b Revert "bash: Fix CVE-2019-18276" f39285b is described below commit f39285bb82e68945a81034b84da09ca1078d6719 Author: Anuj Mittal AuthorDate: Wed Feb 19 10:45:57 2020 +0800 Revert "bash: Fix CVE-2019-18276" This reverts commit 09e695246d30ef9b73e743e0130e710e19793d14. This isn't a Backport as indicated in patch and not all the changes in this change are relevant to the CVE. Revert and wait for the fix to be available upstream. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../bash/bash/bash-CVE-2019-18276.patch | 402 --------------------- meta/recipes-extended/bash/bash_5.0.bb | 1 - 2 files changed, 403 deletions(-) diff --git a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch deleted file mode 100644 index 78dcc1b..0000000 --- a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch +++ /dev/null @@ -1,402 +0,0 @@ -From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Mon, 1 Jul 2019 09:03:53 -0400 -Subject: [PATCH] commit bash-20190628 snapshot - -An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11. -By default, if Bash is run with its effective UID not equal to its real UID, -it will drop privileges by setting its effective UID to its real UID. -However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality, -the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for -runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore -regains privileges. However, binaries running with an effective UID of 0 are unaffected. - -Upstream-Status: Backport [https://github.com/bminor/bash/commit/951bdaad7a18cc0dc1036bba86b18b90874d39ff] -CVE: CVE-2019-18276 -Signed-off-by: Chet Ramey -Signed-off-by: De Huo ---- - MANIFEST | 2 ++ - bashline.c | 50 +------------------------------------------------- - builtins/help.def | 2 +- - config.h.in | 10 +++++++++- - configure | 11 +++++++++++ - configure.ac | 1 + - doc/bash.1 | 3 ++- - doc/bashref.texi | 3 ++- - lib/glob/glob.c | 5 ++++- - pathexp.c | 16 ++++++++++++++-- - shell.c | 8 ++++++++ - tests/glob.tests | 2 ++ - tests/glob6.sub | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - tests/glob7.sub | 11 +++++++++++ - 14 files changed, 122 insertions(+), 56 deletions(-) - create mode 100644 tests/glob6.sub - create mode 100644 tests/glob7.sub - -diff --git a/MANIFEST b/MANIFEST -index 03de221..f9ccad7 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -1037,6 +1037,8 @@ tests/extglob3.tests f - tests/extglob3.right f - tests/extglob4.sub f - tests/extglob5.sub f -+tests/glob6.sub f -+tests/glob7.sub f - tests/func.tests f - tests/func.right f - tests/func1.sub f -diff --git a/bashline.c b/bashline.c -index 824ea9d..d86b47d 100644 ---- a/bashline.c -+++ b/bashline.c -@@ -3718,55 +3718,7 @@ static int - completion_glob_pattern (string) - char *string; - { -- register int c; -- char *send; -- int open; -- -- DECLARE_MBSTATE; -- -- open = 0; -- send = string + strlen (string); -- -- while (c = *string++) -- { -- switch (c) -- { -- case '?': -- case '*': -- return (1); -- -- case '[': -- open++; -- continue; -- -- case ']': -- if (open) -- return (1); -- continue; -- -- case '+': -- case '@': -- case '!': -- if (*string == '(') /*)*/ -- return (1); -- continue; -- -- case '\\': -- if (*string++ == 0) -- return (0); -- } -- -- /* Advance one fewer byte than an entire multibyte character to -- account for the auto-increment in the loop above. */ --#ifdef HANDLE_MULTIBYTE -- string--; -- ADVANCE_CHAR_P (string, send - string); -- string++; --#else -- ADVANCE_CHAR_P (string, send - string); --#endif -- } -- return (0); -+ return (glob_pattern_p (string) == 1); - } - - static char *globtext; -diff --git a/builtins/help.def b/builtins/help.def -index 006c4b5..92f9b38 100644 ---- a/builtins/help.def -+++ b/builtins/help.def -@@ -128,7 +128,7 @@ help_builtin (list) - - /* We should consider making `help bash' do something. */ - -- if (glob_pattern_p (list->word->word)) -+ if (glob_pattern_p (list->word->word) == 1) - { - printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1))); - print_word_list (list, ", "); -diff --git a/config.h.in b/config.h.in -index 8554aec..ad4b1e8 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -1,6 +1,6 @@ - /* config.h -- Configuration file for bash. */ - --/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc. -+/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. - -@@ -807,6 +807,14 @@ - #undef HAVE_SETREGID - #undef HAVE_DECL_SETREGID - -+/* Define if you have the setregid function. */ -+#undef HAVE_SETRESGID -+#undef HAVE_DECL_SETRESGID -+ -+/* Define if you have the setresuid function. */ -+#undef HAVE_SETRESUID -+#undef HAVE_DECL_SETRESUID -+ - /* Define if you have the setvbuf function. */ - #undef HAVE_SETVBUF - -diff --git a/configure b/configure -index 2f62662..b3321c9 100755 ---- a/configure -+++ b/configure -@@ -10281,6 +10281,17 @@ cat >>confdefs.h <<_ACEOF - #define HAVE_DECL_SETREGID $ac_have_decl - _ACEOF - -+ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default" -+if test "x$ac_cv_have_decl_" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ $ac_have_decl -+_ACEOF -+(setresuid, setresgid) - ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" "$ac_includes_default" - if test "x$ac_cv_have_decl_strcpy" = xyes; then : - ac_have_decl=1 -diff --git a/configure.ac b/configure.ac -index 52b4cdb..549adef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr]) - AC_CHECK_DECLS([printf]) - AC_CHECK_DECLS([sbrk]) - AC_CHECK_DECLS([setregid]) -+AC_CHECK_DECLS[(setresuid, setresgid]) - AC_CHECK_DECLS([strcpy]) - AC_CHECK_DECLS([strsignal]) - -diff --git a/doc/bash.1 b/doc/bash.1 -index e6cd08d..9e58a0b 100644 ---- a/doc/bash.1 -+++ b/doc/bash.1 -@@ -4681,7 +4681,8 @@ above). - .PD - .SH "SIMPLE COMMAND EXPANSION" - When a simple command is executed, the shell performs the following --expansions, assignments, and redirections, from left to right. -+expansions, assignments, and redirections, from left to right, in -+the following order. - .IP 1. - The words that the parser has marked as variable assignments (those - preceding the command name) and redirections are saved for later -diff --git a/doc/bashref.texi b/doc/bashref.texi -index d33cd57..3065126 100644 ---- a/doc/bashref.texi -+++ b/doc/bashref.texi -@@ -2964,7 +2964,8 @@ is not specified. If the file does not exist, it is created. - @cindex command expansion - - When a simple command is executed, the shell performs the following --expansions, assignments, and redirections, from left to right. -+expansions, assignments, and redirections, from left to right, in -+the following order. - - @enumerate - @item -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index 398253b..2eaa33e 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags) - register unsigned int i; - int mflags; /* Flags passed to strmatch (). */ - int pflags; /* flags passed to sh_makepath () */ -+ int hasglob; /* return value from glob_pattern_p */ - int nalloca; - struct globval *firstmalloc, *tmplink; - char *convfn; -@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags) - patlen = (pat && *pat) ? strlen (pat) : 0; - - /* If the filename pattern (PAT) does not contain any globbing characters, -+ or contains a pattern with only backslash escapes (hasglob == 2), - we can dispense with reading the directory, and just see if there is - a filename `DIR/PAT'. If there is, and we can access it, just make the - vector to return and bail immediately. */ -- if (skip == 0 && glob_pattern_p (pat) == 0) -+ hasglob = 0; -+ if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == 2) - { - int dirlen; - struct stat finfo; -diff --git a/pathexp.c b/pathexp.c -index c1bf2d8..e6c5392 100644 ---- a/pathexp.c -+++ b/pathexp.c -@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT; - /* Control enabling special handling of `**' */ - int glob_star = 0; - --/* Return nonzero if STRING has any unquoted special globbing chars in it. */ -+/* Return nonzero if STRING has any unquoted special globbing chars in it. -+ This is supposed to be called when pathname expansion is performed, so -+ it implements the rules in Posix 2.13.3, specifically that an unquoted -+ slash cannot appear in a bracket expression. */ - int - unquoted_glob_pattern_p (string) - register char *string; -@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string) - continue; - - case ']': -- if (open) -+ if (open) /* XXX - if --open == 0? */ - return (1); - continue; - -+ case '/': -+ if (open) -+ open = 0; -+ - case '+': - case '@': - case '!': -@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string) - string++; - continue; - } -+ else if (open && *string == '/') -+ { -+ string++; /* quoted slashes in bracket expressions are ok */ -+ continue; -+ } - else if (*string == 0) - return (0); - -diff --git a/shell.c b/shell.c -index a2b2a55..6adabc8 100644 ---- a/shell.c -+++ b/shell.c -@@ -1293,7 +1293,11 @@ disable_priv_mode () - { - int e; - -+#if HAVE_DECL_SETRESUID -+ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0) -+#else - if (setuid (current_user.uid) < 0) -+#endif - { - e = errno; - sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid); -@@ -1302,7 +1306,11 @@ disable_priv_mode () - exit (e); - #endif - } -+#if HAVE_DECL_SETRESGID -+ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0) -+#else - if (setgid (current_user.gid) < 0) -+#endif - sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid); - - current_user.euid = current_user.uid; -diff --git a/tests/glob.tests b/tests/glob.tests -index 01913bb..fb012f7 100644 ---- a/tests/glob.tests -+++ b/tests/glob.tests -@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub - ${THIS_SH} ./glob2.sub - ${THIS_SH} ./glob3.sub - ${THIS_SH} ./glob4.sub -+${THIS_SH} ./glob6.sub -+${THIS_SH} ./glob7.sub - - MYDIR=$PWD # save where we are - -diff --git a/tests/glob6.sub b/tests/glob6.sub -new file mode 100644 -index 0000000..b099811 ---- /dev/null -+++ b/tests/glob6.sub -@@ -0,0 +1,54 @@ -+# tests of the backslash-in-glob-patterns discussion on the austin-group ML -+ -+: ${TMPDIR:=/var/tmp} -+ -+ORIG=$PWD -+GLOBDIR=$TMPDIR/bash-glob-$$ -+mkdir $GLOBDIR && cd $GLOBDIR -+ -+# does the pattern matcher allow backslashes as escape characters and remove -+# them as part of matching? -+touch abcdefg -+pat='ab\cd*' -+printf '<%s>\n' $pat -+pat='\.' -+printf '<%s>\n' $pat -+rm abcdefg -+ -+# how about when escaping pattern characters? -+touch '*abc.c' -+a='\**.c' -+printf '%s\n' $a -+rm -f '*abc.c' -+ -+# how about when making the distinction between readable and searchable path -+# components? -+mkdir -m a=x searchable -+mkdir -m a=r readable -+ -+p='searchable/\.' -+printf "%s\n" $p -+ -+p='searchable/\./.' -+printf "%s\n" $p -+ -+p='readable/\.' -+printf "%s\n" $p -+ -+p='readable/\./.' -+printf "%s\n" $p -+ -+printf "%s\n" 'searchable/\.' -+printf "%s\n" 'readable/\.' -+ -+echo */. -+ -+p='*/\.' -+echo $p -+ -+echo */'.' -+ -+rmdir searchable readable -+ -+cd $ORIG -+rmdir $GLOBDIR -diff --git a/tests/glob7.sub b/tests/glob7.sub -new file mode 100644 -index 0000000..0212b8e ---- /dev/null -+++ b/tests/glob7.sub -@@ -0,0 +1,11 @@ -+# according to Posix 2.13.3, a slash in a bracket expression renders that -+# bracket expression invalid -+shopt -s nullglob -+ -+echo 1: [qwe/qwe] -+echo 2: [qwe/ -+echo 3: [qwe/] -+ -+echo 4: [qwe\/qwe] -+echo 5: [qwe\/ -+echo 6: [qwe\/] --- -1.9.1 diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 1b70587..eadc822 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -19,7 +19,6 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-ptest \ file://run-bash-ptests \ file://fix-run-builtins.patch \ - file://bash-CVE-2019-18276.patch \ " SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:33 +0000 Subject: [oe-commits] [openembedded-core] 02/04: oeqa: reproducible: Include jquery in results In-Reply-To: <158214771184.16227.6852068318500085741@git.openembedded.org> References: <158214771184.16227.6852068318500085741@git.openembedded.org> Message-ID: <20200219212832.2C955234F86@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ff7c386455848e497ef40f9fee2be87d5171e203 Author: Joshua Watt AuthorDate: Tue Feb 18 18:44:44 2020 -0600 oeqa: reproducible: Include jquery in results Includes jquery in the output directory to make the diffoscope output easier to navigate Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index d3fd8c3..5d3959b 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -174,9 +174,10 @@ class ReproducibleTests(OESelftestTestCase): # Build native utilities self.write_config('') - bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native jquery-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") + jquery_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "jquery-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -225,8 +226,14 @@ class ReproducibleTests(OESelftestTestCase): os.rmdir(save_dir) else: self.logger.info('Running diffoscope') - runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], - native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + package_dir = os.path.join(save_dir, 'packages') + package_html_dir = os.path.join(package_dir, 'diff-html') + + # Copy jquery to improve the diffoscope output usability + self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js')) + + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', package_html_dir, 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) if fails: self.fail('\n'.join(fails)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:31 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (b649cf5 -> 1829103) Message-ID: <158214771184.16227.6852068318500085741@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from b649cf5 glib-2.0: add dependencies to fix ptest failures new 9fdfff9 jquery: Add recipe new ff7c386 oeqa: reproducible: Include jquery in results new fe97845 perl: Fix makefile race causing configuration differences new 1829103 gstreamer: Fix reproducibility issue around libcap The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/maintainers.inc | 1 + meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++-- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 29 +++++++++++++++++ meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + .../gstreamer/gstreamer1.0/capfix.patch | 37 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 ++ 7 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/jquery/jquery_3.4.1.bb create mode 100644 meta/recipes-devtools/perl/files/racefix.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:34 +0000 Subject: [oe-commits] [openembedded-core] 03/04: perl: Fix makefile race causing configuration differences In-Reply-To: <158214771184.16227.6852068318500085741@git.openembedded.org> References: <158214771184.16227.6852068318500085741@git.openembedded.org> Message-ID: <20200219212832.3710D234F87@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fe97845a45434902c5a994e253a127a462d7d3b4 Author: Richard Purdie AuthorDate: Wed Feb 19 14:38:23 2020 +0000 perl: Fix makefile race causing configuration differences Add a missing makefile dependency which can cause differences in configuration (submitted upstream). [YOCTO #13800] Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 0000000..bac42d2 --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +In our builds Config_heavy.pl sometimes has lines: +cwarnflags=XXX +ccstdflags=XXX +and sometimes does not. +The reason is that this information is pulled from cflags by configpm and yet +there is no dependency in the Makefile. Add one to fix this. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] +RP 2020/2/19 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/Makefile +=================================================================== +--- perl-5.30.1.orig/Makefile ++++ perl-5.30.1/Makefile +@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) + git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X + ./miniperl_top make_patchnum.pl + +-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ ++lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ + lib/Config_git.pl Porting/Glossary | miniperl$X + ./miniperl_top configpm + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index b37f175..4869012 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:32 +0000 Subject: [oe-commits] [openembedded-core] 01/04: jquery: Add recipe In-Reply-To: <158214771184.16227.6852068318500085741@git.openembedded.org> References: <158214771184.16227.6852068318500085741@git.openembedded.org> Message-ID: <20200219212832.220F4234F85@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9fdfff92e5f6b56657802c06c698ef37a95fd449 Author: Joshua Watt AuthorDate: Tue Feb 18 18:44:43 2020 -0600 jquery: Add recipe Adds a recipe that packages jQuery in a manner borrowed from debian. The primary purpose is to make the diffoscope output from the autobuilder easier to navigate. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/jquery/jquery_3.4.1.bb | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4a267fa..901d607 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -284,6 +284,7 @@ RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal " RECIPE_MAINTAINER_pn-json-c = "Yi Zhao " RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao " +RECIPE_MAINTAINER_pn-jquery = "Joshua Watt " RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield " diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb new file mode 100644 index 0000000..e1080ae --- /dev/null +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "jQuery is a fast, small, and feature-rich JavaScript library" +HOMEPAGE = "https://jquery.com/" +LICENSE = "MIT" +SECTION = "devel" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}.js;startline=8;endline=10;md5=cdb86f5bda90caec023592d2e768357c" + +SRC_URI = "\ + https://code.jquery.com/${BP}.js;name=js \ + https://code.jquery.com/${BP}.min.js;name=min \ + https://code.jquery.com/${BP}.min.map;name=map \ + " + +SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4d8395bd55" +SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" +SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/javascript/${BPN}/ + install -m 644 ${WORKDIR}/${BP}.js ${D}${datadir}/javascript/${BPN}/${BPN}.js + install -m 644 ${WORKDIR}/${BP}.min.js ${D}${datadir}/javascript/${BPN}/${BPN}.min.js + install -m 644 ${WORKDIR}/${BP}.min.map ${D}${datadir}/javascript/${BPN}/${BPN}.min.map +} + +PACKAGES = "${PN}" +FILES_${PN} = "${datadir}" + +BBCLASSEXTEND += "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:35 +0000 Subject: [oe-commits] [openembedded-core] 04/04: gstreamer: Fix reproducibility issue around libcap In-Reply-To: <158214771184.16227.6852068318500085741@git.openembedded.org> References: <158214771184.16227.6852068318500085741@git.openembedded.org> Message-ID: <20200219212832.41AB7234F88@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 182910321971cb87e54c2a92cb8ea6c531a743ee Author: Richard Purdie AuthorDate: Wed Feb 19 15:15:19 2020 +0000 gstreamer: Fix reproducibility issue around libcap Add an option to avoid builds depending on the presence of setcap from the host system. [YOCTO #13786] Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/capfix.patch | 37 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 ++ 2 files changed, 39 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file mode 100644 index 0000000..7ca3d5a --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch @@ -0,0 +1,37 @@ +Currently gstreamer configuration depends on whether setcap is found on the host +system. Turn this into a configure option to make builds deterinistic. + +RP 2020/2/19 +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build +@@ -73,7 +73,12 @@ if have_ptp + endif + endif + +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ setcap_feature = get_option('setcap') ++ if setcap_feature.disabled() ++ setcap = find_program('dontexist', required : false) ++ else ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ endif + + # user/group to change to in gst-ptp-helper + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') +Index: gstreamer-1.16.1/meson_options.txt +=================================================================== +--- gstreamer-1.16.1.orig/meson_options.txt ++++ gstreamer-1.16.1/meson_options.txt +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') + + # Common feature options + option('examples', type : 'feature', value : 'auto', yield : true) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb index 6b8a5a0..d2beafd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0003-meson-Add-valgrind-feature.patch \ file://0004-meson-Add-option-for-installed-tests.patch \ + file://capfix.patch \ " SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap libcap-native" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:41 +0000 Subject: [oe-commits] [openembedded-core] 01/11: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.5E28A234F88@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ae73141ee88466ace940697d70c85ae949f1191 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:40 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (eced700 -> acfc439) Message-ID: <158214772022.16523.4235925815476273310@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard eced700 oeqa/selftest: Drop 'backup' code and SIGTERM handler discard 55781ba oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest discard 76246d4 selftest/context: Avoid tracebacks from tests using multiprocessing discard 73c3c85 gstreamer: Fix reproducibility issue around libcap discard f969c3a lttng-tools: upgrade 2.11.0 -> 2.11.2 discard 7a68a55 perl: Fix makefile race causing configuration differences discard eba10fb oeqa: reproducible: Include jquery in results discard 98a28da jquery: Add recipe discard 29e1b3d HACK: extra debug discard 38deb0f rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard db5a33c sstatesig: Log timestamps for hashequiv in reprodubile builds discard 63763a0 HACK: signing: Add extra test debug discard 161c946 glew/curl: specify exclusive package configs discard aa2243f base.bbclass: extend PACKAGECONFIG for conflict package configs discard c0352e9 oescripts.py: use unittest.SkipUnless for class skip add 9fdfff9 jquery: Add recipe add ff7c386 oeqa: reproducible: Include jquery in results add fe97845 perl: Fix makefile race causing configuration differences add 1829103 gstreamer: Fix reproducibility issue around libcap new 2ae7314 oescripts.py: use unittest.SkipUnless for class skip new 46c055e base.bbclass: extend PACKAGECONFIG for conflict package configs new 9d3ab45 glew/curl: specify exclusive package configs new 7aa5eb6 HACK: signing: Add extra test debug new 8a4dcf0 sstatesig: Log timestamps for hashequiv in reprodubile builds new d51d6d6 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 7544544 HACK: extra debug new 79b94cb lttng-tools: upgrade 2.11.0 -> 2.11.2 new 2309628 selftest/context: Avoid tracebacks from tests using multiprocessing new 410bb48 oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest new acfc439 oeqa/selftest: Drop 'backup' code and SIGTERM handler This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (eced700) \ N -- N -- N refs/heads/master-next (acfc439) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:44 +0000 Subject: [oe-commits] [openembedded-core] 04/11: HACK: signing: Add extra test debug In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.7A0AA234F8B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7aa5eb68d9228b5bb577dcfe2fa3a4404eb1b78b Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:42 +0000 Subject: [oe-commits] [openembedded-core] 02/11: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.67935234F89@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 46c055ec6a750feb6e1ec2109978c5a48369cda3 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:43 +0000 Subject: [oe-commits] [openembedded-core] 03/11: glew/curl: specify exclusive package configs In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.719DC234F8A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9d3ab45c8af0da830756aa1ae82be0fc29d1b6fd Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:45 +0000 Subject: [oe-commits] [openembedded-core] 05/11: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.8781B234F8C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8a4dcf0eea87ff92fe155e157e99c692d63fac70 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:47 +0000 Subject: [oe-commits] [openembedded-core] 07/11: HACK: extra debug In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.9FB5F234F8E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 75445440aca943c1ae4dcdee97b587a1d64782e7 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:48 +0000 Subject: [oe-commits] [openembedded-core] 08/11: lttng-tools: upgrade 2.11.0 -> 2.11.2 In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.AB8FA234F8F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 79b94cbc7d66097fa7ecfe4cc6c41bfe18bc0c21 Author: Richard Purdie AuthorDate: Tue Feb 18 14:09:00 2020 -0800 lttng-tools: upgrade 2.11.0 -> 2.11.2 Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb8963..36a19ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:49 +0000 Subject: [oe-commits] [openembedded-core] 09/11: selftest/context: Avoid tracebacks from tests using multiprocessing In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.B6ADD234F90@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2309628f74c6a5582bda331f35798c5d6ba04e0a Author: Richard Purdie AuthorDate: Wed Feb 19 17:27:26 2020 +0000 selftest/context: Avoid tracebacks from tests using multiprocessing We can see tracebacks where the SIGTERM handler catches things it shouldn't. Avoid exit(1) unless we're the process that it was intended for. [YOCTO #13664] Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c4eb5d6..3d3b19c 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -280,11 +280,15 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc def _signal_clean_handler(self, signum, frame): - sys.exit(1) + if self.ourpid == os.getpid(): + sys.exit(1) def run(self, logger, args): self._process_args(logger, args) + # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf + # but don't interfer with other processes + self.ourpid = os.getpid() signal.signal(signal.SIGTERM, self._signal_clean_handler) rc = None -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:46 +0000 Subject: [oe-commits] [openembedded-core] 06/11: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.9317B234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d51d6d68f83c17f43e628b68f6abad5de29ff7e9 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:50 +0000 Subject: [oe-commits] [openembedded-core] 10/11: oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.C47C1234F91@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 410bb488fda0eb770d4411c15755a8c392d204fd Author: Richard Purdie AuthorDate: Wed Feb 19 18:19:49 2020 +0000 oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++---- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------------ meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a5..16320af 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e..fac59f7 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c..2cb6c76 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting") + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:28:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:28:51 +0000 Subject: [oe-commits] [openembedded-core] 11/11: oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <158214772022.16523.4235925815476273310@git.openembedded.org> References: <158214772022.16523.4235925815476273310@git.openembedded.org> Message-ID: <20200219212840.D0351234F92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit acfc4391d85b798783c6adc8b9b60992256e56a7 Author: Richard Purdie AuthorDate: Wed Feb 19 18:32:19 2020 +0000 oeqa/selftest: Drop 'backup' code and SIGTERM handler Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------------ meta/lib/oeqa/selftest/context.py | 47 +++------------------------------------ 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d..dcad4f7 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 2cb6c76..0ab6462 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:52 +0000 Subject: [oe-commits] [openembedded-core] 01/13: webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.37D8C234F8C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3147580c781353366e23341e03308b54b9180a0c Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:41 2020 +0100 webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1..153bc8d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:55 +0000 Subject: [oe-commits] [openembedded-core] 04/13: weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.5BE91234F8F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7985b46d5f7a541d43b8208dbf30d11dd64cfed5 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:44 2020 +0100 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000..e69de29 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:51 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (acfc439 -> 0e9dc75) Message-ID: <158214809190.18294.4953887057836539497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from acfc439 oeqa/selftest: Drop 'backup' code and SIGTERM handler new 3147580 webkitgtk: x11 and wayland are not mutually exclusive new a49b661 webkitgtk: unbreak wayland build new e7fa574 wayland: convert to meson build new 7985b46 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines new c00a954 qemumips: use std vga instead of cirrus vga new af43bf1 createrepo-c: upgrade 0.15.5 -> 0.15.7 new df153f6 epiphany: upgrade 3.34.3.1 -> 3.34.4 new ad1e496 libsecret: upgrade 0.20.0 -> 0.20.1 new 1f80fd0 meson: upgrade 0.53.0 -> 0.53.1 new e9e18a7 p11-kit: upgrade 0.23.18.1 -> 0.23.20 new 114b402 vala: upgrade 0.46.5 -> 0.46.6 new 7fc07cb virglrenderer: upgrade 0.8.1 -> 0.8.2 new 0e9dc75 iproute2: add devlink support to iproute2 The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/machine/include/qemuboot-mips.inc | 2 +- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++-- ...eaterepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- meta/recipes-devtools/meson/meson.inc | 4 +- .../0001-Make-CPU-family-warnings-fatal.patch | 2 +- ...02-Support-building-allarch-recipes-again.patch | 2 +- .../meson/meson/0003-native_bindir.patch | 12 +- .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 ...k-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 .../vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 +- .../{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 +- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- ...rglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ----- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 +- .../wayland/weston-init/qemux86-64/weston.ini | 0 .../wayland/weston-init/qemux86/weston.ini | 0 .../xserver-xf86-config/qemumips/xorg.conf | 39 ------ .../xserver-xf86-config/qemumips64/xorg.conf | 39 ------ meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++ .../{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +- 26 files changed, 134 insertions(+), 293 deletions(-) rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} (95%) rename meta/recipes-devtools/meson/{meson_0.53.0.bb => meson_0.53.1.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} (100%) rename meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} (57%) rename meta/recipes-gnome/epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} (85%) delete mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch rename meta/recipes-gnome/libsecret/{libsecret_0.20.0.bb => libsecret_0.20.1.bb} (81%) rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} (94%) create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch copy scripts/pybootchartgui/pybootchartgui/__init__.py => meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini (100%) copy scripts/pybootchartgui/pybootchartgui/__init__.py => meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini (100%) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:54 +0000 Subject: [oe-commits] [openembedded-core] 03/13: wayland: convert to meson build In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.4F51A234F8E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e7fa574e54736f350267e834654252560f281383 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:43 2020 +0100 wayland: convert to meson build Replace an autotools-specific .pc adjustment patch with a meson-specific one. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++++++++++++++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ---------------------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++++---- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch new file mode 100644 index 0000000..2199548 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -0,0 +1,26 @@ +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Feb 2020 21:46:18 +0100 +Subject: [PATCH] Do not hardcode the path to wayland-scanner + +This results in host contamination during builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 294aee0..7e410fa 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,7 +49,7 @@ pkgconfig.generate( + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000..f98037a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d..0000000 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075..a702b3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:53 +0000 Subject: [oe-commits] [openembedded-core] 02/13: webkitgtk: unbreak wayland build In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.44824234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a49b661550c837c47f7193a7587728f9654d05ec Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:42 2020 +0100 webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000..346ca9b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8d..5857237 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000..7db5806 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:57 +0000 Subject: [oe-commits] [openembedded-core] 06/13: createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.6FF71234F91@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af43bf1c31ee08d372684a3cf2406ae4edaa6a19 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:46 2020 +0100 createrepo-c: upgrade 0.15.5 -> 0.15.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c..c6a53ff 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:58 +0000 Subject: [oe-commits] [openembedded-core] 07/13: epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.790CF234F92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df153f64c0c7509c8e28ea275355c901f54042f2 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:47 2020 +0100 epiphany: upgrade 3.34.3.1 -> 3.34.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e15733..ddb4c27 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:56 +0000 Subject: [oe-commits] [openembedded-core] 05/13: qemumips: use std vga instead of cirrus vga In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.66BD2234F90@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c00a95465d97ae16de2ba39dd34567afc0e2dac2 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:45 2020 +0100 qemumips: use std vga instead of cirrus vga This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ---------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ---------------------- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c..f1f7c2a 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:35:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:35:01 +0000 Subject: [oe-commits] [openembedded-core] 10/13: p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.957ED234F95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e9e18a7725c0425ab5b93a90e942456b94e8df33 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:50 2020 +0100 p11-kit: upgrade 0.23.18.1 -> 0.23.20 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 93% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec..26833ef 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:35:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:35:02 +0000 Subject: [oe-commits] [openembedded-core] 11/13: vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.A06DC234F96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 114b40291777f5be0df417a9a2cd198845c74de1 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:51 2020 +0100 vala: upgrade 0.46.5 -> 0.46.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d10..66f6203 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:35:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:35:04 +0000 Subject: [oe-commits] [openembedded-core] 13/13: iproute2: add devlink support to iproute2 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.B6C07234F98@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0e9dc75c8fb5abef1e7d8b0adb6d3d0c3975811b Author: Scott Branden AuthorDate: Wed Feb 19 12:41:03 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..403d264 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:35:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:35:03 +0000 Subject: [oe-commits] [openembedded-core] 12/13: virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.AC31A234F97@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7fc07cb368fc7c9c8edfb4b8f0a026833673111a Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:52 2020 +0100 virglrenderer: upgrade 0.8.1 -> 0.8.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 1336188..1046b85 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:34:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:34:59 +0000 Subject: [oe-commits] [openembedded-core] 08/13: libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.82B1F234F93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ad1e4960b4dd63d872f91a9e712b0249ef9858ed Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:48 2020 +0100 libsecret: upgrade 0.20.0 -> 0.20.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b..0000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab..72511af 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 21:35:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 21:35:00 +0000 Subject: [oe-commits] [openembedded-core] 09/13: meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <158214809190.18294.4953887057836539497@git.openembedded.org> References: <158214809190.18294.4953887057836539497@git.openembedded.org> Message-ID: <20200219213452.8C522234F94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f80fd0e79dd837894efedae0cd35753239f1ec2 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:49 2020 +0100 meson: upgrade 0.53.0 -> 0.53.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- .../meson/0002-Support-building-allarch-recipes-again.patch | 2 +- meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 .../{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d3..d391c9c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4c..9ce31e5 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe..ce18660 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9..dc822fb 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:08:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:08:56 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (1829103 -> 8f29d82) Message-ID: <158215013673.4420.1114861460600342@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 1829103 gstreamer: Fix reproducibility issue around libcap new 63153aa distro_alias: Fix typos new 8f29d82 local.conf.sample.extended: Document how to limit parallel fetch tasks The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/distro_alias.inc | 4 ++-- meta/conf/local.conf.sample.extended | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:08:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:08:57 +0000 Subject: [oe-commits] [openembedded-core] 01/02: distro_alias: Fix typos In-Reply-To: <158215013673.4420.1114861460600342@git.openembedded.org> References: <158215013673.4420.1114861460600342@git.openembedded.org> Message-ID: <20200219220856.D7D67234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 63153aa6887e56329a5dc6d372d51de197c346e8 Author: Richard Purdie AuthorDate: Wed Feb 19 22:07:58 2020 +0000 distro_alias: Fix typos [YOCTO #13433] Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e314642..79ebcae 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -15,7 +15,7 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk" DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT" -DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debina=bjam" +DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debian=bjam" DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez" DISTRO_PN_ALIAS_pn-bootchart2 = "Fedora=bootchart2 Opensuse=bootchart" @@ -130,7 +130,7 @@ DISTRO_PN_ALIAS_pn-initramfs-live-install = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-efi = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-efi-testfs = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-testfs = "OE-Core" -DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandravia=initscripts" +DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandriva=initscripts" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:08:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:08:58 +0000 Subject: [oe-commits] [openembedded-core] 02/02: local.conf.sample.extended: Document how to limit parallel fetch tasks In-Reply-To: <158215013673.4420.1114861460600342@git.openembedded.org> References: <158215013673.4420.1114861460600342@git.openembedded.org> Message-ID: <20200219220856.DFBC8234F8E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8f29d82202898ff1604abd7a9d56a487bf120f54 Author: Richard Purdie AuthorDate: Wed Feb 19 21:41:42 2020 +0000 local.conf.sample.extended: Document how to limit parallel fetch tasks [YOCTO #13235] Signed-off-by: Richard Purdie --- meta/conf/local.conf.sample.extended | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index fcf4a9b..443b4e8 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -23,6 +23,14 @@ # # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. +# +# Some users are behind firewalls or use servers where the number of parallel connections +# is limited. In such cases you can limit the number of fetch tasks which run in parallel by +# setting the option below, in this case limiting to a maximum of 4 fetch tasks in parallel: +# +#do_fetch[number_threads] = "4" +# + #DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi nfs zeroconf pci" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:09:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:09:01 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: local.conf.sample.extended: Document how to limit parallel fetch tasks Message-ID: <158215014165.4677.8943038536669218128@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 10804ed local.conf.sample.extended: Document how to limit parallel fetch tasks 10804ed is described below commit 10804ed70d5548dbb0f49448f60a08be05b8973d Author: Richard Purdie AuthorDate: Wed Feb 19 21:41:42 2020 +0000 local.conf.sample.extended: Document how to limit parallel fetch tasks [YOCTO #13235] Signed-off-by: Richard Purdie --- meta/conf/local.conf.sample.extended | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index fcf4a9b..443b4e8 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -23,6 +23,14 @@ # # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. +# +# Some users are behind firewalls or use servers where the number of parallel connections +# is limited. In such cases you can limit the number of fetch tasks which run in parallel by +# setting the option below, in this case limiting to a maximum of 4 fetch tasks in parallel: +# +#do_fetch[number_threads] = "4" +# + #DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi nfs zeroconf pci" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:37 +0000 Subject: [oe-commits] [openembedded-core] 01/25: oescripts.py: use unittest.SkipUnless for class skip In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.78488234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 10c2216cb6fb61c74babd8bd17cb3481754b7475 Author: Trevor Gamblin AuthorDate: Thu Dec 5 11:55:19 2019 -0500 oescripts.py: use unittest.SkipUnless for class skip Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 Prior to this fix, the try/except block in OEScriptTests' setUpClass did both the import and the raise unittest.SkipTest for the subsequent OEPybootchartguyTests. The consequence of the this meant that, when cairo was not available on the test host, the raise was counted only once as a class setup issue, instead of once for each of the tests to be run, resulting in incorrect skip counts in the test results. Instead of raising unittest.SkipTest in setUpClass, the more proper method is to use the unittest.skipUnless method along with importlib.util.find_spec to check for the presence of the python3-cairo module. This allows the entire class to be skipped if cairo is not present, while also correctly passing along the skip state for each of the class's tests, and avoiding the UNKNOWN results to appear in cases where the -j option was provided to oe-selftest, but the tests were still skipped. Signed-off-by: Trevor Gamblin Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 41cbe04..2f18d8f 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -4,6 +4,7 @@ import os import shutil +import importlib import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase @@ -33,15 +34,13 @@ class BuildhistoryDiffTests(BuildhistoryBase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) + at unittest.skipUnless(importlib.util.find_spec("cairo"), "Python cairo module is not present") class OEScriptTests(OESelftestTestCase): @classmethod def setUpClass(cls): super(OEScriptTests, cls).setUpClass() - try: - import cairo - except ImportError: - raise unittest.SkipTest('Python module cairo is not present') + import cairo bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:36 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (10804ed -> 9e3dcd6) Message-ID: <158215053631.10872.827943600403124809@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 10804ed local.conf.sample.extended: Document how to limit parallel fetch tasks discard 0e9dc75 iproute2: add devlink support to iproute2 discard 7fc07cb virglrenderer: upgrade 0.8.1 -> 0.8.2 discard 114b402 vala: upgrade 0.46.5 -> 0.46.6 discard e9e18a7 p11-kit: upgrade 0.23.18.1 -> 0.23.20 discard 1f80fd0 meson: upgrade 0.53.0 -> 0.53.1 discard ad1e496 libsecret: upgrade 0.20.0 -> 0.20.1 discard df153f6 epiphany: upgrade 3.34.3.1 -> 3.34.4 discard af43bf1 createrepo-c: upgrade 0.15.5 -> 0.15.7 discard c00a954 qemumips: use std vga instead of cirrus vga discard 7985b46 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines discard e7fa574 wayland: convert to meson build discard a49b661 webkitgtk: unbreak wayland build discard 3147580 webkitgtk: x11 and wayland are not mutually exclusive discard acfc439 oeqa/selftest: Drop 'backup' code and SIGTERM handler discard 410bb48 oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest discard 2309628 selftest/context: Avoid tracebacks from tests using multiprocessing discard 79b94cb lttng-tools: upgrade 2.11.0 -> 2.11.2 discard 7544544 HACK: extra debug discard d51d6d6 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 8a4dcf0 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 7aa5eb6 HACK: signing: Add extra test debug discard 9d3ab45 glew/curl: specify exclusive package configs discard 46c055e base.bbclass: extend PACKAGECONFIG for conflict package configs discard 2ae7314 oescripts.py: use unittest.SkipUnless for class skip add 63153aa distro_alias: Fix typos add 8f29d82 local.conf.sample.extended: Document how to limit parallel fetch tasks new 10c2216 oescripts.py: use unittest.SkipUnless for class skip new cfc5bcc base.bbclass: extend PACKAGECONFIG for conflict package configs new ee50415 glew/curl: specify exclusive package configs new a966e82 HACK: signing: Add extra test debug new d56ca2a sstatesig: Log timestamps for hashequiv in reprodubile builds new fd10ee7 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new d30092e HACK: extra debug new f5396fd lttng-tools: upgrade 2.11.0 -> 2.11.2 new de4210c selftest/context: Avoid tracebacks from tests using multiprocessing new 253813c oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest new 5df64e0 oeqa/selftest: Drop 'backup' code and SIGTERM handler new f95600c webkitgtk: x11 and wayland are not mutually exclusive new c5ce819 webkitgtk: unbreak wayland build new 0914544 wayland: convert to meson build new e6450c1 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines new 7892bd7 qemumips: use std vga instead of cirrus vga new b3d107c createrepo-c: upgrade 0.15.5 -> 0.15.7 new 2c21841 epiphany: upgrade 3.34.3.1 -> 3.34.4 new 18a1427 libsecret: upgrade 0.20.0 -> 0.20.1 new 008f704 meson: upgrade 0.53.0 -> 0.53.1 new 1428b28 p11-kit: upgrade 0.23.18.1 -> 0.23.20 new 59221e4 vala: upgrade 0.46.5 -> 0.46.6 new 0781094 virglrenderer: upgrade 0.8.1 -> 0.8.2 new f20df58 iproute2: add devlink support to iproute2 new 9e3dcd6 libubootenv: bump to revision ba952d0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (10804ed) \ N -- N -- N refs/heads/master-next (9e3dcd6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 25 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/distro_alias.inc | 4 ++-- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:40 +0000 Subject: [oe-commits] [openembedded-core] 04/25: HACK: signing: Add extra test debug In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.9834E234F90@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a966e82ec4ce17e89441b554f98a1796e27bfd3c Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:38 +0000 Subject: [oe-commits] [openembedded-core] 02/25: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.843CC234F8E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cfc5bcc6303bf52ba2f7ace6ea5ab10cedc29b18 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:39 +0000 Subject: [oe-commits] [openembedded-core] 03/25: glew/curl: specify exclusive package configs In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.8E7ED234F8F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ee50415ebf30ade7a9d350503415628bc69cb114 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:41 +0000 Subject: [oe-commits] [openembedded-core] 05/25: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.A431A234F91@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d56ca2a188d8f1f9497e7075642fd8032ead654b Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:43 +0000 Subject: [oe-commits] [openembedded-core] 07/25: HACK: extra debug In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.BA900234F93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d30092ecf88741727b5847af5ca50d76a7583141 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:44 +0000 Subject: [oe-commits] [openembedded-core] 08/25: lttng-tools: upgrade 2.11.0 -> 2.11.2 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.C5732234F94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f5396fdb71e027443cbd30d3e32dcc1d5bbc3aa4 Author: Richard Purdie AuthorDate: Tue Feb 18 14:09:00 2020 -0800 lttng-tools: upgrade 2.11.0 -> 2.11.2 Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb8963..36a19ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:42 +0000 Subject: [oe-commits] [openembedded-core] 06/25: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.AFB41234F92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fd10ee71ddcbcff22e077fa7ac45ac3bcab9a65e Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:45 +0000 Subject: [oe-commits] [openembedded-core] 09/25: selftest/context: Avoid tracebacks from tests using multiprocessing In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.D167D234F95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit de4210c0da6e32efa3eb71a8c2d06cee18045e8f Author: Richard Purdie AuthorDate: Wed Feb 19 17:27:26 2020 +0000 selftest/context: Avoid tracebacks from tests using multiprocessing We can see tracebacks where the SIGTERM handler catches things it shouldn't. Avoid exit(1) unless we're the process that it was intended for. [YOCTO #13664] Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c4eb5d6..3d3b19c 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -280,11 +280,15 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc def _signal_clean_handler(self, signum, frame): - sys.exit(1) + if self.ourpid == os.getpid(): + sys.exit(1) def run(self, logger, args): self._process_args(logger, args) + # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf + # but don't interfer with other processes + self.ourpid = os.getpid() signal.signal(signal.SIGTERM, self._signal_clean_handler) rc = None -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:48 +0000 Subject: [oe-commits] [openembedded-core] 12/25: webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.0280E234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f95600c8eab9f5fcc712da1029ad93223ffa82ea Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:41 2020 +0100 webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1..153bc8d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:46 +0000 Subject: [oe-commits] [openembedded-core] 10/25: oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.DF740234F96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 253813c9571eee03457b89fe2ce4d453452bb8fb Author: Richard Purdie AuthorDate: Wed Feb 19 18:19:49 2020 +0000 oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++---- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------------ meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a5..16320af 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e..fac59f7 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c..2cb6c76 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting") + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:47 +0000 Subject: [oe-commits] [openembedded-core] 11/25: oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221536.ECDE8234F97@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5df64e08b8a95fdd42784dcef71ab84881b0bd65 Author: Richard Purdie AuthorDate: Wed Feb 19 18:32:19 2020 +0000 oeqa/selftest: Drop 'backup' code and SIGTERM handler Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------------ meta/lib/oeqa/selftest/context.py | 47 +++------------------------------------ 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d..dcad4f7 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 2cb6c76..0ab6462 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:51 +0000 Subject: [oe-commits] [openembedded-core] 15/25: weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.2A01C234F8E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e6450c1e52e8ffaceaceb0af1914cc76bf5737cc Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:44 2020 +0100 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000..e69de29 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:53 +0000 Subject: [oe-commits] [openembedded-core] 17/25: createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.422DD234F90@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b3d107ce6e0ae6ceed8b4d3dd31ab960891c57be Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:46 2020 +0100 createrepo-c: upgrade 0.15.5 -> 0.15.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c..c6a53ff 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:49 +0000 Subject: [oe-commits] [openembedded-core] 13/25: webkitgtk: unbreak wayland build In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.0E2AD234F98@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c5ce81983824c179d2df8dc3dc78f5e0263df4f0 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:42 2020 +0100 webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000..346ca9b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8d..5857237 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000..7db5806 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:50 +0000 Subject: [oe-commits] [openembedded-core] 14/25: wayland: convert to meson build In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.1C1A6234F8C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 09145445b41fb78d9813d944da651fd72fdd17b6 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:43 2020 +0100 wayland: convert to meson build Replace an autotools-specific .pc adjustment patch with a meson-specific one. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++++++++++++++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ---------------------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++++---- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch new file mode 100644 index 0000000..2199548 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -0,0 +1,26 @@ +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Feb 2020 21:46:18 +0100 +Subject: [PATCH] Do not hardcode the path to wayland-scanner + +This results in host contamination during builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 294aee0..7e410fa 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,7 +49,7 @@ pkgconfig.generate( + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000..f98037a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d..0000000 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075..a702b3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:57 +0000 Subject: [oe-commits] [openembedded-core] 21/25: p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.7460C234F91@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1428b28ea5e2fd48c3fe20fa871e514571819e5d Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:50 2020 +0100 p11-kit: upgrade 0.23.18.1 -> 0.23.20 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 93% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec..26833ef 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:58 +0000 Subject: [oe-commits] [openembedded-core] 22/25: vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.80335234F9C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59221e4cd466102b91e64c4220524ab079d904a6 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:51 2020 +0100 vala: upgrade 0.46.5 -> 0.46.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d10..66f6203 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:55 +0000 Subject: [oe-commits] [openembedded-core] 19/25: libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.59D26234F9A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 18a1427886a98295a7117fa1ceca81330bbd2ea3 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:48 2020 +0100 libsecret: upgrade 0.20.0 -> 0.20.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b..0000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab..72511af 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:16:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:16:00 +0000 Subject: [oe-commits] [openembedded-core] 24/25: iproute2: add devlink support to iproute2 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.A14D4234F92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f20df583ed88fde3b03a8135c4a0d3da4319ec88 Author: Scott Branden AuthorDate: Wed Feb 19 12:41:03 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..403d264 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:16:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:16:01 +0000 Subject: [oe-commits] [openembedded-core] 25/25: libubootenv: bump to revision ba952d0 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.AFB2C234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9e3dcd6aa1d1ce291eea2fe02f1c5df1844d9343 Author: Pierre-Jean Texier AuthorDate: Wed Feb 19 22:37:12 2020 +0100 libubootenv: bump to revision ba952d0 This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier Acked-by: Stefano Babic Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..7a7ec4c 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -11,8 +11,9 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" +PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:54 +0000 Subject: [oe-commits] [openembedded-core] 18/25: epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.4E2A7234F99@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2c21841aba2551b17893d373a47ce426ca558ab9 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:47 2020 +0100 epiphany: upgrade 3.34.3.1 -> 3.34.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e15733..ddb4c27 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:52 +0000 Subject: [oe-commits] [openembedded-core] 16/25: qemumips: use std vga instead of cirrus vga In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.370F3234F8F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7892bd7039b813c2bd3bfe676aece88117155c20 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:45 2020 +0100 qemumips: use std vga instead of cirrus vga This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ---------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ---------------------- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c..f1f7c2a 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:59 +0000 Subject: [oe-commits] [openembedded-core] 23/25: virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.918B9234F93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0781094042ba193437d125a4eba49f8e69a037b3 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:52 2020 +0100 virglrenderer: upgrade 0.8.1 -> 0.8.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 1336188..1046b85 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:15:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:15:56 +0000 Subject: [oe-commits] [openembedded-core] 20/25: meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <158215053631.10872.827943600403124809@git.openembedded.org> References: <158215053631.10872.827943600403124809@git.openembedded.org> Message-ID: <20200219221537.65BB2234F9B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 008f704db14271c80424ff20ee3ace697d51b328 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:49 2020 +0100 meson: upgrade 0.53.0 -> 0.53.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- .../meson/0002-Support-building-allarch-recipes-again.patch | 2 +- meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 .../{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d3..d391c9c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4c..9ce31e5 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe..ce18660 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9..dc822fb 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:02 +0000 Subject: [oe-commits] [openembedded-core] 03/15: webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223459.E4DB7234F8F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 56fbdbde44d473e8dba77d253dcee5702b82ddf1 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:41 2020 +0100 webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1..153bc8d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:00 +0000 Subject: [oe-commits] [openembedded-core] 01/15: oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223459.D4C77234F8D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dbecb99eb7c990fe239ce49c8a08c4dc74d73b6a Author: Richard Purdie AuthorDate: Wed Feb 19 18:19:49 2020 +0000 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++---- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------------ meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a5..16320af 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e..fac59f7 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c..2cb6c76 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting") + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:01 +0000 Subject: [oe-commits] [openembedded-core] 02/15: oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223459.DCFA7234F8E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5d96bb5c584c430efd54a38ad59aba75cabf217 Author: Richard Purdie AuthorDate: Wed Feb 19 18:32:19 2020 +0000 oeqa/selftest: Drop 'backup' code and SIGTERM handler Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------------ meta/lib/oeqa/selftest/context.py | 47 +++------------------------------------ 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d..dcad4f7 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 2cb6c76..0ab6462 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:03 +0000 Subject: [oe-commits] [openembedded-core] 04/15: webkitgtk: unbreak wayland build In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223459.ECF64234F90@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e729f70194165505e985e4c8581dd72a708a3551 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:42 2020 +0100 webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000..346ca9b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8d..5857237 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000..7db5806 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:34:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:34:59 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (9e3dcd6 -> cecc039) Message-ID: <158215169963.21763.9800065919232808128@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 9e3dcd6 libubootenv: bump to revision ba952d0 discard f20df58 iproute2: add devlink support to iproute2 discard 0781094 virglrenderer: upgrade 0.8.1 -> 0.8.2 discard 59221e4 vala: upgrade 0.46.5 -> 0.46.6 discard 1428b28 p11-kit: upgrade 0.23.18.1 -> 0.23.20 discard 008f704 meson: upgrade 0.53.0 -> 0.53.1 discard 18a1427 libsecret: upgrade 0.20.0 -> 0.20.1 discard 2c21841 epiphany: upgrade 3.34.3.1 -> 3.34.4 discard b3d107c createrepo-c: upgrade 0.15.5 -> 0.15.7 discard 7892bd7 qemumips: use std vga instead of cirrus vga discard e6450c1 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines discard 0914544 wayland: convert to meson build discard c5ce819 webkitgtk: unbreak wayland build discard f95600c webkitgtk: x11 and wayland are not mutually exclusive discard 5df64e0 oeqa/selftest: Drop 'backup' code and SIGTERM handler discard 253813c oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest new dbecb99 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest new b5d96bb oeqa/selftest: Drop 'backup' code and SIGTERM handler new 56fbdbd webkitgtk: x11 and wayland are not mutually exclusive new e729f70 webkitgtk: unbreak wayland build new 1831a7d weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines new 2abaf12 qemumips: use std vga instead of cirrus vga new dc17fbb createrepo-c: upgrade 0.15.5 -> 0.15.7 new 6a8608b epiphany: upgrade 3.34.3.1 -> 3.34.4 new 4fd169b libsecret: upgrade 0.20.0 -> 0.20.1 new 096a6d9 meson: upgrade 0.53.0 -> 0.53.1 new cf79c56 p11-kit: upgrade 0.23.18.1 -> 0.23.20 new 131775b vala: upgrade 0.46.5 -> 0.46.6 new f4f815c virglrenderer: upgrade 0.8.1 -> 0.8.2 new c7fef08 iproute2: add devlink support to iproute2 new cecc039 libubootenv: bump to revision ba952d0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9e3dcd6) \ N -- N -- N refs/heads/master-next (cecc039) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ------------------ ...-find-the-native-wayland-scanner-directly.patch | 27 ------------------ .../wayland/wayland/fixpathinpcfiles.patch | 32 ++++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++++---- 4 files changed, 37 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch create mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:04 +0000 Subject: [oe-commits] [openembedded-core] 05/15: weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.0266F234F91@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1831a7d5100f526a68355b9445ab938c2edb5bdc Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:44 2020 +0100 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000..e69de29 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:06 +0000 Subject: [oe-commits] [openembedded-core] 07/15: createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.13BB2234F93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dc17fbbf0568c9620248f5f2ebcdbb882f5d0d55 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:46 2020 +0100 createrepo-c: upgrade 0.15.5 -> 0.15.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c..c6a53ff 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:05 +0000 Subject: [oe-commits] [openembedded-core] 06/15: qemumips: use std vga instead of cirrus vga In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.0AF53234F92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2abaf126b941da32a25e4a7c9e6ff36be6aff095 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:45 2020 +0100 qemumips: use std vga instead of cirrus vga This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ---------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ---------------------- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c..f1f7c2a 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:07 +0000 Subject: [oe-commits] [openembedded-core] 08/15: epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.1B7EB234F94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6a8608bf9703e6073da51bf3899a158f0dd0fb31 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:47 2020 +0100 epiphany: upgrade 3.34.3.1 -> 3.34.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e15733..ddb4c27 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:10 +0000 Subject: [oe-commits] [openembedded-core] 11/15: p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.335FA234F97@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cf79c5664e5201a93c68d03012a15ccfdc1fe5c3 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:50 2020 +0100 p11-kit: upgrade 0.23.18.1 -> 0.23.20 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 93% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec..26833ef 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:11 +0000 Subject: [oe-commits] [openembedded-core] 12/15: vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.3AFB0234F98@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 131775b718487ab30d8c3e8a47735805dd764cf6 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:51 2020 +0100 vala: upgrade 0.46.5 -> 0.46.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d10..66f6203 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:08 +0000 Subject: [oe-commits] [openembedded-core] 09/15: libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.23434234F95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4fd169b6750b56c9bf648fc5ebfbb558b1089d21 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:48 2020 +0100 libsecret: upgrade 0.20.0 -> 0.20.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b..0000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab..72511af 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:12 +0000 Subject: [oe-commits] [openembedded-core] 13/15: virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.437A7234F99@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f4f815c37886df9eb2d171ac7b641748488a5ea9 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:52 2020 +0100 virglrenderer: upgrade 0.8.1 -> 0.8.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 1336188..1046b85 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:09 +0000 Subject: [oe-commits] [openembedded-core] 10/15: meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.2B806234F96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 096a6d93b4fc191f19b0dac4be6f5a8970159aa8 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:49 2020 +0100 meson: upgrade 0.53.0 -> 0.53.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- .../meson/0002-Support-building-allarch-recipes-again.patch | 2 +- meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 .../{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d3..d391c9c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4c..9ce31e5 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe..ce18660 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9..dc822fb 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:13 +0000 Subject: [oe-commits] [openembedded-core] 14/15: iproute2: add devlink support to iproute2 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.4B6B8234F9A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c7fef0817ba4f98d795adf54bb257698e32b45b8 Author: Scott Branden AuthorDate: Wed Feb 19 12:41:03 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..403d264 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:35:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:35:14 +0000 Subject: [oe-commits] [openembedded-core] 15/15: libubootenv: bump to revision ba952d0 In-Reply-To: <158215169963.21763.9800065919232808128@git.openembedded.org> References: <158215169963.21763.9800065919232808128@git.openembedded.org> Message-ID: <20200219223500.5632D234F9B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cecc03901699f7499ed3522138ce1e64e15bbae0 Author: Pierre-Jean Texier AuthorDate: Wed Feb 19 22:37:12 2020 +0100 libubootenv: bump to revision ba952d0 This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier Acked-by: Stefano Babic Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..7a7ec4c 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -11,8 +11,9 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" +PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 19 22:47:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 19 Feb 2020 22:47:58 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: binutils: Upgrade to 2.34 release Message-ID: <158215247836.24195.13829524295297099048@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 92c9d4c binutils: Upgrade to 2.34 release 92c9d4c is described below commit 92c9d4c7fbb7c1f0f8c71bd162f304ef5c98e233 Author: Khem Raj AuthorDate: Wed Feb 19 14:42:39 2020 -0800 binutils: Upgrade to 2.34 release Details of changelog [1] Removing bfd/ld patch to ebale pe targets instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch rpaths are no longer emitted into elfedit/readelf therefore no need of chrpath anymore Instead of pre-generating configure scripts and house them in libtool patch, generate them during configure. This also ensures that we do not patch configure directly but rather the sources which generate it Package newly added libctf library [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 21 +- ...oss-Do-not-generate-linker-script-directo.patch | 10 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 78 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 44 + ...te-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 35 - ...=> 0005-Point-scripts-location-to-libdir.patch} | 15 +- ...te-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 41 + .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7118 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 13 +- ...s-of-system-directories-when-cross-linki.patch} | 45 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 7 +- ...hange-default-emulation-for-mips64-linux.patch} | 28 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 117 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 9 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 9 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 7 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- 29 files changed, 7476 insertions(+), 21623 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 82530f5..e957e3a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8..2808a1a 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "e2b46ba142d9901897d8189422f0bcc28e5660b8" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa5..b070d85 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -13,17 +13,12 @@ LICENSE = "GPLv3" DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" -# -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath -# -DEPENDS_append_class-target = " chrpath-replacement-native" -EXTRANATIVEPATH_append_class-target = " chrpath-native" - inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ + ${libdir}/libctf.so \ + ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" # Rather than duplicating multiple entries for these, make one @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do + cd ${S}/$d + autoconf + rm -rf autom4te.cache + done + cd ${S} + gnu-configize) + oe_runconf # # must prime config.cache to ensure the build of libiberty @@ -123,10 +129,6 @@ do_configure () { done } -do_compile_append_class-target() { - chrpath -d ${B}/binutils/elfedit - chrpath -d ${B}/binutils/readelf -} do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461b..a36c259 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,7 +1,7 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From 9caa0964b6f50411d1b4520a31461cd0a87810fd Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 -Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs +Date: Mon, 2 Mar 2015 01:58:54 +0000 +Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then @@ -57,3 +57,6 @@ index f9f0f7d402..9e469dca86 100644 fi if test -z "$PLT"; then IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4..f71c425 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,7 +1,8 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From 0427b3691e544051c208ea9bac9a7fb3accccba7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 -Subject: [PATCH] binutils-cross: Do not generate linker script directories +Subject: [PATCH 02/15] binutils-cross: Do not generate linker script + directories We don't place target libraries within ${exec_prefix}, we'd always place these within the target sysroot within the standard library directories. Worse, the @@ -22,7 +23,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() @@ -57,3 +58,6 @@ index c90f38a63c..97ad1a24d6 100755 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then libs=${NATIVE_LIB_DIRS} if [ "x${NATIVE}" = "xyes" ] ; then +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d1..2a826f5 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From 3465d8085de4dd0137e690e99cee63aec7df011a Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH 03/15] binutils-nativesdk: Search for alternative ld.so.conf + in SDK installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; @@ -78,3 +93,6 @@ Index: git/ld/ldmain.h extern char *ld_canon_sysroot; extern int ld_canon_sysroot_len; extern FILE *saved_script_handle; +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 4a6b107..0000000 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH] configure: widen the regexp for SH architectures - -gprof needs to know about uclibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure | 2 +- - gprof/configure | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 ---- a/configure -+++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000..8f155af --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,44 @@ +From 57451f32d025e92ef48f9efff4541933bc465b27 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH 04/15] configure: widen the regexp for SH architectures + +gprof needs to know about uclibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 91dc42f6c7..7c1b747e7c 100755 +--- a/configure ++++ b/configure +@@ -3915,7 +3915,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4bd869a63a..7187b34dfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1159,7 +1159,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch deleted file mode 100644 index 214ae06..0000000 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:27:17 +0000 -Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty - -for cases where -rpath isn't specified. debian (#151024) - -Upstream-Status: Pending - -Signed-off-by: Chris Chimelis -Signed-off-by: Khem Raj ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 78% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3..d618fc4 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,7 +1,7 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 63806906fdfbebffb36ca8bfef1ecfb0c995222a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 -Subject: [PATCH] Point scripts location to libdir +Subject: [PATCH 05/15] Point scripts location to libdir Upstream-Status: Inappropriate [debian patch] @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -37,3 +37,6 @@ index fdf06128b2..5c108b9e05 100644 BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch new file mode 100644 index 0000000..b0a1500 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -0,0 +1,41 @@ +From 6013ef00770e47ba30cbce9a567fc4ee3d1da20e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:27:17 +0000 +Subject: [PATCH 06/15] Only generate an RPATH entry if LD_RUN_PATH is not + empty + +for cases where -rpath isn't specified. debian (#151024) + +Upstream-Status: Pending + +Signed-off-by: Chris Chimelis +Signed-off-by: Khem Raj +--- + ld/ldelf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/ldelf.c b/ld/ldelf.c +index a095d6aac5..a2455a8793 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1229,6 +1229,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, + && command_line.rpath == NULL) + { + path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((path) && (strlen (path) == 0)) ++ path = NULL; + if (path + && ldelf_search_needed (path, &n, force, + is_linux, elfsize)) +@@ -1573,6 +1575,8 @@ ldelf_before_allocation (char *audit, char *depaudit, + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch deleted file mode 100644 index 135eb88..0000000 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ /dev/null @@ -1,21203 +0,0 @@ -From 9cebc65f222dfd4e0b3072b53f46ffcf328e9fe4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH] Use libtool 2.4 - -get libtool sysroot support - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - bfd/configure | 1322 ++++++++++++++----- - bfd/configure.ac | 2 +- - binutils/configure | 1320 ++++++++++++++----- - gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1321 ++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------ - libtool.m4 | 1080 +++++++++++----- - ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- - ltoptions.m4 | 2 +- - ltversion.m4 | 12 +- - lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 ++++++++++++++----- - opcodes/configure.ac | 2 +- - zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) - ---- a/bfd/configure -+++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -822,6 +825,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-mmap try using mmap for BFD input files if available - --with-separate-debug-dir=DIR - Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6808,6 +6894,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6900,6 +7158,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7262,8 +7580,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7351,7 +7682,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7426,6 +7757,20 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7445,6 +7790,41 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - - - # Check whether --enable-libtool-lock was given. -@@ -7653,6 +8033,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8380,7 +8879,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8469,7 +8969,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9470,7 +9983,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9588,8 +10102,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9607,8 +10121,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9654,8 +10168,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9785,7 +10299,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9798,22 +10318,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9838,22 +10371,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10102,23 +10685,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10932,7 +11587,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11728,7 +12383,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= - if test "$enable_shared" = "yes"; then - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18422,12 +19127,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/binutils/configure -+++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -807,6 +810,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6572,6 +6658,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6664,6 +6922,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7115,7 +7446,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7190,6 +7521,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -7211,6 +7554,43 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8175,7 +8674,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8264,7 +8764,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9265,7 +9778,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9383,8 +9897,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9402,8 +9916,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9449,8 +9963,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9580,7 +10094,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9593,22 +10113,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9633,22 +10166,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9897,23 +10480,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10727,7 +11382,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11523,7 +12178,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17159,12 +17864,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gas/configure -+++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -799,6 +802,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-cpu=CPU default cpu variant is CPU (currently only supported - on ARC) - --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6392,6 +6478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6484,6 +6742,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6935,7 +7266,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7010,6 +7341,19 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7030,6 +7374,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7237,6 +7617,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7995,7 +8494,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8084,7 +8584,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9085,7 +9598,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9203,8 +9717,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9222,8 +9736,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9269,8 +9783,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9400,7 +9914,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9413,22 +9933,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9453,22 +9986,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9717,23 +10300,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10547,7 +11202,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11343,7 +11998,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16049,8 +16714,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16081,7 +16753,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16117,6 +16788,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16890,7 +17562,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17158,12 +17863,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gprof/configure -+++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -780,6 +783,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5124,8 +5130,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --linux-uclibc*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -- ;; -- - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6244,6 +6325,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6276,8 +6525,8 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6336,6 +6589,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6698,8 +7011,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6776,6 +7090,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6787,7 +7113,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6824,8 +7150,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6862,6 +7188,17 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ - - - -@@ -6883,6 +7220,44 @@ fi - - - -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7089,6 +7464,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7652,6 +8144,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7847,7 +8341,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7936,7 +8431,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8234,8 +8729,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8520,13 +9019,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8587,6 +9090,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8937,7 +9445,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9036,12 +9545,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9055,8 +9564,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9074,8 +9583,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9121,8 +9630,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9252,7 +9761,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9265,22 +9780,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9305,22 +9833,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9569,23 +10147,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10399,7 +11049,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11239,10 +11889,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11345,10 +11995,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13435,8 +14095,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13467,7 +14134,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13503,6 +14169,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14268,7 +14935,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14536,12 +15236,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/ld/configure -+++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -816,6 +819,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-lib-path=dir1:dir2... set default LIB_PATH - --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -7075,6 +7161,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7167,6 +7425,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7618,7 +7949,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7693,6 +8024,13 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - - - -@@ -7714,6 +8052,48 @@ fi - - - -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8551,6 +9050,16 @@ done - - - -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+ -+ -+ - - - # Set options -@@ -8679,7 +9188,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8768,7 +9278,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9769,7 +10292,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9887,8 +10411,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9906,8 +10430,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9953,8 +10477,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10084,7 +10608,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10097,22 +10627,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10137,22 +10680,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10401,23 +10994,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11231,7 +11896,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -12027,7 +12692,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12884,22 +13557,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12925,22 +13611,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: - }; - _LT_EOF - -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -13815,6 +14572,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -13850,7 +14608,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -14476,6 +15246,7 @@ fi - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -14891,7 +15726,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15350,6 +16185,7 @@ fi - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi - compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' - GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' - archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har - hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' - inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' - link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' - always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' - exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' - file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' - compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ - reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19773,12 +20659,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -199,7 +205,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -746,15 +752,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_XSI_SHELLFNS -+ _LT_PROG_REPLACE_SHELLFNS - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -980,6 +983,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - -@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - - AC_MSG_CHECKING([how to print strings]) - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_libtool_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2342,7 +2483,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2950,6 +3091,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -3167,6 +3314,21 @@ tpf*) - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3403,8 +3630,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t at _DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t at _DLSYM_CONST -+#else -+# define LT@&t at _DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3484,7 +3724,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t at _DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3551,6 +3791,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4529,8 +4801,8 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4548,8 +4820,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4595,8 +4867,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4726,7 +4998,7 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else -@@ -4737,7 +5009,7 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4852,7 +5167,7 @@ _LT_EOF - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -4876,10 +5191,10 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4926,16 +5241,31 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { - }; - _LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6586,6 +7008,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF --esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,10 +1,9 @@ --# Generated from ltmain.m4sh. - --# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -38,7 +37,6 @@ - # -n, --dry-run display commands without modifying any files - # --features display basic configuration information and exit - # --mode=MODE use operation mode MODE --# --no-finish let install mode avoid finish commands - # --preserve-dup-deps don't remove duplicate dependency libraries - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent -@@ -71,17 +69,19 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# $progname: (GNU libtool) 2.4 - # automake: $automake_version - # autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.7a --TIMESTAMP=" 1.3134 2009-11-29" --package_revision=1.3134 -+VERSION=2.4 -+TIMESTAMP="" -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -106,9 +106,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -121,15 +118,13 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -- -- -- -- -- - # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh - # is ksh but when the shell is invoked as "sh" and the current value of - # the _XPG environment variable is not equal to 1 (one), the special -@@ -140,7 +135,7 @@ progpath="$0" - - - : ${CP="cp -f"} --: ${ECHO=$as_echo} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -149,7 +144,7 @@ progpath="$0" - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -169,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -183,17 +199,31 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation - --# Generated shell functions inserted here. - - # These SED scripts presuppose an absolute path with a trailing slash. - pathcar='s,^/\([^/]*\).*$,\1,' -@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -404,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -430,14 +469,14 @@ func_echo_all () - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -656,19 +695,35 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -+ $opt_debug -+ - $SED -n '/(C)/!b go - :more - /\./!{ - N -- s/\n# // -+ s/\n# / / - b more - } - :go -@@ -685,7 +740,9 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/^# *-h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ -@@ -701,7 +758,10 @@ func_usage () - # unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -714,7 +774,11 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret -@@ -726,12 +790,39 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: - - - -@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_finish=: --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -850,130 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac -+ -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- --no-finish) opt_finish=false ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- opt_verbose=false -+ opt_preserve_dup_deps=: - ;; -- -- --no-quiet|--no-silent) -- preserve_args="$preserve_args $opt" -- opt_silent=false -+ --features) -+ opt_features=: -+func_features - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -- opt_verbose=: -+func_append preserve_args " $opt" - ;; -- -- --no-verbose) preserve_args="$preserve_args $opt" -+ --no-verbose) - opt_verbose=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --help-all) opt_help=': help-all' ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -@@ -981,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval "std_shrext=\"$shrext_cmds\"" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1149,7 +1311,7 @@ func_execute_cmds () - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1172,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1184,8 +1377,7 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1204,8 +1396,7 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1274,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1314,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1340,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1364,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1496,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval "srcfile=\"$fix_srcfile_path\"" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1526,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1573,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1622,13 +2290,13 @@ compiler." - } - - $opt_help || { -- test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -@@ -1819,13 +2487,13 @@ if $opt_help; then - else - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done -@@ -1854,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1882,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1907,10 +2578,10 @@ func_mode_execute () - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. -- if eval test -z \"\$$shlibpath_var\"; then -- eval $shlibpath_var=\$dir -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" - else -- eval $shlibpath_var=\$dir:\$$shlibpath_var -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - -@@ -1939,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1972,22 +2642,59 @@ func_mode_execute () - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi - -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1997,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -2006,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval "flag=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2077,7 +2786,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; -@@ -2097,7 +2806,7 @@ func_mode_install () - do - arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -2135,11 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi -- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2151,7 +2860,7 @@ func_mode_install () - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" -- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - -@@ -2209,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2226,23 +2938,30 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2315,7 +3034,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2503,7 +3222,7 @@ func_mode_install () - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - -- if test -n "$current_libdirs" && $opt_finish; then -+ if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -@@ -2512,7 +3231,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2559,6 +3278,18 @@ extern \"C\" { - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2570,21 +3301,22 @@ extern \"C\" { - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { -- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - -@@ -2593,23 +3325,23 @@ extern \"C\" { - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols -- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$export_symbols" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { -- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" -- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$nlist" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } -@@ -2620,10 +3352,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- $ECHO ": $name " >> "$nlist" -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2661,26 +3435,9 @@ typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- echo >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2796,9 +3553,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- win32_nmres=`$NM -f posix -A "$1" | -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2827,6 +3586,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2917,7 +3801,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +3816,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -@@ -3014,7 +3898,110 @@ func_fallback_echo () - _LTECHO_EOF' - } - ECHO=\"$qECHO\" -- fi\ -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -@@ -3078,7 +4065,7 @@ _LTECHO_EOF' - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" -@@ -3102,6 +4089,18 @@ _LTECHO_EOF' - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -3116,35 +4115,10 @@ _LTECHO_EOF' - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -@@ -3158,166 +4132,6 @@ fi\ - } - - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_result=`cygpath -w "$1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result= -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -- --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_pathlist_tmp1=$func_stripname_result -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- func_to_host_pathlist_result=` -- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_append func_to_host_pathlist_result ";$func_to_host_path_result" -- fi -- fi -- fi -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result"; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_append func_to_host_pathlist_result ";" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -- - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout - # Must ONLY be called from within func_mode_link because -@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined LT_DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); - void lt_update_exe_path (const char *name, const char *value); -@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); - EOF - - cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3706,7 +4529,9 @@ EOF - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3728,7 +4553,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3762,8 +4587,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3780,8 +4605,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4222,7 +5078,7 @@ EOF - func_win32_import_lib_p () - { - $opt_debug -- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -@@ -4401,9 +5257,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4427,7 +5283,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4446,7 +5302,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4475,7 +5331,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4487,7 +5343,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4557,12 +5413,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4574,28 +5430,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4686,15 +5542,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4706,10 +5563,16 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in -@@ -4718,12 +5581,12 @@ func_mode_link () - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4747,7 +5610,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4758,9 +5621,6 @@ func_mode_link () - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -- *-*-linux*) -- test "X$arg" = "X-lc" && continue -- ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -@@ -4770,7 +5630,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4782,8 +5642,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4791,12 +5651,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4863,13 +5723,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4922,8 +5786,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4938,9 +5802,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4968,24 +5832,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4997,7 +5864,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -5028,7 +5895,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -5040,7 +5907,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -5085,24 +5952,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -5127,7 +5995,7 @@ func_mode_link () - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval "arg=\"$export_dynamic_flag_spec\"" -+ eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi -@@ -5144,11 +6012,13 @@ func_mode_link () - else - shlib_search_path= - fi -- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" -- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -5169,12 +6039,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -5187,9 +6057,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5256,8 +6126,9 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library -@@ -5267,7 +6138,7 @@ func_mode_link () - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5288,11 +6159,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5377,7 +6248,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5390,7 +6261,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5404,7 +6276,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5415,17 +6288,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5488,11 +6365,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5538,7 +6415,7 @@ func_mode_link () - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -@@ -5546,8 +6423,8 @@ func_mode_link () - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5558,20 +6435,20 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv -@@ -5579,9 +6456,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5598,9 +6481,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5622,14 +6505,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5637,12 +6520,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5653,20 +6536,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5684,7 +6593,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5697,7 +6606,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5708,12 +6618,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5728,7 +6638,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5740,7 +6650,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5749,7 +6659,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5774,12 +6684,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5814,7 +6724,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5823,7 +6733,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5835,7 +6745,7 @@ func_mode_link () - shift - realname="$1" - shift -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" -@@ -5848,7 +6758,7 @@ func_mode_link () - versuffix="-$major" - ;; - esac -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -5877,7 +6787,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5933,7 +6843,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5955,7 +6865,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5969,13 +6879,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5989,7 +6899,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6001,12 +6911,12 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6083,27 +6993,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -6113,8 +7029,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -6130,7 +7048,7 @@ func_mode_link () - case $host in - *-*-darwin*) - depdepl= -- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp -@@ -6141,8 +7059,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -6152,7 +7070,7 @@ func_mode_link () - ;; - esac - else -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -@@ -6192,7 +7110,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6205,7 +7123,7 @@ func_mode_link () - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -- eval tmp_libs=\$$var -+ eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so -@@ -6250,13 +7168,13 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done -- eval $var=\$tmp_libs -+ eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs -@@ -6269,7 +7187,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6310,7 +7228,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6319,8 +7237,8 @@ func_mode_link () - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ -@@ -6330,8 +7248,8 @@ func_mode_link () - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result -@@ -6346,7 +7264,7 @@ func_mode_link () - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6544,7 +7462,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6612,10 +7530,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6631,7 +7549,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6642,7 +7560,7 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -@@ -6659,10 +7577,11 @@ func_mode_link () - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6676,7 +7595,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6686,7 +7605,7 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - -@@ -6698,7 +7617,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6715,7 +7634,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6764,18 +7683,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6789,7 +7708,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6807,18 +7726,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6840,7 +7759,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6857,15 +7776,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6885,10 +7816,10 @@ EOF - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6913,7 +7844,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6929,20 +7860,20 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6967,7 +7898,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7071,7 +8002,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7081,10 +8012,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -7101,10 +8032,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -7113,18 +8046,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- dep_rpath="$dep_rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -7133,40 +8066,38 @@ EOF - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done -- eval $runpath_var=\$rpath\$$runpath_var -- export $runpath_var -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then -- eval $shlibpath_var=\$shlibpath\$$shlibpath_var -- export $shlibpath_var -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. -- eval "shared_ext=\"$shrext_cmds\"" -- eval "library_names=\"$library_names_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -7178,7 +8109,7 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -@@ -7189,7 +8120,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7220,13 +8151,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7248,7 +8211,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7260,7 +8223,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7270,7 +8233,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7286,43 +8249,43 @@ EOF - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval "flag=\"$thread_safe_flag_spec\"" -- linker_flags="$linker_flags $flag" -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval "test_cmds=\"$module_expsym_cmds\"" -+ eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else -- eval "test_cmds=\"$module_cmds\"" -+ eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval "test_cmds=\"$archive_expsym_cmds\"" -+ eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else -- eval "test_cmds=\"$archive_cmds\"" -+ eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi -@@ -7366,10 +8329,13 @@ EOF - echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output -- delfiles="$delfiles $output" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7383,15 +8349,17 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext -- eval "test_cmds=\"$reload_cmds\"" -+ eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -7411,12 +8379,12 @@ EOF - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist -- eval "concat_cmds=\"$reload_cmds\"" -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 -@@ -7433,11 +8401,11 @@ EOF - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7450,9 +8418,9 @@ EOF - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - -@@ -7471,7 +8439,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7492,7 +8460,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7504,7 +8472,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7515,7 +8483,7 @@ EOF - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the -@@ -7539,23 +8507,23 @@ EOF - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. -- eval "cmds=\"\$cmds~\$RM $delfiles\"" -+ eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" -@@ -7564,7 +8532,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7576,8 +8544,8 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -@@ -7656,17 +8624,20 @@ EOF - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -@@ -7690,7 +8661,7 @@ EOF - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || echo timestamp > $libobj || exit $? -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - -@@ -7740,8 +8711,8 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi -@@ -7761,7 +8732,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7771,17 +8742,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7789,7 +8760,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7808,18 +8779,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7828,12 +8799,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7842,7 +8813,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - -@@ -7859,18 +8830,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7878,7 +8849,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - -@@ -7921,6 +8892,12 @@ EOF - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7943,7 +8920,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7951,7 +8928,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7966,6 +8943,13 @@ EOF - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7999,6 +8983,12 @@ EOF - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -8096,7 +9086,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -8104,10 +9094,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -8118,10 +9108,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -8139,7 +9129,7 @@ EOF - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -8163,18 +9153,28 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -- eval "cmds=\"$old_archive_cmds\"" -+ eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8189,7 +9189,7 @@ EOF - do - last_oldobj=$obj - done -- eval "test_cmds=\"$old_archive_cmds\"" -+ eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -8208,7 +9208,7 @@ EOF - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi -@@ -8216,9 +9216,9 @@ EOF - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then -- eval "cmds=\"\$concat_cmds\"" -+ eval cmds=\"\$concat_cmds\" - else -- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi -@@ -8268,12 +9268,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8284,12 +9295,14 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8303,10 +9316,11 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8318,7 +9332,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8327,7 +9341,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi -@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8432,9 +9446,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8443,24 +9457,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8486,18 +9499,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8525,19 +9537,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8547,7 +9559,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8556,7 +9568,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8564,12 +9576,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8577,7 +9589,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8589,16 +9600,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" ---- a/ltoptions.m4 -+++ b/ltoptions.m4 -@@ -8,7 +8,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ---- a/ltversion.m4 -+++ b/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3134 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.7a]) --m4_define([LT_PACKAGE_REVISION], [1.3134]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.7a' --macro_revision='1.3134' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 -@@ -7,7 +7,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -680,6 +680,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -798,6 +801,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5403,8 +5409,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6518,6 +6604,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6610,6 +6868,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6972,8 +7290,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7061,7 +7392,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7136,6 +7467,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7157,6 +7496,47 @@ fi - - - -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7363,6 +7743,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8091,7 +8590,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8180,7 +8680,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9181,7 +9694,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9299,8 +9813,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9318,8 +9832,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9365,8 +9879,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9496,7 +10010,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9509,22 +10029,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9549,22 +10082,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9813,23 +10396,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10643,7 +11298,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11439,7 +12094,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then - # since libbfd may not pull in the entirety of libiberty. - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14979,12 +15684,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -170,7 +170,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/zlib/configure -+++ b/zlib/configure -@@ -646,8 +646,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -774,6 +777,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_host_shared - ' -@@ -1428,6 +1432,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -4147,8 +4153,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5054,6 +5060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5070,6 +5150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5238,7 +5323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -5392,6 +5478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5484,6 +5743,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -5846,8 +6165,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -5935,7 +6267,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6010,6 +6342,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -6031,6 +6375,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -6241,6 +6621,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7269,7 +7768,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7358,7 +7858,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8359,7 +8872,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -8477,8 +8991,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -8496,8 +9010,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8543,8 +9057,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8674,7 +9188,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -8997,26 +9580,39 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- if test x$gcc_no_link = xyes; then -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -9830,7 +10485,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -10644,7 +11299,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -13322,12 +14027,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch new file mode 100644 index 0000000..8290602 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -0,0 +1,7118 @@ +From c0ec70962bffb56b563475f539e8175ea97d7eb1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH 07/15] Use libtool 2.4 + +get libtool sysroot support + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + bfd/configure.ac | 2 +- + libtool.m4 | 1080 +++++++++++------ + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- + ltoptions.m4 | 2 +- + ltversion.m4 | 12 +- + lt~obsolete.m4 | 2 +- + 6 files changed, 2717 insertions(+), 1306 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -296,7 +296,7 @@ changequote(,)dnl + x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` + changequote([,])dnl + if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" + fi + + case "${host}" in +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -199,7 +205,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -746,15 +752,12 @@ _LT_EOF + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -980,6 +983,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + +@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + + AC_MSG_CHECKING([how to print strings]) + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) + ])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1623,7 +1705,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1667,10 +1749,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2342,7 +2483,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -2950,6 +3091,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -3016,7 +3162,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -3167,6 +3314,21 @@ tpf*) + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + + # LT_LIB_M + # -------- +@@ -3403,8 +3630,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3473,6 +3701,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t at _DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t at _DLSYM_CONST ++#else ++# define LT@&t at _DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3484,7 +3724,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t at _DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3551,6 +3791,13 @@ else + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4172,9 +4432,11 @@ case $host_os in + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + + # + # Check to make sure the PIC flag actually works. +@@ -4193,6 +4455,8 @@ fi + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. +@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4411,7 +4682,8 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4510,12 +4782,12 @@ _LT_EOF + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4529,8 +4801,8 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4548,8 +4820,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4595,8 +4867,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4726,7 +4998,7 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else +@@ -4737,7 +5009,7 @@ _LT_EOF + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -4781,20 +5053,63 @@ _LT_EOF + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4828,7 +5143,7 @@ _LT_EOF + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4836,7 +5151,7 @@ _LT_EOF + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4852,7 +5167,7 @@ _LT_EOF + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -4876,10 +5191,10 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4926,16 +5241,31 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -5020,7 +5350,7 @@ _LT_EOF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +@@ -5039,9 +5369,9 @@ _LT_EOF + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6445,6 +6825,29 @@ AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6453,6 +6856,7 @@ AC_LANG_POP + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6503,6 +6907,13 @@ public class foo { + }; + _LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6586,6 +7008,7 @@ else + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6622,7 +7045,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP +@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6992,7 +7423,8 @@ fi + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + +@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -7042,7 +7476,8 @@ fi + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; +- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh. + +-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -38,7 +37,6 @@ + # -n, --dry-run display commands without modifying any files + # --features display basic configuration information and exit + # --mode=MODE use operation mode MODE +-# --no-finish let install mode avoid finish commands + # --preserve-dup-deps don't remove duplicate dependency libraries + # --quiet, --silent don't print informational messages + # --no-quiet, --no-silent +@@ -71,17 +69,19 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -106,9 +106,6 @@ _LTECHO_EOF' + } + + # NLS nuisances: We save the old values to restore during execute mode. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). + lt_user_locale= + lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +@@ -121,15 +118,13 @@ do + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done ++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL + + $lt_unset CDPATH + + +- +- +- +- +- + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special +@@ -140,7 +135,7 @@ progpath="$0" + + + : ${CP="cp -f"} +-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} + : ${EGREP="/bin/grep -E"} + : ${FGREP="/bin/grep -F"} + : ${GREP="/bin/grep"} +@@ -149,7 +144,7 @@ progpath="$0" + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -169,6 +164,27 @@ IFS=" $lt_nl" + dirname="s,/[^/]*$,," + basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: +@@ -183,17 +199,31 @@ basename="s,^.*/,," + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + +-# Generated shell functions inserted here. + + # These SED scripts presuppose an absolute path with a trailing slash. + pathcar='s,^/\([^/]*\).*$,\1,' +@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ + # Re-`\' parameter expansions in output of double_quote_subst that were + # `\'-ed in input to the same. If an odd number of `\' preceded a '$' + # in input to double_quote_subst, that '$' was protected from expansion. +@@ -404,7 +443,7 @@ opt_warning=: + # name if it has been set yet. + func_echo () + { +- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + } + + # func_verbose arg... +@@ -430,14 +469,14 @@ func_echo_all () + # Echo program name prefixed message to standard error. + func_error () + { +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + } + + # func_warning arg... + # Echo program name prefixed warning message to standard error. + func_warning () + { +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +@@ -656,19 +695,35 @@ func_show_eval_locale () + fi + } + +- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} + + + # func_version + # Echo version message to standard output and exit. + func_version () + { ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ + N +- s/\n# // ++ s/\n# / / + b more + } + :go +@@ -685,7 +740,9 @@ func_version () + # Echo short help message to standard output and exit. + func_usage () + { +- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ +@@ -701,7 +758,10 @@ func_usage () + # unless 'noexit' is passed as argument. + func_help () + { ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* +@@ -714,7 +774,11 @@ func_help () + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p +- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret +@@ -726,12 +790,39 @@ func_help () + # exit_cmd. + func_missing_arg () + { +- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1." + exit_cmd=exit + } + +-exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + +@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" + magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-# $mode is unset + nonopt= +-execute_dlfiles= + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + extracted_archives= + extracted_serial=0 + +-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +- + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ + # func_fatal_configuration arg... + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. +@@ -850,130 +979,204 @@ func_enable_tag () + esac + } + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () + { ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift +- + case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" +- opt_debug='set -x' + $opt_debug + ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; +- + --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=: + ;; +- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false +- opt_verbose=: ++func_append preserve_args " $opt" + ;; +- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) +@@ -981,82 +1184,44 @@ func_enable_tag () + opt_duplicate_compiler_generated_deps=: + ;; + *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + +- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + +- # Darwin sucks +- eval "std_shrext=\"$shrext_cmds\"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} + ++## ----------- ## ++## Main. ## ++## ----------- ## + + # func_lalib_p file + # True iff FILE is a libtool `.la' library or `.lo' object file. +@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () + # temporary ltwrapper_script. + func_ltwrapper_scriptname () + { +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + } + + # func_ltwrapper_p file +@@ -1149,7 +1311,7 @@ func_execute_cmds () + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1172,6 +1334,37 @@ func_source () + } + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ + # func_infer_tag arg + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. +@@ -1184,8 +1377,7 @@ func_infer_tag () + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1204,8 +1396,7 @@ func_infer_tag () + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1274,6 +1465,486 @@ EOF + } + } + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +@@ -1314,12 +1985,12 @@ func_mode_compile () + ;; + + -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" ++ func_append later " $arg" + continue + ;; + +@@ -1340,15 +2011,14 @@ func_mode_compile () + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + +@@ -1364,8 +2034,7 @@ func_mode_compile () + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in +@@ -1496,17 +2165,16 @@ compiler." + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + +- if test -n "$fix_srcfile_path"; then +- eval "srcfile=\"$fix_srcfile_path\"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + +@@ -1526,7 +2194,7 @@ compiler." + + if test -z "$output_obj"; then + # Place PIC objects in $objdir +- command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ +@@ -1573,11 +2241,11 @@ compiler." + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then +- command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. +- command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +@@ -1622,13 +2290,13 @@ compiler." + } + + $opt_help || { +- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + } + + func_mode_help () + { + # We need to display help for each of the modes. +- case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." + ;; + + *) +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + +@@ -1819,13 +2487,13 @@ if $opt_help; then + else + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done +@@ -1854,13 +2522,16 @@ func_mode_execute () + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" +@@ -1882,7 +2553,7 @@ func_mode_execute () + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +@@ -1907,10 +2578,10 @@ func_mode_execute () + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. +- if eval test -z \"\$$shlibpath_var\"; then +- eval $shlibpath_var=\$dir ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" + else +- eval $shlibpath_var=\$dir:\$$shlibpath_var ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + +@@ -1939,8 +2610,7 @@ func_mode_execute () + ;; + esac + # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then +@@ -1972,22 +2642,59 @@ func_mode_execute () + fi + } + +-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { + $opt_debug +- libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +@@ -1997,7 +2704,7 @@ func_mode_finish () + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done +@@ -2006,53 +2713,55 @@ func_mode_finish () + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag=\"$hardcode_libdir_flag_spec\"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + +- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS + } + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... +@@ -2077,7 +2786,7 @@ func_mode_install () + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +@@ -2097,7 +2806,7 @@ func_mode_install () + do + arg2= + if test -n "$dest"; then +- files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi +@@ -2135,11 +2844,11 @@ func_mode_install () + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi +- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +@@ -2151,7 +2860,7 @@ func_mode_install () + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" +- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +@@ -2209,10 +2918,13 @@ func_mode_install () + case $file in + *.$libext) + # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" +@@ -2226,23 +2938,30 @@ func_mode_install () + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" +- dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +@@ -2315,7 +3034,7 @@ func_mode_install () + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) +@@ -2503,7 +3222,7 @@ func_mode_install () + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + +- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +@@ -2512,7 +3231,7 @@ func_mode_install () + fi + } + +-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -2559,6 +3278,18 @@ extern \"C\" { + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + /* External symbol declarations for the compiler. */\ + " + +@@ -2570,21 +3301,22 @@ extern \"C\" { + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { +- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + +@@ -2593,23 +3325,23 @@ extern \"C\" { + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols +- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { +- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } +@@ -2620,10 +3352,52 @@ extern \"C\" { + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" +- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { +@@ -2661,26 +3435,9 @@ typedef struct { + const char *name; + void *address; + } lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = + {\ + { \"$my_originator\", (void *) 0 }," +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + +@@ -2796,9 +3553,11 @@ func_win32_libid () + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static +- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ +@@ -2827,6 +3586,131 @@ func_win32_libid () + $ECHO "$win32_libid_type" + } + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + + # func_extract_an_archive dir oldlib +@@ -2917,7 +3801,7 @@ func_extract_archives () + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ +@@ -2932,7 +3816,7 @@ func_extract_archives () + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +@@ -3014,7 +3898,110 @@ func_fallback_echo () + _LTECHO_EOF' + } + ECHO=\"$qECHO\" +- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=\$0 ++ shift ++ for lt_opt ++ do ++ case \"\$lt_opt\" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` ++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. ++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` ++ cat \"\$lt_dump_D/\$lt_dump_F\" ++ exit 0 ++ ;; ++ --lt-*) ++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n \"\$lt_option_debug\"; then ++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from \$@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case \$lt_wr_arg in ++ --lt-*) ;; ++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core \${1+\"\$@\"} ++} ++ ++ # Parse options ++ func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` +@@ -3078,7 +4065,7 @@ _LTECHO_EOF' + + # relink executable if necessary + if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" +@@ -3102,6 +4089,18 @@ _LTECHO_EOF' + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ +@@ -3116,35 +4115,10 @@ _LTECHO_EOF' + " + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 ++ func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. +@@ -3158,166 +4132,6 @@ fi\ + } + + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +- + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout + # Must ONLY be called from within func_mode_link because +@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. + */ + EOF + cat <<"EOF" +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1; + #else +-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0; + #endif + +-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + + void *xmalloc (size_t num); + char *xstrdup (const char *string); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); + int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s); + void lt_setenv (const char *name, const char *value); + char *lt_extend_str (const char *orig_value, const char *add, int to_end); + void lt_update_exe_path (const char *name, const char *value); +@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); + EOF + + cat <"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero)); + for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i])); + } + + EOF +@@ -3706,7 +4529,9 @@ EOF + if (rval == -1) + { + /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target \"%s\": %s\n", ++ lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +@@ -3728,7 +4553,7 @@ xmalloc (size_t num) + { + void *p = (void *) malloc (num); + if (!p) +- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted"); + + return p; + } +@@ -3762,8 +4587,8 @@ check_executable (const char *path) + { + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3780,8 +4605,8 @@ make_executable (const char *path) + int rval = 0; + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) + int tmp_len; + char *concat_name; + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; +@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); +@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) +@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) + } + else + { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file \"%s\": %s", ++ tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); +@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { +- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); + #endif +@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) + return str; + } + ++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++ + static void +-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode, + const char *message, va_list ap) + { +- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, + } + + void +-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...) + { + va_list ap; + va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); + } + ++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++ + void + lt_setenv (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value)); + { + #ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) + void + lt_update_exe_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) + void + lt_update_lib_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4222,7 +5078,7 @@ EOF + func_win32_import_lib_p () + { + $opt_debug +- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +@@ -4401,9 +5257,9 @@ func_mode_link () + ;; + *) + if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg" + else +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg" + fi + prev= + continue +@@ -4427,7 +5283,7 @@ func_mode_link () + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; +@@ -4446,7 +5302,7 @@ func_mode_link () + moreargs= + for fil in `cat "$save_arg"` + do +-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + +@@ -4475,7 +5331,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -4487,7 +5343,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -4557,12 +5413,12 @@ func_mode_link () + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;; + esac + fi + prev= +@@ -4574,28 +5430,28 @@ func_mode_link () + continue + ;; + weak) +- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) +- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" +@@ -4686,15 +5542,16 @@ func_mode_link () + ;; + + -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -4706,10 +5563,16 @@ func_mode_link () + ;; + esac + case "$deplibs " in +- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;; + *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir" + ;; + esac + case $host in +@@ -4718,12 +5581,12 @@ func_mode_link () + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -4747,7 +5610,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) +@@ -4758,9 +5621,6 @@ func_mode_link () + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; +- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -4770,7 +5630,7 @@ func_mode_link () + ;; + esac + fi +- deplibs="$deplibs $arg" ++ func_append deplibs " $arg" + continue + ;; + +@@ -4782,8 +5642,8 @@ func_mode_link () + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler +@@ -4791,12 +5651,12 @@ func_mode_link () + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; +@@ -4863,13 +5723,17 @@ func_mode_link () + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + continue + ;; +@@ -4922,8 +5786,8 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4938,9 +5802,9 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4968,24 +5832,27 @@ func_mode_link () + arg="$func_quote_for_eval_result" + ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + continue + ;; + +@@ -4997,7 +5864,7 @@ func_mode_link () + + *.$objext) + # A standard object. +- objs="$objs $arg" ++ func_append objs " $arg" + ;; + + *.lo) +@@ -5028,7 +5895,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -5040,7 +5907,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -5085,24 +5952,25 @@ func_mode_link () + + *.$libext) + # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + ++ func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else +- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; +@@ -5127,7 +5995,7 @@ func_mode_link () + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval "arg=\"$export_dynamic_flag_spec\"" ++ eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi +@@ -5144,11 +6012,13 @@ func_mode_link () + else + shlib_search_path= + fi +- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" +- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" ++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + +@@ -5169,12 +6039,12 @@ func_mode_link () + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- libs="$libs $deplib" ++ func_append libs " $deplib" + done + + if test "$linkmode" = lib; then +@@ -5187,9 +6057,9 @@ func_mode_link () + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac +- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= +@@ -5256,8 +6126,9 @@ func_mode_link () + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= ++ func_resolve_sysroot "$lib" + case $lib in +- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library +@@ -5267,7 +6138,7 @@ func_mode_link () + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;; + esac + done + done +@@ -5288,11 +6159,11 @@ func_mode_link () + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5377,7 +6248,7 @@ func_mode_link () + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5390,7 +6261,8 @@ func_mode_link () + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then +@@ -5404,7 +6276,8 @@ func_mode_link () + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" +@@ -5415,17 +6288,21 @@ func_mode_link () + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; +- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" +@@ -5488,11 +6365,11 @@ func_mode_link () + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib" + fi + fi + continue +@@ -5538,7 +6415,7 @@ func_mode_link () + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi +@@ -5546,8 +6423,8 @@ func_mode_link () + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then +@@ -5558,20 +6435,20 @@ func_mode_link () + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv +@@ -5579,9 +6456,15 @@ func_mode_link () + + # Get the name of the library we link against. + linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi +@@ -5598,9 +6481,9 @@ func_mode_link () + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs" + else +- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen +@@ -5622,14 +6505,14 @@ func_mode_link () + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -5637,12 +6520,12 @@ func_mode_link () + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" +@@ -5653,20 +6536,46 @@ func_mode_link () + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then +@@ -5684,7 +6593,7 @@ func_mode_link () + + + if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no +@@ -5697,7 +6606,8 @@ func_mode_link () + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? +@@ -5708,12 +6618,12 @@ func_mode_link () + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... +@@ -5728,7 +6638,7 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;; + esac + fi + +@@ -5740,7 +6650,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5749,7 +6659,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5774,12 +6684,12 @@ func_mode_link () + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; +@@ -5814,7 +6724,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5823,7 +6733,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5835,7 +6745,7 @@ func_mode_link () + shift + realname="$1" + shift +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" +@@ -5848,7 +6758,7 @@ func_mode_link () + versuffix="-$major" + ;; + esac +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -5877,7 +6787,7 @@ func_mode_link () + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= +@@ -5933,7 +6843,7 @@ func_mode_link () + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -5955,7 +6865,7 @@ func_mode_link () + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then +@@ -5969,13 +6879,13 @@ func_mode_link () + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + +- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= +@@ -5989,7 +6899,7 @@ func_mode_link () + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +@@ -6001,12 +6911,12 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -6083,27 +6993,33 @@ func_mode_link () + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";; + esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + +- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then +@@ -6113,8 +7029,10 @@ func_mode_link () + case $deplib in + -L*) path="$deplib" ;; + *.la) ++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +@@ -6130,7 +7048,7 @@ func_mode_link () + case $host in + *-*-darwin*) + depdepl= +- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp +@@ -6141,8 +7059,8 @@ func_mode_link () + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi +@@ -6152,7 +7070,7 @@ func_mode_link () + ;; + esac + else +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +@@ -6192,7 +7110,7 @@ func_mode_link () + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= +@@ -6205,7 +7123,7 @@ func_mode_link () + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +- eval tmp_libs=\$$var ++ eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so +@@ -6250,13 +7168,13 @@ func_mode_link () + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + done +- eval $var=\$tmp_libs ++ eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs +@@ -6269,7 +7187,7 @@ func_mode_link () + ;; + esac + if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs +@@ -6310,7 +7228,7 @@ func_mode_link () + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" +- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs" + ;; + + lib) +@@ -6319,8 +7237,8 @@ func_mode_link () + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ +@@ -6330,8 +7248,8 @@ func_mode_link () + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result +@@ -6346,7 +7264,7 @@ func_mode_link () + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" ++ func_append libobjs " $objs" + fi + fi + +@@ -6544,7 +7462,7 @@ func_mode_link () + done + + # Make executables depend on our current version. +- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0" + ;; + + qnx) +@@ -6612,10 +7530,10 @@ func_mode_link () + fi + + func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + +- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -6631,7 +7549,7 @@ func_mode_link () + continue + fi + fi +- removelist="$removelist $p" ++ func_append removelist " $p" + ;; + *) ;; + esac +@@ -6642,7 +7560,7 @@ func_mode_link () + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` +@@ -6659,10 +7577,11 @@ func_mode_link () + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +@@ -6676,7 +7595,7 @@ func_mode_link () + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;; + esac + done + +@@ -6686,7 +7605,7 @@ func_mode_link () + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;; + esac + done + +@@ -6698,7 +7617,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. +@@ -6715,7 +7634,7 @@ func_mode_link () + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" ++ func_append deplibs " -lc" + fi + ;; + esac +@@ -6764,18 +7683,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6789,7 +7708,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6807,18 +7726,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6840,7 +7759,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6857,15 +7776,27 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | +@@ -6885,10 +7816,10 @@ EOF + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6913,7 +7844,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -6929,20 +7860,20 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6967,7 +7898,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -7071,7 +8002,7 @@ EOF + *) + case " $deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7081,10 +8012,10 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" +@@ -7101,10 +8032,12 @@ EOF + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -7113,18 +8046,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- dep_rpath="$dep_rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done +@@ -7133,40 +8066,38 @@ EOF + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else +- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done +- eval $runpath_var=\$rpath\$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then +- eval $shlibpath_var=\$shlibpath\$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. +- eval "shared_ext=\"$shrext_cmds\"" +- eval "library_names=\"$library_names_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -7178,7 +8109,7 @@ EOF + linknames= + for link + do +- linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic +@@ -7189,7 +8120,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= +@@ -7220,13 +8151,45 @@ EOF + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. +@@ -7248,7 +8211,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +@@ -7260,7 +8223,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7270,7 +8233,7 @@ EOF + case " $convenience " in + *" $test_deplib "*) ;; + *) +- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done +@@ -7286,43 +8249,43 @@ EOF + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval "flag=\"$thread_safe_flag_spec\"" +- linker_flags="$linker_flags $flag" ++ eval flag=\"$thread_safe_flag_spec\" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval "test_cmds=\"$module_expsym_cmds\"" ++ eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else +- eval "test_cmds=\"$module_cmds\"" ++ eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval "test_cmds=\"$archive_expsym_cmds\"" ++ eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else +- eval "test_cmds=\"$archive_cmds\"" ++ eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi +@@ -7366,10 +8329,13 @@ EOF + echo 'INPUT (' > $output + for obj in $save_libobjs + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output +- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" +@@ -7383,15 +8349,17 @@ EOF + fi + for obj + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext +- eval "test_cmds=\"$reload_cmds\"" ++ eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -7411,12 +8379,12 @@ EOF + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist +- eval "concat_cmds=\"$reload_cmds\"" ++ eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 +@@ -7433,11 +8401,11 @@ EOF + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi +- delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= +@@ -7450,9 +8418,9 @@ EOF + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + +@@ -7471,7 +8439,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7492,7 +8460,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then +@@ -7504,7 +8472,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7515,7 +8483,7 @@ EOF + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the +@@ -7539,23 +8507,23 @@ EOF + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. +- eval "cmds=\"\$cmds~\$RM $delfiles\"" ++ eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" +@@ -7564,7 +8532,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7576,8 +8544,8 @@ EOF + IFS="$save_ifs" + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then +@@ -7656,17 +8624,20 @@ EOF + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +@@ -7690,7 +8661,7 @@ EOF + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + +@@ -7740,8 +8711,8 @@ EOF + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi +@@ -7761,7 +8732,7 @@ EOF + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7771,17 +8742,17 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -7789,7 +8760,7 @@ EOF + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi +@@ -7808,18 +8779,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in +@@ -7828,12 +8799,12 @@ EOF + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -7842,7 +8813,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + +@@ -7859,18 +8830,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done +@@ -7878,7 +8849,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + +@@ -7921,6 +8892,12 @@ EOF + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' +@@ -7943,7 +8920,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7951,7 +8928,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7966,6 +8943,13 @@ EOF + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -7999,6 +8983,12 @@ EOF + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + +@@ -8096,7 +9086,7 @@ EOF + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" +@@ -8104,10 +9094,10 @@ EOF + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. +@@ -8118,10 +9108,10 @@ EOF + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have +@@ -8139,7 +9129,7 @@ EOF + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= +@@ -8163,18 +9153,28 @@ EOF + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; +- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi +- eval "cmds=\"$old_archive_cmds\"" ++ eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." +@@ -8189,7 +9189,7 @@ EOF + do + last_oldobj=$obj + done +- eval "test_cmds=\"$old_archive_cmds\"" ++ eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -8208,7 +9208,7 @@ EOF + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi +@@ -8216,9 +9216,9 @@ EOF + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then +- eval "cmds=\"\$concat_cmds\"" ++ eval cmds=\"\$concat_cmds\" + else +- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi +@@ -8268,12 +9268,23 @@ EOF + *.la) + func_basename "$deplib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -8284,12 +9295,14 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; +- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" +@@ -8303,10 +9316,11 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +@@ -8318,7 +9332,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= +@@ -8327,7 +9341,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi +@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" + exit $EXIT_SUCCESS + } + +-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +@@ -8432,9 +9446,9 @@ func_mode_uninstall () + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + +@@ -8443,24 +9457,23 @@ func_mode_uninstall () + + rmdirs= + +- origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then +- objdir="$origobjdir" ++ odir="$objdir" + else +- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" +- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + +- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in +- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + +@@ -8486,18 +9499,17 @@ func_mode_uninstall () + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done +- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$mode" in ++ case "$opt_mode" in + clean) +- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; +- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then +@@ -8525,19 +9537,19 @@ func_mode_uninstall () + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then +- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then +- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) +@@ -8547,7 +9559,7 @@ func_mode_uninstall () + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe +- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. +@@ -8556,7 +9568,7 @@ func_mode_uninstall () + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename +@@ -8564,12 +9576,12 @@ func_mode_uninstall () + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then +- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then +- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi +@@ -8577,7 +9589,6 @@ func_mode_uninstall () + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done +- objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do +@@ -8589,16 +9600,16 @@ func_mode_uninstall () + exit $exit_status + } + +-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +-test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 79% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a19505..68fd4de 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,8 +1,8 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From 641c5596e4050e1563b667776753d820306e46c4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 -Subject: [PATCH] don't let the distro compiler point to the wrong installation - location +Subject: [PATCH 08/15] don't let the distro compiler point to the wrong + installation location Thanks to RP for helping find the source code causing the issue. @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. @@ -30,3 +30,6 @@ index 0be45b4ae8..4817616bb2 100644 install_to_libdir: all if test -n "${target_header_dir}"; then \ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 85% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc37..2b4a76a 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,7 +1,7 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From e6d77e2221a8ac68e8bfd00faa25b0a1a08a6a09 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 -Subject: [PATCH] warn for uses of system directories when cross linking +Subject: [PATCH 09/15] warn for uses of system directories when cross linking 2008-07-02 Joseph Myers @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index 811134a503..f8c17c19ae 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -15788,6 +15791,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; @@ -249,3 +267,6 @@ Signed-off-by: Khem Raj break; } } +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278..8629be4 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,7 +1,7 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From cdc493f4b3a6cea022bde290623452b80beef8ab Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 -Subject: [PATCH] Fix rpath in libtool when sysroot is enabled +Subject: [PATCH 10/15] Fix rpath in libtool when sysroot is enabled Enabling sysroot support in libtool exposed a bug where the final library had an RPATH encoded into it which still pointed to the @@ -47,3 +47,6 @@ index 70e856e065..11ee684ccc 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 77% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50db..3405bf5 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,7 +1,7 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From 00865a6d1f81cd1b0a85462572b8a76ca0aa1673 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 -Subject: [PATCH] Change default emulation for mips64*-*-linux +Subject: [PATCH 11/15] Change default emulation for mips64*-*-linux we change the default emulations to be N64 instead of N32 @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,27 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 81% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752..29ec1fe 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,7 +1,7 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From cf8662ab2b10440ea1ed2b15bdd10bbbbb0b8f6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 -Subject: [PATCH] Add support for Netlogic XLP +Subject: [PATCH 12/15] Add support for Netlogic XLP Patch From: Nebu Philips @@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle binutils/readelf.c | 1 + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ + gas/configure.ac | 3 +++ include/elf/mips.h | 1 + include/opcode/mips.h | 6 ++++++ ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 14 files changed, 62 insertions(+), 21 deletions(-) + 15 files changed, 65 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..59d6d11215 100755 --- a/gas/configure +++ b/gas/configure -@@ -13377,6 +13377,9 @@ _ACEOF +@@ -12722,6 +12722,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) -+ mips_cpu=xlp -+ ;; ++ mips_cpu=xlp ++ ;; mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/gas/configure.ac b/gas/configure.ac +index 6f32e55a1a..11c2e0d273 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -325,6 +325,9 @@ changequote([,])dnl + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 + ;; ++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;; + mipstx39 | mipstx39el) + mips_cpu=r3900 + ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, @@ -360,3 +404,6 @@ Signed-off-by: Mark Hatle {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 85% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763..34a4a35 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,7 +1,7 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From b725402a441fced8a7312327a9ad4b0b2b880b3b Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 -Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic +Subject: [PATCH 13/15] fix the incorrect assembling for ppc wait mnemonic Signed-off-by: Zhenhua Luo @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { @@ -31,3 +31,6 @@ index b56fe3e21a..696fe83a7b 100644 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b050..6929545 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,7 +1,7 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 0797e96beb297845934719b7b04b1d594b9b0adc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 -Subject: [PATCH] Detect 64-bit MIPS targets +Subject: [PATCH 14/15] Detect 64-bit MIPS targets Add mips64 target triplets and default to N64 @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) @@ -45,3 +45,6 @@ index 3e066edaa8..caf130ceda 100644 mips*-*-*) targ_obj=mips targ_machine=EM_MIPS +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61..0000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 95% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d..e637d2a 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,7 +1,7 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From 50209f5240ea8728203a00a13e5af6dcf614328e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 -Subject: [PATCH] sync with OE libtool changes +Subject: [PATCH 15/15] sync with OE libtool changes Apply these patches from our libtool patches as not only are redundant RPATHs a waste of space but they can cause incorrect linking when native packages are @@ -84,3 +84,6 @@ index 11ee684ccc..3b19ac1532 100644 fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 91% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf7..bfc9346 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -49,9 +49,9 @@ do_install_class-native () { # Split out libbfd-*.so so including perf doesn't include extra stuff PACKAGE_BEFORE_PN += "libbfd" -FILES_libbfd = "${libdir}/libbfd-*.so" +FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:05 +0000 Subject: [oe-commits] [openembedded-core] 02/20: weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.A6D85232894@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1b00fd5d97e3705b857b7f01e3342b45d23184f7 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:44 2020 +0100 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000..e69de29 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:03 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (92c9d4c -> 94db5af) Message-ID: <158219466302.4956.11352883387253740789@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 92c9d4c binutils: Upgrade to 2.34 release discard cecc039 libubootenv: bump to revision ba952d0 discard c7fef08 iproute2: add devlink support to iproute2 discard f4f815c virglrenderer: upgrade 0.8.1 -> 0.8.2 discard 131775b vala: upgrade 0.46.5 -> 0.46.6 discard cf79c56 p11-kit: upgrade 0.23.18.1 -> 0.23.20 discard 096a6d9 meson: upgrade 0.53.0 -> 0.53.1 discard 4fd169b libsecret: upgrade 0.20.0 -> 0.20.1 discard 6a8608b epiphany: upgrade 3.34.3.1 -> 3.34.4 discard dc17fbb createrepo-c: upgrade 0.15.5 -> 0.15.7 discard 2abaf12 qemumips: use std vga instead of cirrus vga discard 1831a7d weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines discard e729f70 webkitgtk: unbreak wayland build new 105d6d5 webkitgtk: unbreak wayland build new 1b00fd5 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines new 6516077 qemumips: use std vga instead of cirrus vga new ab2c955 createrepo-c: upgrade 0.15.5 -> 0.15.7 new bc810cd epiphany: upgrade 3.34.3.1 -> 3.34.4 new cceb7a0 libsecret: upgrade 0.20.0 -> 0.20.1 new c5ecd9e meson: upgrade 0.53.0 -> 0.53.1 new f66fdec vala: upgrade 0.46.5 -> 0.46.6 new b2e3297 virglrenderer: upgrade 0.8.1 -> 0.8.2 new 12d396f iproute2: add devlink support to iproute2 new 33b7460 libubootenv: bump to revision ba952d0 new 61265a4 scripts/combo-layer: Fix deprecation warning new 1d5afe2 libsolv: upgrade 0.7.10 -> 0.7.11 new 4e2655e libxkbcommon: upgrade 0.9.1 -> 0.10.0 new 0bc3878 man-pages: upgrade 5.04 -> 5.05 new 0853a08 mesa: upgrade 19.3.3 -> 19.3.4 new 89d451a nfs-utils: upgrade 2.4.2 -> 2.4.3 new 9ed293a mc: upgrade 4.8.23 -> 4.8.24 new 9d13270 util-linux: fix hwclock settimeofday error new 94db5af babeltrace: added ptest This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (92c9d4c) \ N -- N -- N refs/heads/master-next (94db5af) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/maintainers.inc | 2 + meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/conf/distro/include/tcmode-default.inc | 2 +- .../0001-Don-t-build-tools-with-CC_FOR_BUILD.patch | 40 - ...le.am-fix-undefined-function-for-libnsm.a.patch | 12 +- .../{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} | 5 +- ...1-hwclock-fix-for-glibc-2.31-settimeofday.patch | 112 + meta/recipes-core/util-linux/util-linux_2.34.bb | 1 + .../{binutils-2.34.inc => binutils-2.33.inc} | 37 +- ...ian_2.34.bb => binutils-cross-canadian_2.33.bb} | 0 ...te_2.34.bb => binutils-cross-testsuite_2.33.bb} | 0 ...nutils-cross_2.34.bb => binutils-cross_2.33.bb} | 0 ...-crosssdk_2.34.bb => binutils-crosssdk_2.33.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 21 +- ...oss-Do-not-generate-linker-script-directo.patch | 10 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 + ...=> 0004-Point-scripts-location-to-libdir.patch} | 15 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...te-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 35 + ...te-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 41 - .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 +++++++++++++++++++ .../binutils/binutils/0007-Use-libtool-2.4.patch | 7118 ------- ...e-distro-compiler-point-to-the-wrong-ins.patch} | 13 +- ...s-of-system-directories-when-cross-linki.patch} | 45 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 7 +- ...hange-default-emulation-for-mips64-linux.patch} | 28 +- ...tch => 0011-Add-support-for-Netlogic-XLP.patch} | 117 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 9 +- ...patch => 0013-Detect-64-bit-MIPS-targets.patch} | 9 +- ...tch => 0014-sync-with-OE-libtool-changes.patch} | 7 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 + .../binutils/binutils/CVE-2019-17450.patch | 94 + .../binutils/binutils/CVE-2019-17451.patch | 46 + ...ld.so.conf.patch => nativesdk-relocation.patch} | 78 +- .../{binutils_2.34.bb => binutils_2.33.bb} | 4 +- .../{libsolv_0.7.10.bb => libsolv_0.7.11.bb} | 2 +- .../{man-pages_5.04.bb => man-pages_5.05.bb} | 4 +- ...0001-Add-option-to-control-configure-args.patch | 99 - ...et-3629-configure.ac-drop-bundled-gettext.patch | 110 - .../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +- .../mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} | 0 .../mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} | 4 +- ...ibxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} | 4 +- .../lttng/{lttng-tools => babeltrace}/run-ptest | 7 +- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 +- .../{p11-kit_0.23.20.bb => p11-kit_0.23.18.1.bb} | 2 +- scripts/combo-layer | 2 +- 48 files changed, 21845 insertions(+), 7749 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} (96%) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch rename meta/recipes-devtools/binutils/{binutils-2.34.inc => binutils-2.33.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.34.bb => binutils-cross-canadian_2.33.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.34.bb => binutils-cross-testsuite_2.33.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.34.bb => binutils-cross_2.33.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.34.bb => binutils-crosssdk_2.33.bb} (100%) create mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0005-Point-scripts-location-to-libdir.patch => 0004-Point-scripts-location-to-libdir.patch} (78%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (79%) rename meta/recipes-devtools/binutils/binutils/{0009-warn-for-uses-of-system-directories-when-cross-linki.patch => 0008-warn-for-uses-of-system-directories-when-cross-linki.patch} (85%) rename meta/recipes-devtools/binutils/binutils/{0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0011-Change-default-emulation-for-mips64-linux.patch => 0010-Change-default-emulation-for-mips64-linux.patch} (77%) rename meta/recipes-devtools/binutils/binutils/{0012-Add-support-for-Netlogic-XLP.patch => 0011-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (85%) rename meta/recipes-devtools/binutils/binutils/{0014-Detect-64-bit-MIPS-targets.patch => 0013-Detect-64-bit-MIPS-targets.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0015-sync-with-OE-libtool-changes.patch => 0014-sync-with-OE-libtool-changes.patch} (95%) create mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/binutils/{0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch => nativesdk-relocation.patch} (56%) rename meta/recipes-devtools/binutils/{binutils_2.34.bb => binutils_2.33.bb} (91%) rename meta/recipes-extended/libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} (93%) rename meta/recipes-extended/man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} (87%) delete mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch delete mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch rename meta/recipes-extended/mc/{mc_4.8.23.bb => mc_4.8.24.bb} (88%) rename meta/recipes-graphics/mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} (88%) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} (88%) copy meta/recipes-kernel/lttng/{lttng-tools => babeltrace}/run-ptest (57%) rename meta/recipes-support/p11-kit/{p11-kit_0.23.20.bb => p11-kit_0.23.18.1.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:04 +0000 Subject: [oe-commits] [openembedded-core] 01/20: webkitgtk: unbreak wayland build In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.9BFBE232892@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 105d6d597c7145ae9d60c36cd733dcfed84ec27e Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:42 2020 +0100 webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ [RP: Add missing maintainers entries] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 ++ meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 901d607..5f1dae9 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -397,6 +397,7 @@ RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libwpe = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster " RECIPE_MAINTAINER_pn-libxau = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster " @@ -711,6 +712,7 @@ RECIPE_MAINTAINER_pn-which = "Anuj Mittal " RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal " RECIPE_MAINTAINER_pn-wireless-regdb = "Adrian Bunk " RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-wpebackend-fdo = "Alexander Kanavin " RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster " RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal " RECIPE_MAINTAINER_pn-xauth = "Armin Kuster " diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000..346ca9b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8d..5857237 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000..7db5806 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:07 +0000 Subject: [oe-commits] [openembedded-core] 04/20: createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.BDFD323289A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ab2c955efd6fa9d9bc07059e1f14794f840164d1 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:46 2020 +0100 createrepo-c: upgrade 0.15.5 -> 0.15.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c..c6a53ff 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:06 +0000 Subject: [oe-commits] [openembedded-core] 03/20: qemumips: use std vga instead of cirrus vga In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.B3008232899@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6516077b8568ccfea60f8702db86c4f22690fac7 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:45 2020 +0100 qemumips: use std vga instead of cirrus vga This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ---------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ---------------------- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c..f1f7c2a 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:08 +0000 Subject: [oe-commits] [openembedded-core] 05/20: epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.CD07823289B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bc810cd50c6c0061e9f7ba8d1ef07a5cb868c150 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:47 2020 +0100 epiphany: upgrade 3.34.3.1 -> 3.34.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e15733..ddb4c27 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:13 +0000 Subject: [oe-commits] [openembedded-core] 10/20: iproute2: add devlink support to iproute2 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.113802328A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12d396fe4cb6c2b0e640f83439c618d6f3d6607d Author: Scott Branden AuthorDate: Wed Feb 19 12:41:03 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..403d264 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:14 +0000 Subject: [oe-commits] [openembedded-core] 11/20: libubootenv: bump to revision ba952d0 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.1B94B2328A4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 33b7460b89e2699da013c57b87013c80161eb9f4 Author: Pierre-Jean Texier AuthorDate: Wed Feb 19 22:37:12 2020 +0100 libubootenv: bump to revision ba952d0 This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier Acked-by: Stefano Babic Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..7a7ec4c 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -11,8 +11,9 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" +PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:09 +0000 Subject: [oe-commits] [openembedded-core] 06/20: libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.D930023289C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cceb7a0a6d9ce2c80939a21c3396c6088fa77c26 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:48 2020 +0100 libsecret: upgrade 0.20.0 -> 0.20.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b..0000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab..72511af 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:11 +0000 Subject: [oe-commits] [openembedded-core] 08/20: vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.F132D23289E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f66fdec9a1097890288b6c832bd24cb3201ba929 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:51 2020 +0100 vala: upgrade 0.46.5 -> 0.46.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d10..66f6203 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:12 +0000 Subject: [oe-commits] [openembedded-core] 09/20: virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.07AF123289F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b2e3297c172ca65634f4e01d5e9a983ec5ccb782 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:52 2020 +0100 virglrenderer: upgrade 0.8.1 -> 0.8.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 1336188..1046b85 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:15 +0000 Subject: [oe-commits] [openembedded-core] 12/20: scripts/combo-layer: Fix deprecation warning In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.2637F2328A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 61265a48e0986d800f92b33bd76f59918a72efba Author: Richard Purdie AuthorDate: Wed Feb 19 22:53:08 2020 +0000 scripts/combo-layer: Fix deprecation warning Resolve: combo-layer:83: DeprecationWarning: This method will be removed in future versions. Use 'parser.read_file()' instead. Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 9b50e98..a634dd6 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -80,7 +80,7 @@ class Configuration(object): logger.debug("Loading config file %s" % self.conffile) self.parser = configparser.ConfigParser() with open(self.conffile) as f: - self.parser.readfp(f) + self.parser.read_file(f) # initialize default values self.commit_msg_template = "Automatic commit to update last_revision" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:10 +0000 Subject: [oe-commits] [openembedded-core] 07/20: meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103103.E5B0323289D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c5ecd9ebb319556b4d50e438464fa151040c960f Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:49 2020 +0100 meson: upgrade 0.53.0 -> 0.53.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- .../meson/0002-Support-building-allarch-recipes-again.patch | 2 +- meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 .../{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d3..d391c9c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4c..9ce31e5 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe..ce18660 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9..dc822fb 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:17 +0000 Subject: [oe-commits] [openembedded-core] 14/20: libxkbcommon: upgrade 0.9.1 -> 0.10.0 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.384A2232894@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4e2655e1602f39b1236d67b3de7b2c3948d19853 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:00 2020 -0800 libxkbcommon: upgrade 0.9.1 -> 0.10.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb similarity index 88% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb index c147428..16d9c36 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "4662756fd73ab0ac9e32efdad8f807f6" -SRC_URI[sha256sum] = "d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0" +SRC_URI[md5sum] = "2d9ad3a46b317138b5e72a91cf105451" +SRC_URI[sha256sum] = "57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:18 +0000 Subject: [oe-commits] [openembedded-core] 15/20: man-pages: upgrade 5.04 -> 5.05 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.40E452328AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0bc387886164a87b33310ed2f3cdec39339dec56 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:16 2020 -0800 man-pages: upgrade 5.04 -> 5.05 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/man-pages/man-pages_5.04.bb b/meta/recipes-extended/man-pages/man-pages_5.05.bb similarity index 87% rename from meta/recipes-extended/man-pages/man-pages_5.04.bb rename to meta/recipes-extended/man-pages/man-pages_5.05.bb index be45675..b95872e 100644 --- a/meta/recipes-extended/man-pages/man-pages_5.04.bb +++ b/meta/recipes-extended/man-pages/man-pages_5.05.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "14d33d3fe02577a33aab26eb75df39cb" -SRC_URI[sha256sum] = "8c6ab56b654a6dd00e3759279954a25fc68b258b8f493a75af55ea7b6401fdb2" +SRC_URI[md5sum] = "cdad5deb15117e60a6d9e3a6bdc035b5" +SRC_URI[sha256sum] = "43c33d2eea9ba989c18eef90298cf6d5521ff038deb51cda0ecd0fdc3cec2b7d" inherit manpages -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:23 +0000 Subject: [oe-commits] [openembedded-core] 20/20: babeltrace: added ptest In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.72B612328AF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 94db5afc60de1d6a5b0401b2af2b98af84fb6f25 Author: Anders Wallin AuthorDate: Thu Feb 20 06:23:44 2020 +0100 babeltrace: added ptest Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-kernel/lttng/babeltrace/run-ptest | 9 +++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 ++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 23865ac..752a088 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -61,6 +61,7 @@ PTESTS_FAST = "\ #" PTESTS_SLOW = "\ + babeltrace-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000..f4b7ce1 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index b6b7653..c050dc6 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -7,14 +7,92 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ + file://run-ptest \ + " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk" + +addtask do_patch_ptest_path after do_patch before do_configure +do_patch_ptest_path () { + for f in $(grep -l -r abs_top_srcdir ${S}/tests); do + sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} + done + + for f in $(grep -l -r abs_top_builddir ${S}/tests); do + sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} + done + for f in $(grep -l -r GREP ${S}/tests); do + sed -i 's:\@GREP\@:grep:' ${f} + done + + for f in $(grep -l -r SED ${S}/tests); do + sed -i 's:\@SED\@:sed:' ${f} + done +} + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + # Copy required files from source directory + for f in config/tap-driver.sh config/test-driver; do + install -D "${S}/$f" "${D}${PTEST_PATH}/$f" + done + install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" + cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ + ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/$(check_SCRIPTS)/s/^/#/' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Remove path to babeltrace. + for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do + sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} + done + for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do + sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} + done +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:21 +0000 Subject: [oe-commits] [openembedded-core] 18/20: mc: upgrade 4.8.23 -> 4.8.24 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.5F53B232899@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9ed293a9d01259095ce8a10412f7bd9670a7212f Author: Wang Mingyu AuthorDate: Thu Feb 20 04:19:06 2020 -0800 mc: upgrade 4.8.23 -> 4.8.24 0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch 0001-Add-option-to-control-configure-args.patch Removed since they are included in 4.8.24. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...0001-Add-option-to-control-configure-args.patch | 99 ------------------- ...et-3629-configure.ac-drop-bundled-gettext.patch | 110 --------------------- .../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +- 3 files changed, 2 insertions(+), 213 deletions(-) diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch deleted file mode 100644 index e76aac8..0000000 --- a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Sat, 9 Nov 2019 20:01:48 -0600 -Subject: [PATCH] Add option to control configure args - -Embedding the configure time options into the executable can lead to -non-reproducible builds, since configure options often have embedded -paths. Add a configure time option to control if the configure args are -embedded so this can be disabled. - -Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] -Signed-off-by: Joshua Watt ---- - configure.ac | 6 ++++++ - src/args.c | 6 ++++++ - src/textconf.c | 2 ++ - 3 files changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 19d1a76be..a1948f6b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule - AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ - test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) - -+AC_ARG_ENABLE([configure-args], -+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) -+if test "x$enable_configure_args" != xno; then -+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) -+fi -+ - AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) - - AC_CONFIG_FILES( -diff --git a/src/args.c b/src/args.c -index baef1a1c8..f8dc24020 100644 ---- a/src/args.c -+++ b/src/args.c -@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; - #endif /* ENABLE_SUBSHELL */ - static gboolean mc_args__show_datadirs = FALSE; - static gboolean mc_args__show_datadirs_extended = FALSE; -+#ifdef ENABLE_CONFIGURE_ARGS - static gboolean mc_args__show_configure_opts = FALSE; -+#endif - - static GOptionGroup *main_group; - -@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { - NULL - }, - -+#ifdef ENABLE_CONFIGURE_ARGS - /* show configure options */ - { - "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, -@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { - N_("Print configure options"), - NULL - }, -+#endif - - { - "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, -@@ -758,11 +762,13 @@ mc_args_show_info (void) - return FALSE; - } - -+#ifdef ENABLE_CONFIGURE_ARGS - if (mc_args__show_configure_opts) - { - show_configure_options (); - return FALSE; - } -+#endif - - return TRUE; - } -diff --git a/src/textconf.c b/src/textconf.c -index 1e0613e58..f39b9e028 100644 ---- a/src/textconf.c -+++ b/src/textconf.c -@@ -232,10 +232,12 @@ show_datadirs_extended (void) - - /* --------------------------------------------------------------------------------------------- */ - -+#ifdef ENABLE_CONFIGURE_ARGS - void - show_configure_options (void) - { - (void) printf ("%s\n", MC_CONFIGURE_ARGS); - } -+#endif - - /* --------------------------------------------------------------------------------------------- */ --- -2.23.0 - diff --git a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch b/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch deleted file mode 100644 index 8f35737..0000000 --- a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Wed, 11 Sep 2019 22:58:18 +0100 -Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext - -Bundled libintl did not support linking to internal static -libraries (libmc in our case): directly specified static -libraries are not pulled by libtool and are not usable for -dynamic libraries as PIC-related flags are not passed for -compilation. - -This renders bundled libintl library unusable. - -The change drops libintl bundling support and always relies -on external libintl (or falls back to disabled NLS). - -On a related note gettext-0.20 drops support for bundling -or libintl and this change will ease migration to newer version. - -The change is tested on x86_64-gentoo-linux-musl: mc builds -and links all tests successfully. A few tests fail for lack -of NLS support. - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395] -Signed-off-by: Sergei Trofimovich -Signed-off-by: Andrew Borodin -Signed-off-by: Alexander Kanavin ---- - Makefile.am | 2 +- - configure.ac | 5 +++-- - doc/doxygen.cfg | 2 +- - lib/Makefile.am | 2 +- - m4.include/mc-i18n.m4 | 5 ----- - 5 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ac05a83..f86f6ed 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to create Makefile.in. - AUTOMAKE_OPTIONS = 1.5 - --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = po lib src doc contrib misc - - if HAVE_TESTS - SUBDIRS += tests -diff --git a/configure.ac b/configure.ac -index a1948f6..bbc9e71 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -272,7 +272,9 @@ dnl ############################################################################ - dnl Internationalization - dnl ############################################################################ - --AM_GNU_GETTEXT([no-libtool], [need-ngettext]) -+AC_CHECK_FUNCS([setlocale]) -+ -+AM_GNU_GETTEXT([external], [need-ngettext]) - AM_GNU_GETTEXT_VERSION([0.18.1]) - - mc_I18N -@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile - doc/hlp/ru/Makefile - doc/hlp/sr/Makefile - --intl/Makefile - po/Makefile.in - ]) - -diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg -index 07bc973..1118062 100644 ---- a/doc/doxygen.cfg -+++ b/doc/doxygen.cfg -@@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \ - RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO --EXCLUDE_PATTERNS = */intl/* */tests/* */.git/* -+EXCLUDE_PATTERNS = */tests/* */.git/* - EXCLUDE_SYMBOLS = - EXAMPLE_PATH = $(SRCDIR) - EXAMPLE_PATTERNS = -diff --git a/lib/Makefile.am b/lib/Makefile.am -index c448e2d..455f9dd 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -74,4 +74,4 @@ else - libmc_la_LIBADD += $(GLIB_LIBS) - endif - --libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) -+libmc_la_LIBADD += $(PCRE_LIBS) -diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4 -index dd10d00..ec08324 100644 ---- a/m4.include/mc-i18n.m4 -+++ b/m4.include/mc-i18n.m4 -@@ -8,11 +8,6 @@ dnl @license GPL - dnl @copyright Free Software Foundation, Inc. - - AC_DEFUN([mc_I18N],[ -- -- if test "x$USE_INCLUDED_LIBINTL" = xyes; then -- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" -- fi -- - dnl User visible support for charset conversion. - AC_ARG_ENABLE([charset], - AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@])) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.24.bb similarity index 88% rename from meta/recipes-extended/mc/mc_4.8.23.bb rename to meta/recipes-extended/mc/mc_4.8.24.bb index ead348b..7a68270 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.24.bb @@ -9,12 +9,10 @@ RRECOMMENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ - file://0001-Add-option-to-control-configure-args.patch \ - file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ file://nomandate.patch \ " -SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" -SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" +SRC_URI[md5sum] = "2621de1fa9058a9c41a4248becc969f9" +SRC_URI[sha256sum] = "cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:16 +0000 Subject: [oe-commits] [openembedded-core] 13/20: libsolv: upgrade 0.7.10 -> 0.7.11 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.2E5CF2328AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1d5afe221a25daf442534fa130b36d22094539a5 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:40:59 2020 -0800 libsolv: upgrade 0.7.10 -> 0.7.11 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.11.bb similarity index 93% rename from meta/recipes-extended/libsolv/libsolv_0.7.10.bb rename to meta/recipes-extended/libsolv/libsolv_0.7.11.bb index 502f4e0..8434960 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.11.bb @@ -10,7 +10,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378" +SRCREV = "102ac552669181d3e43731aa275bdbbc7ddcb94c" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:22 +0000 Subject: [oe-commits] [openembedded-core] 19/20: util-linux: fix hwclock settimeofday error In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.6804223289A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9d132704ed8a805023506bbe3ef07453b8ec89d6 Author: Liwei Song AuthorDate: Thu Feb 20 11:50:45 2020 +0800 util-linux: fix hwclock settimeofday error The change of settimeofday() systemcall since Glibc 2.31 will cause "hwclock -s" doesn't work with error: "hwclock: settimeofday() failed: Invalid argument" Backport a upstream patch to fix this issue. Signed-off-by: Liwei Song Signed-off-by: Richard Purdie --- ...1-hwclock-fix-for-glibc-2.31-settimeofday.patch | 112 +++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.34.bb | 1 + 2 files changed, 113 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch new file mode 100644 index 0000000..0672c35 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch @@ -0,0 +1,112 @@ +From ee85d3967ea09b215fcea5efdd90bbbf5e74a681 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 19 Feb 2020 15:50:47 +0100 +Subject: [PATCH] hwclock: fix for glibc 2.31 settimeofday() + +glibc announce: + ... settimeofday can no longer be used to set the time and the offset + simultaneously. If both of its two arguments are non-null, the call + will fail (setting errno to EINVAL). + +It means we need to call settimeofday(NULL, tz) and settimeofday(tv, NULL). + +Unfortunately, settimeofday(NULL, tz) has very special warp-clock +semantic if used as the very first settimeofday() call. It means we +have to be sure that we do not touch warp-clock if we need only need +to modify system TZ. So, let's always call settimeofday(NULL, 0) +before settimeofday(NULL, tz) for UTC rtc mode when modify system TZ. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/ee85d3967ea09b215fcea5efdd90bbbf5e74a681] + +CC: J William Piggott +Signed-off-by: Karel Zak +Addresses: https://github.com/karelzak/util-linux/issues/957 +Signed-off-by: Liwei Song +--- + sys-utils/hwclock.c | 49 ++++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index e736da7179f8..16576bc186ff 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -658,6 +658,9 @@ display_time(struct timeval hwctime) + * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale. + * firsttime: locks the warp_clock function (initialized to 1 at boot). + * ++ * Note that very first settimeofday(NULL, tz) modifies warp-clock as well as ++ * system TZ. ++ * + * +---------------------------------------------------------------------------+ + * | op | RTC scale | settimeofday calls | + * |---------|-----------|-----------------------------------------------------| +@@ -675,41 +678,45 @@ set_system_clock(const struct hwclock_control *ctl, + struct tm broken; + int minuteswest; + int rc = 0; +- const struct timezone tz_utc = { 0 }; + + localtime_r(&newtime.tv_sec, &broken); + minuteswest = -get_gmtoff(&broken) / 60; + + if (ctl->verbose) { +- if (ctl->hctosys && !ctl->universal) +- printf(_("Calling settimeofday(NULL, %d) to set " +- "persistent_clock_is_local.\n"), minuteswest); +- if (ctl->systz && ctl->universal) ++ if (ctl->universal) + puts(_("Calling settimeofday(NULL, 0) " +- "to lock the warp function.")); ++ "to lock the warp function.")); ++ else ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "persistent_clock_is_local and " ++ "the kernel timezone.\n"), minuteswest); ++ ++ if (ctl->universal && minuteswest) ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "the kernel timezone.\n"), minuteswest); ++ + if (ctl->hctosys) +- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), +- newtime.tv_sec, newtime.tv_usec, minuteswest); +- else { +- printf(_("Calling settimeofday(NULL, %d) "), minuteswest); +- if (ctl->universal) +- puts(_("to set the kernel timezone.")); +- else +- puts(_("to warp System time.")); +- } ++ printf(_("Calling settimeofday(%ld.%06ld, 0) to set " ++ "the kernel time.\n"), newtime.tv_sec, newtime.tv_usec); + } + + if (!ctl->testing) { ++ const struct timezone tz_utc = { 0 }; + const struct timezone tz = { minuteswest }; + +- if (ctl->hctosys && !ctl->universal) /* set PCIL */ ++ /* warp-clock */ ++ if (ctl->universal) ++ rc = settimeofday(NULL, &tz_utc); /* lock to UTC */ ++ else ++ rc = settimeofday(NULL, &tz); /* set PCIL and TZ */ ++ ++ /* set timezone */ ++ if (!rc && ctl->universal && minuteswest) + rc = settimeofday(NULL, &tz); +- if (ctl->systz && ctl->universal) /* lock warp_clock */ +- rc = settimeofday(NULL, &tz_utc); ++ ++ /* set time */ + if (!rc && ctl->hctosys) +- rc = settimeofday(&newtime, &tz); +- else if (!rc) +- rc = settimeofday(NULL, &tz); ++ rc = settimeofday(&newtime, NULL); + + if (rc) { + warn(_("settimeofday() failed")); +-- +2.17.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb index e9c2d80..557449d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.34.bb @@ -8,6 +8,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:20 +0000 Subject: [oe-commits] [openembedded-core] 17/20: nfs-utils: upgrade 2.4.2 -> 2.4.3 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.55E9F232892@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 89d451a75120e8c335ab13eb0f798d0ee04be617 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:34 2020 -0800 nfs-utils: upgrade 2.4.2 -> 2.4.3 0001-Don-t-build-tools-with-CC_FOR_BUILD.patch Removed since it is included in 2.4.3. refresh the following patch: 0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-Don-t-build-tools-with-CC_FOR_BUILD.patch | 40 ---------------------- ...le.am-fix-undefined-function-for-libnsm.a.patch | 12 ++++--- .../{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} | 5 ++- 3 files changed, 10 insertions(+), 47 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch deleted file mode 100644 index 23bc3ea..0000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 13 Feb 2019 09:28:07 +0100 -Subject: [PATCH] Don't build tools with CC_FOR_BUILD - -The tools are intended for the target not for the host. - -Upstream-Status: Pending - -Signed-off-by: Pascal Bach ---- - tools/locktest/Makefile.am | 1 - - tools/rpcgen/Makefile.am | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index 3156815..87d0bac 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = testlk -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89..3e092c9 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = rpcgen --- -2.11.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch index fcb0e99..bd35014 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch @@ -28,10 +28,10 @@ Rebase it. Signed-off-by: Robert Yang --- support/misc/Makefile.am | 2 +- - support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- + support/misc/file.c | 115 --------------------------------------------------------------------------------------------------------------- support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/Makefile.am | 2 +- - 4 files changed, 113 insertions(+), 113 deletions(-) + 4 files changed, 113 insertions(+), 117 deletions(-) diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am index f9993e3..8b0e9db 100644 @@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644 MAINTAINERCLEANFILES = Makefile.in diff --git a/support/misc/file.c b/support/misc/file.c deleted file mode 100644 -index e7c3819..0000000 +index 06f6bb2..0000000 --- a/support/misc/file.c +++ /dev/null -@@ -1,111 +0,0 @@ +@@ -1,115 +0,0 @@ -/* - * Copyright 2009 Oracle. All rights reserved. - * Copyright 2017 Red Hat, Inc. All rights reserved. @@ -72,6 +72,10 @@ index e7c3819..0000000 - * along with nfs-utils. If not, see . - */ - +-#ifdef HAVE_CONFIG_H +-#include +-#endif +- -#include - -#include diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb similarity index 96% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb index 6647d34..42a4ba3 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ - file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ file://clang-warnings.patch \ " -SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" -SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" +SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c" +SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 10:31:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 10:31:19 +0000 Subject: [oe-commits] [openembedded-core] 16/20: mesa: upgrade 19.3.3 -> 19.3.4 In-Reply-To: <158219466302.4956.11352883387253740789@git.openembedded.org> References: <158219466302.4956.11352883387253740789@git.openembedded.org> Message-ID: <20200220103104.4CB07232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0853a0892fb72fa01c6e7223feb68ce7c6498ed9 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:25 2020 -0800 mesa: upgrade 19.3.3 -> 19.3.4 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.3.bb b/meta/recipes-graphics/mesa/mesa_19.3.4.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa_19.3.4.bb index 7e0c5d6..5f456c2 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.4.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" -SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" +SRC_URI[md5sum] = "09e7700d9af511384d131fb77b5802cb" +SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 12:06:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 12:06:03 +0000 Subject: [oe-commits] [bitbake] branch master updated: fetch2/svn: Avoid UnboundLocalError exception Message-ID: <158220036340.2821.4814893801341979897@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new 16c4e93 fetch2/svn: Avoid UnboundLocalError exception 16c4e93 is described below commit 16c4e930ff37ea6eac2ac0cb2197908ce3a1cc53 Author: Richard Purdie AuthorDate: Wed Feb 19 18:43:39 2020 +0000 fetch2/svn: Avoid UnboundLocalError exception The update codepath would trigger: Exception: UnboundLocalError: local variable 'svnfetchcmd' referenced before assignment Fix this so the code functions as intended in both fetch and update cases. [YOCTO #13798] Signed-off-by: Richard Purdie --- lib/bb/fetch2/svn.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 385a6b2..971a5ad 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -122,30 +122,30 @@ class Svn(FetchMethod): try: if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK): - svnupdatecmd = self._buildsvncommand(ud, d, "update") + svncmd = self._buildsvncommand(ud, d, "update") logger.info("Update " + ud.url) # We need to attempt to run svn upgrade first in case its an older working format try: runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir) except FetchError: pass - logger.debug(1, "Running %s", svnupdatecmd) - bb.fetch2.check_network_access(d, svnupdatecmd, ud.url) - runfetchcmd(svnupdatecmd, d, workdir=ud.moddir) + logger.debug(1, "Running %s", svncmd) + bb.fetch2.check_network_access(d, svncmd, ud.url) + runfetchcmd(svncmd, d, workdir=ud.moddir) else: - svnfetchcmd = self._buildsvncommand(ud, d, "fetch") + svncmd = self._buildsvncommand(ud, d, "fetch") logger.info("Fetch " + ud.url) # check out sources there bb.utils.mkdirhier(ud.pkgdir) - logger.debug(1, "Running %s", svnfetchcmd) - bb.fetch2.check_network_access(d, svnfetchcmd, ud.url) - runfetchcmd(svnfetchcmd, d, workdir=ud.pkgdir) + logger.debug(1, "Running %s", svncmd) + bb.fetch2.check_network_access(d, svncmd, ud.url) + runfetchcmd(svncmd, d, workdir=ud.pkgdir) if not ("externals" in ud.parm and ud.parm["externals"] == "nowarn"): # Warn the user if this had externals (won't catch them all) output = runfetchcmd("svn propget svn:externals || true", d, workdir=ud.moddir) if output: - if "--ignore-externals" in svnfetchcmd.split(): + if "--ignore-externals" in svncmd.split(): bb.warn("%s contains svn:externals." % ud.url) bb.warn("These should be added to the recipe SRC_URI as necessary.") bb.warn("svn fetch has ignored externals:\n%s" % output) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:09 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (8f29d82 -> 10c2216) Message-ID: <158220798969.29897.6682318305331139088@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 8f29d82 local.conf.sample.extended: Document how to limit parallel fetch tasks add 10c2216 oescripts.py: use unittest.SkipUnless for class skip No new revisions were added by this update. Summary of changes: meta/lib/oeqa/selftest/cases/oescripts.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:15 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (94db5af -> 4ea0f5b) Message-ID: <158220799527.30176.12204505474254370931@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 94db5af babeltrace: added ptest discard 9d13270 util-linux: fix hwclock settimeofday error discard 9ed293a mc: upgrade 4.8.23 -> 4.8.24 discard 89d451a nfs-utils: upgrade 2.4.2 -> 2.4.3 discard 0853a08 mesa: upgrade 19.3.3 -> 19.3.4 discard 0bc3878 man-pages: upgrade 5.04 -> 5.05 discard 4e2655e libxkbcommon: upgrade 0.9.1 -> 0.10.0 discard 1d5afe2 libsolv: upgrade 0.7.10 -> 0.7.11 discard 61265a4 scripts/combo-layer: Fix deprecation warning discard 33b7460 libubootenv: bump to revision ba952d0 discard 12d396f iproute2: add devlink support to iproute2 discard b2e3297 virglrenderer: upgrade 0.8.1 -> 0.8.2 discard f66fdec vala: upgrade 0.46.5 -> 0.46.6 discard c5ecd9e meson: upgrade 0.53.0 -> 0.53.1 discard cceb7a0 libsecret: upgrade 0.20.0 -> 0.20.1 discard bc810cd epiphany: upgrade 3.34.3.1 -> 3.34.4 discard ab2c955 createrepo-c: upgrade 0.15.5 -> 0.15.7 discard 6516077 qemumips: use std vga instead of cirrus vga discard 1b00fd5 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines discard 105d6d5 webkitgtk: unbreak wayland build discard 56fbdbd webkitgtk: x11 and wayland are not mutually exclusive discard b5d96bb oeqa/selftest: Drop 'backup' code and SIGTERM handler discard dbecb99 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest new b868674 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest new ab9e6e8 oeqa/selftest: Drop 'backup' code and SIGTERM handler new 6deda40 webkitgtk: x11 and wayland are not mutually exclusive new 5fa4184 webkitgtk: unbreak wayland build new 2ea2589 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines new 3f140c3 qemumips: use std vga instead of cirrus vga new a45d535 createrepo-c: upgrade 0.15.5 -> 0.15.7 new fc993d1 epiphany: upgrade 3.34.3.1 -> 3.34.4 new 5236fea libsecret: upgrade 0.20.0 -> 0.20.1 new 5d888ff meson: upgrade 0.53.0 -> 0.53.1 new 6e20f32 vala: upgrade 0.46.5 -> 0.46.6 new e043229 virglrenderer: upgrade 0.8.1 -> 0.8.2 new 5bae36a iproute2: add devlink support to iproute2 new 41d6995 libubootenv: bump to revision ba952d0 new 74a8fb4 scripts/combo-layer: Fix deprecation warning new 1cfd171 libxkbcommon: upgrade 0.9.1 -> 0.10.0 new fccfbf1 man-pages: upgrade 5.04 -> 5.05 new 054fa7f mesa: upgrade 19.3.3 -> 19.3.4 new 5e98b29 nfs-utils: upgrade 2.4.2 -> 2.4.3 new 8f76b77 mc: upgrade 4.8.23 -> 4.8.24 new 461d4b7 util-linux: fix hwclock settimeofday error new 0ca1fc2 babeltrace: added ptest new 4ea0f5b oeqa/logparser: Fix performance issues with ptest log parsing This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (94db5af) \ N -- N -- N refs/heads/master-next (4ea0f5b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 23 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/selftest/context.py | 2 +- meta/lib/oeqa/utils/logparser.py | 16 ++++++++++++++-- .../libsolv/{libsolv_0.7.11.bb => libsolv_0.7.10.bb} | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) rename meta/recipes-extended/libsolv/{libsolv_0.7.11.bb => libsolv_0.7.10.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:16 +0000 Subject: [oe-commits] [openembedded-core] 01/23: oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141315.A5BC4232892@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b868674a7f84c3ab125401933584d02b94b1c9d3 Author: Richard Purdie AuthorDate: Wed Feb 19 18:19:49 2020 +0000 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++---- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------------ meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a5..16320af 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e..fac59f7 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c..cd89326 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting" % newbuilddir) + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:18 +0000 Subject: [oe-commits] [openembedded-core] 03/23: webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141315.CE547232899@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6deda40e672b9f4d911f1c244e3ccd189eb19ec8 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:41 2020 +0100 webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1..153bc8d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:17 +0000 Subject: [oe-commits] [openembedded-core] 02/23: oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141315.BC2EE232894@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ab9e6e87ac33f33d2a27cb16e395297aa395b980 Author: Richard Purdie AuthorDate: Wed Feb 19 18:32:19 2020 +0000 oeqa/selftest: Drop 'backup' code and SIGTERM handler Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------------ meta/lib/oeqa/selftest/context.py | 47 +++------------------------------------ 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d..dcad4f7 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index cd89326..409698d 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:19 +0000 Subject: [oe-commits] [openembedded-core] 04/23: webkitgtk: unbreak wayland build In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141315.DF50223289A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5fa4184771432a168c48faa0c4cacfd8f60dc2f0 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:42 2020 +0100 webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ [RP: Add missing maintainers entries] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 ++ meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 901d607..5f1dae9 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -397,6 +397,7 @@ RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libwpe = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster " RECIPE_MAINTAINER_pn-libxau = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster " @@ -711,6 +712,7 @@ RECIPE_MAINTAINER_pn-which = "Anuj Mittal " RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal " RECIPE_MAINTAINER_pn-wireless-regdb = "Adrian Bunk " RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-wpebackend-fdo = "Alexander Kanavin " RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster " RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal " RECIPE_MAINTAINER_pn-xauth = "Armin Kuster " diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000..346ca9b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8d..5857237 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000..7db5806 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:20 +0000 Subject: [oe-commits] [openembedded-core] 05/23: weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141315.EEA3B23289B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ea2589e3410f1516ffb87a44491e15437f1d5a8 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:44 2020 +0100 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000..e69de29 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:23 +0000 Subject: [oe-commits] [openembedded-core] 08/23: epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.23EE323289E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fc993d11001a17f063a794f40e9c308672c745cd Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:47 2020 +0100 epiphany: upgrade 3.34.3.1 -> 3.34.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e15733..ddb4c27 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:21 +0000 Subject: [oe-commits] [openembedded-core] 06/23: qemumips: use std vga instead of cirrus vga In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.09FE723289C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3f140c3464e79d8e147d1394bf386d0bb38f99f0 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:45 2020 +0100 qemumips: use std vga instead of cirrus vga This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ---------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ---------------------- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c..f1f7c2a 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:22 +0000 Subject: [oe-commits] [openembedded-core] 07/23: createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.163AF23289D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a45d53506ff6bd0fdaef81a0e17b9d69e155e75d Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:46 2020 +0100 createrepo-c: upgrade 0.15.5 -> 0.15.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c..c6a53ff 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:26 +0000 Subject: [oe-commits] [openembedded-core] 11/23: vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.56088232892@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e20f32590c80821eb92d6345615a8c3f8acae11 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:51 2020 +0100 vala: upgrade 0.46.5 -> 0.46.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d10..66f6203 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:27 +0000 Subject: [oe-commits] [openembedded-core] 12/23: virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.63763232894@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e04322970b0bd515ff649a1856e367a72e7c437b Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:52 2020 +0100 virglrenderer: upgrade 0.8.1 -> 0.8.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 1336188..1046b85 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:25 +0000 Subject: [oe-commits] [openembedded-core] 10/23: meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.44E67232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5d888ffe1e38aee85bd29ebc76d9e4d12c7cd0fd Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:49 2020 +0100 meson: upgrade 0.53.0 -> 0.53.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- .../meson/0002-Support-building-allarch-recipes-again.patch | 2 +- meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 .../{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d3..d391c9c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4c..9ce31e5 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe..ce18660 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9..dc822fb 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:24 +0000 Subject: [oe-commits] [openembedded-core] 09/23: libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.33D5C23289F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5236fea0af5baf0b59c674fe076c3c9737f4bda5 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:48 2020 +0100 libsecret: upgrade 0.20.0 -> 0.20.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b..0000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab..72511af 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:28 +0000 Subject: [oe-commits] [openembedded-core] 13/23: iproute2: add devlink support to iproute2 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.6E470232899@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5bae36a376ca590d9d3f7ab8cceba9e239b819d0 Author: Scott Branden AuthorDate: Wed Feb 19 12:41:03 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..403d264 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:30 +0000 Subject: [oe-commits] [openembedded-core] 15/23: scripts/combo-layer: Fix deprecation warning In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.88C4C2328A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 74a8fb4ce1ee3f8eb7a0cac89f9ac897d5d05290 Author: Richard Purdie AuthorDate: Wed Feb 19 22:53:08 2020 +0000 scripts/combo-layer: Fix deprecation warning Resolve: combo-layer:83: DeprecationWarning: This method will be removed in future versions. Use 'parser.read_file()' instead. Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 9b50e98..a634dd6 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -80,7 +80,7 @@ class Configuration(object): logger.debug("Loading config file %s" % self.conffile) self.parser = configparser.ConfigParser() with open(self.conffile) as f: - self.parser.readfp(f) + self.parser.read_file(f) # initialize default values self.commit_msg_template = "Automatic commit to update last_revision" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:29 +0000 Subject: [oe-commits] [openembedded-core] 14/23: libubootenv: bump to revision ba952d0 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.79A0D23289A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41d6995e51c582e744c291093122ab4619a4287c Author: Pierre-Jean Texier AuthorDate: Wed Feb 19 22:37:12 2020 +0100 libubootenv: bump to revision ba952d0 This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier Acked-by: Stefano Babic Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..7a7ec4c 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -11,8 +11,9 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" +PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:32 +0000 Subject: [oe-commits] [openembedded-core] 17/23: man-pages: upgrade 5.04 -> 5.05 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.A48C12328A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fccfbf13f7765c6bc6ea1e585b02142df1b522ba Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:16 2020 -0800 man-pages: upgrade 5.04 -> 5.05 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/man-pages/man-pages_5.04.bb b/meta/recipes-extended/man-pages/man-pages_5.05.bb similarity index 87% rename from meta/recipes-extended/man-pages/man-pages_5.04.bb rename to meta/recipes-extended/man-pages/man-pages_5.05.bb index be45675..b95872e 100644 --- a/meta/recipes-extended/man-pages/man-pages_5.04.bb +++ b/meta/recipes-extended/man-pages/man-pages_5.05.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "14d33d3fe02577a33aab26eb75df39cb" -SRC_URI[sha256sum] = "8c6ab56b654a6dd00e3759279954a25fc68b258b8f493a75af55ea7b6401fdb2" +SRC_URI[md5sum] = "cdad5deb15117e60a6d9e3a6bdc035b5" +SRC_URI[sha256sum] = "43c33d2eea9ba989c18eef90298cf6d5521ff038deb51cda0ecd0fdc3cec2b7d" inherit manpages -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:34 +0000 Subject: [oe-commits] [openembedded-core] 19/23: nfs-utils: upgrade 2.4.2 -> 2.4.3 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.C2AA823289E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5e98b296797dd862145b066e46c4adf6f954cd91 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:34 2020 -0800 nfs-utils: upgrade 2.4.2 -> 2.4.3 0001-Don-t-build-tools-with-CC_FOR_BUILD.patch Removed since it is included in 2.4.3. refresh the following patch: 0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-Don-t-build-tools-with-CC_FOR_BUILD.patch | 40 ---------------------- ...le.am-fix-undefined-function-for-libnsm.a.patch | 12 ++++--- .../{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} | 5 ++- 3 files changed, 10 insertions(+), 47 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch deleted file mode 100644 index 23bc3ea..0000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 13 Feb 2019 09:28:07 +0100 -Subject: [PATCH] Don't build tools with CC_FOR_BUILD - -The tools are intended for the target not for the host. - -Upstream-Status: Pending - -Signed-off-by: Pascal Bach ---- - tools/locktest/Makefile.am | 1 - - tools/rpcgen/Makefile.am | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index 3156815..87d0bac 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = testlk -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89..3e092c9 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = rpcgen --- -2.11.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch index fcb0e99..bd35014 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch @@ -28,10 +28,10 @@ Rebase it. Signed-off-by: Robert Yang --- support/misc/Makefile.am | 2 +- - support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- + support/misc/file.c | 115 --------------------------------------------------------------------------------------------------------------- support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/Makefile.am | 2 +- - 4 files changed, 113 insertions(+), 113 deletions(-) + 4 files changed, 113 insertions(+), 117 deletions(-) diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am index f9993e3..8b0e9db 100644 @@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644 MAINTAINERCLEANFILES = Makefile.in diff --git a/support/misc/file.c b/support/misc/file.c deleted file mode 100644 -index e7c3819..0000000 +index 06f6bb2..0000000 --- a/support/misc/file.c +++ /dev/null -@@ -1,111 +0,0 @@ +@@ -1,115 +0,0 @@ -/* - * Copyright 2009 Oracle. All rights reserved. - * Copyright 2017 Red Hat, Inc. All rights reserved. @@ -72,6 +72,10 @@ index e7c3819..0000000 - * along with nfs-utils. If not, see . - */ - +-#ifdef HAVE_CONFIG_H +-#include +-#endif +- -#include - -#include diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb similarity index 96% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb index 6647d34..42a4ba3 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ - file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ file://clang-warnings.patch \ " -SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" -SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" +SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c" +SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:31 +0000 Subject: [oe-commits] [openembedded-core] 16/23: libxkbcommon: upgrade 0.9.1 -> 0.10.0 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.9540C2328A4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1cfd171ff502a4f1c98cc89cb8e1e4fa330c009b Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:00 2020 -0800 libxkbcommon: upgrade 0.9.1 -> 0.10.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb similarity index 88% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb index c147428..16d9c36 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "4662756fd73ab0ac9e32efdad8f807f6" -SRC_URI[sha256sum] = "d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0" +SRC_URI[md5sum] = "2d9ad3a46b317138b5e72a91cf105451" +SRC_URI[sha256sum] = "57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:35 +0000 Subject: [oe-commits] [openembedded-core] 20/23: mc: upgrade 4.8.23 -> 4.8.24 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.CEC8C23289C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8f76b7795c94b260b6366840c3b568c02c457197 Author: Wang Mingyu AuthorDate: Thu Feb 20 04:19:06 2020 -0800 mc: upgrade 4.8.23 -> 4.8.24 0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch 0001-Add-option-to-control-configure-args.patch Removed since they are included in 4.8.24. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...0001-Add-option-to-control-configure-args.patch | 99 ------------------- ...et-3629-configure.ac-drop-bundled-gettext.patch | 110 --------------------- .../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +- 3 files changed, 2 insertions(+), 213 deletions(-) diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch deleted file mode 100644 index e76aac8..0000000 --- a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Sat, 9 Nov 2019 20:01:48 -0600 -Subject: [PATCH] Add option to control configure args - -Embedding the configure time options into the executable can lead to -non-reproducible builds, since configure options often have embedded -paths. Add a configure time option to control if the configure args are -embedded so this can be disabled. - -Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] -Signed-off-by: Joshua Watt ---- - configure.ac | 6 ++++++ - src/args.c | 6 ++++++ - src/textconf.c | 2 ++ - 3 files changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 19d1a76be..a1948f6b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule - AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ - test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) - -+AC_ARG_ENABLE([configure-args], -+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) -+if test "x$enable_configure_args" != xno; then -+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) -+fi -+ - AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) - - AC_CONFIG_FILES( -diff --git a/src/args.c b/src/args.c -index baef1a1c8..f8dc24020 100644 ---- a/src/args.c -+++ b/src/args.c -@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; - #endif /* ENABLE_SUBSHELL */ - static gboolean mc_args__show_datadirs = FALSE; - static gboolean mc_args__show_datadirs_extended = FALSE; -+#ifdef ENABLE_CONFIGURE_ARGS - static gboolean mc_args__show_configure_opts = FALSE; -+#endif - - static GOptionGroup *main_group; - -@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { - NULL - }, - -+#ifdef ENABLE_CONFIGURE_ARGS - /* show configure options */ - { - "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, -@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { - N_("Print configure options"), - NULL - }, -+#endif - - { - "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, -@@ -758,11 +762,13 @@ mc_args_show_info (void) - return FALSE; - } - -+#ifdef ENABLE_CONFIGURE_ARGS - if (mc_args__show_configure_opts) - { - show_configure_options (); - return FALSE; - } -+#endif - - return TRUE; - } -diff --git a/src/textconf.c b/src/textconf.c -index 1e0613e58..f39b9e028 100644 ---- a/src/textconf.c -+++ b/src/textconf.c -@@ -232,10 +232,12 @@ show_datadirs_extended (void) - - /* --------------------------------------------------------------------------------------------- */ - -+#ifdef ENABLE_CONFIGURE_ARGS - void - show_configure_options (void) - { - (void) printf ("%s\n", MC_CONFIGURE_ARGS); - } -+#endif - - /* --------------------------------------------------------------------------------------------- */ --- -2.23.0 - diff --git a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch b/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch deleted file mode 100644 index 8f35737..0000000 --- a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Wed, 11 Sep 2019 22:58:18 +0100 -Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext - -Bundled libintl did not support linking to internal static -libraries (libmc in our case): directly specified static -libraries are not pulled by libtool and are not usable for -dynamic libraries as PIC-related flags are not passed for -compilation. - -This renders bundled libintl library unusable. - -The change drops libintl bundling support and always relies -on external libintl (or falls back to disabled NLS). - -On a related note gettext-0.20 drops support for bundling -or libintl and this change will ease migration to newer version. - -The change is tested on x86_64-gentoo-linux-musl: mc builds -and links all tests successfully. A few tests fail for lack -of NLS support. - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395] -Signed-off-by: Sergei Trofimovich -Signed-off-by: Andrew Borodin -Signed-off-by: Alexander Kanavin ---- - Makefile.am | 2 +- - configure.ac | 5 +++-- - doc/doxygen.cfg | 2 +- - lib/Makefile.am | 2 +- - m4.include/mc-i18n.m4 | 5 ----- - 5 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ac05a83..f86f6ed 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to create Makefile.in. - AUTOMAKE_OPTIONS = 1.5 - --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = po lib src doc contrib misc - - if HAVE_TESTS - SUBDIRS += tests -diff --git a/configure.ac b/configure.ac -index a1948f6..bbc9e71 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -272,7 +272,9 @@ dnl ############################################################################ - dnl Internationalization - dnl ############################################################################ - --AM_GNU_GETTEXT([no-libtool], [need-ngettext]) -+AC_CHECK_FUNCS([setlocale]) -+ -+AM_GNU_GETTEXT([external], [need-ngettext]) - AM_GNU_GETTEXT_VERSION([0.18.1]) - - mc_I18N -@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile - doc/hlp/ru/Makefile - doc/hlp/sr/Makefile - --intl/Makefile - po/Makefile.in - ]) - -diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg -index 07bc973..1118062 100644 ---- a/doc/doxygen.cfg -+++ b/doc/doxygen.cfg -@@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \ - RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO --EXCLUDE_PATTERNS = */intl/* */tests/* */.git/* -+EXCLUDE_PATTERNS = */tests/* */.git/* - EXCLUDE_SYMBOLS = - EXAMPLE_PATH = $(SRCDIR) - EXAMPLE_PATTERNS = -diff --git a/lib/Makefile.am b/lib/Makefile.am -index c448e2d..455f9dd 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -74,4 +74,4 @@ else - libmc_la_LIBADD += $(GLIB_LIBS) - endif - --libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) -+libmc_la_LIBADD += $(PCRE_LIBS) -diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4 -index dd10d00..ec08324 100644 ---- a/m4.include/mc-i18n.m4 -+++ b/m4.include/mc-i18n.m4 -@@ -8,11 +8,6 @@ dnl @license GPL - dnl @copyright Free Software Foundation, Inc. - - AC_DEFUN([mc_I18N],[ -- -- if test "x$USE_INCLUDED_LIBINTL" = xyes; then -- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" -- fi -- - dnl User visible support for charset conversion. - AC_ARG_ENABLE([charset], - AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@])) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.24.bb similarity index 88% rename from meta/recipes-extended/mc/mc_4.8.23.bb rename to meta/recipes-extended/mc/mc_4.8.24.bb index ead348b..7a68270 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.24.bb @@ -9,12 +9,10 @@ RRECOMMENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ - file://0001-Add-option-to-control-configure-args.patch \ - file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ file://nomandate.patch \ " -SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" -SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" +SRC_URI[md5sum] = "2621de1fa9058a9c41a4248becc969f9" +SRC_URI[sha256sum] = "cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:33 +0000 Subject: [oe-commits] [openembedded-core] 18/23: mesa: upgrade 19.3.3 -> 19.3.4 In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.B497423289B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 054fa7f0ce3dc8aa8447d5d7baa8ee867818164f Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:25 2020 -0800 mesa: upgrade 19.3.3 -> 19.3.4 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.3.bb b/meta/recipes-graphics/mesa/mesa_19.3.4.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa_19.3.4.bb index 7e0c5d6..5f456c2 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.4.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" -SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" +SRC_URI[md5sum] = "09e7700d9af511384d131fb77b5802cb" +SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:36 +0000 Subject: [oe-commits] [openembedded-core] 21/23: util-linux: fix hwclock settimeofday error In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.DB72F232892@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 461d4b707a27040025d02428a4cdd9356101632f Author: Liwei Song AuthorDate: Thu Feb 20 11:50:45 2020 +0800 util-linux: fix hwclock settimeofday error The change of settimeofday() systemcall since Glibc 2.31 will cause "hwclock -s" doesn't work with error: "hwclock: settimeofday() failed: Invalid argument" Backport a upstream patch to fix this issue. Signed-off-by: Liwei Song Signed-off-by: Richard Purdie --- ...1-hwclock-fix-for-glibc-2.31-settimeofday.patch | 112 +++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.34.bb | 1 + 2 files changed, 113 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch new file mode 100644 index 0000000..0672c35 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch @@ -0,0 +1,112 @@ +From ee85d3967ea09b215fcea5efdd90bbbf5e74a681 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 19 Feb 2020 15:50:47 +0100 +Subject: [PATCH] hwclock: fix for glibc 2.31 settimeofday() + +glibc announce: + ... settimeofday can no longer be used to set the time and the offset + simultaneously. If both of its two arguments are non-null, the call + will fail (setting errno to EINVAL). + +It means we need to call settimeofday(NULL, tz) and settimeofday(tv, NULL). + +Unfortunately, settimeofday(NULL, tz) has very special warp-clock +semantic if used as the very first settimeofday() call. It means we +have to be sure that we do not touch warp-clock if we need only need +to modify system TZ. So, let's always call settimeofday(NULL, 0) +before settimeofday(NULL, tz) for UTC rtc mode when modify system TZ. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/ee85d3967ea09b215fcea5efdd90bbbf5e74a681] + +CC: J William Piggott +Signed-off-by: Karel Zak +Addresses: https://github.com/karelzak/util-linux/issues/957 +Signed-off-by: Liwei Song +--- + sys-utils/hwclock.c | 49 ++++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index e736da7179f8..16576bc186ff 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -658,6 +658,9 @@ display_time(struct timeval hwctime) + * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale. + * firsttime: locks the warp_clock function (initialized to 1 at boot). + * ++ * Note that very first settimeofday(NULL, tz) modifies warp-clock as well as ++ * system TZ. ++ * + * +---------------------------------------------------------------------------+ + * | op | RTC scale | settimeofday calls | + * |---------|-----------|-----------------------------------------------------| +@@ -675,41 +678,45 @@ set_system_clock(const struct hwclock_control *ctl, + struct tm broken; + int minuteswest; + int rc = 0; +- const struct timezone tz_utc = { 0 }; + + localtime_r(&newtime.tv_sec, &broken); + minuteswest = -get_gmtoff(&broken) / 60; + + if (ctl->verbose) { +- if (ctl->hctosys && !ctl->universal) +- printf(_("Calling settimeofday(NULL, %d) to set " +- "persistent_clock_is_local.\n"), minuteswest); +- if (ctl->systz && ctl->universal) ++ if (ctl->universal) + puts(_("Calling settimeofday(NULL, 0) " +- "to lock the warp function.")); ++ "to lock the warp function.")); ++ else ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "persistent_clock_is_local and " ++ "the kernel timezone.\n"), minuteswest); ++ ++ if (ctl->universal && minuteswest) ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "the kernel timezone.\n"), minuteswest); ++ + if (ctl->hctosys) +- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), +- newtime.tv_sec, newtime.tv_usec, minuteswest); +- else { +- printf(_("Calling settimeofday(NULL, %d) "), minuteswest); +- if (ctl->universal) +- puts(_("to set the kernel timezone.")); +- else +- puts(_("to warp System time.")); +- } ++ printf(_("Calling settimeofday(%ld.%06ld, 0) to set " ++ "the kernel time.\n"), newtime.tv_sec, newtime.tv_usec); + } + + if (!ctl->testing) { ++ const struct timezone tz_utc = { 0 }; + const struct timezone tz = { minuteswest }; + +- if (ctl->hctosys && !ctl->universal) /* set PCIL */ ++ /* warp-clock */ ++ if (ctl->universal) ++ rc = settimeofday(NULL, &tz_utc); /* lock to UTC */ ++ else ++ rc = settimeofday(NULL, &tz); /* set PCIL and TZ */ ++ ++ /* set timezone */ ++ if (!rc && ctl->universal && minuteswest) + rc = settimeofday(NULL, &tz); +- if (ctl->systz && ctl->universal) /* lock warp_clock */ +- rc = settimeofday(NULL, &tz_utc); ++ ++ /* set time */ + if (!rc && ctl->hctosys) +- rc = settimeofday(&newtime, &tz); +- else if (!rc) +- rc = settimeofday(NULL, &tz); ++ rc = settimeofday(&newtime, NULL); + + if (rc) { + warn(_("settimeofday() failed")); +-- +2.17.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb index e9c2d80..557449d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.34.bb @@ -8,6 +8,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:37 +0000 Subject: [oe-commits] [openembedded-core] 22/23: babeltrace: added ptest In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141316.EB3F0232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0ca1fc21fc5834ddb20eac0e1e95f43594b067ea Author: Anders Wallin AuthorDate: Thu Feb 20 06:23:44 2020 +0100 babeltrace: added ptest Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-kernel/lttng/babeltrace/run-ptest | 9 +++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 ++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 23865ac..752a088 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -61,6 +61,7 @@ PTESTS_FAST = "\ #" PTESTS_SLOW = "\ + babeltrace-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000..f4b7ce1 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index b6b7653..c050dc6 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -7,14 +7,92 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ + file://run-ptest \ + " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk" + +addtask do_patch_ptest_path after do_patch before do_configure +do_patch_ptest_path () { + for f in $(grep -l -r abs_top_srcdir ${S}/tests); do + sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} + done + + for f in $(grep -l -r abs_top_builddir ${S}/tests); do + sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} + done + for f in $(grep -l -r GREP ${S}/tests); do + sed -i 's:\@GREP\@:grep:' ${f} + done + + for f in $(grep -l -r SED ${S}/tests); do + sed -i 's:\@SED\@:sed:' ${f} + done +} + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + # Copy required files from source directory + for f in config/tap-driver.sh config/test-driver; do + install -D "${S}/$f" "${D}${PTEST_PATH}/$f" + done + install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" + cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ + ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/$(check_SCRIPTS)/s/^/#/' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Remove path to babeltrace. + for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do + sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} + done + for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do + sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} + done +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:38 +0000 Subject: [oe-commits] [openembedded-core] 23/23: oeqa/logparser: Fix performance issues with ptest log parsing In-Reply-To: <158220799527.30176.12204505474254370931@git.openembedded.org> References: <158220799527.30176.12204505474254370931@git.openembedded.org> Message-ID: <20200220141317.092C7232894@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4ea0f5bf84521f5f05d937371fd867842cff6eed Author: Richard Purdie AuthorDate: Thu Feb 20 13:57:50 2020 +0000 oeqa/logparser: Fix performance issues with ptest log parsing On the autobuilder a ptest log with 2.1 million lines took around 18 hours to process. This is clearly crazy. We can tweak the processing code to: a) Stop repeatedly joining large strings together (append to a list instead) b) Use one startswith expression instead of multiple re.search() operations With this change it takes 18 hours down to around 12s. [YOCTO #13696] Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 7313df8..5403721 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -25,13 +25,20 @@ class PtestParser(object): section_regex['exitcode'] = re.compile(r"^ERROR: Exit status is (.+)") section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") + # Cache markers so we don't take the re.search() hit all the time. + markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + def newsection(): - return { 'name': "No-section", 'log': "" } + return { 'name': "No-section", 'log': [] } current_section = newsection() with open(logfile, errors='replace') as f: for line in f: + if not line.startswith(markers): + current_section['log'].append(line) + continue + result = section_regex['begin'].search(line) if result: current_section['name'] = result.group(1) @@ -61,7 +68,7 @@ class PtestParser(object): current_section[t] = result.group(1) continue - current_section['log'] = current_section['log'] + line + current_section['log'].append(line) for t in test_regex: result = test_regex[t].search(line) @@ -70,6 +77,11 @@ class PtestParser(object): self.results[current_section['name']] = {} self.results[current_section['name']][result.group(1).strip()] = t + # Python performance for repeatedly joining long strings is poor, do it all at once at the end. + # For 2.1 million lines in a log this reduces 18 hours to 12s. + for section in self.sections: + self.sections[section]['log'] = "".join(self.sections[section]['log']) + return self.results, self.sections # Log the results as files. The file name is the section name and the contents are the tests in that section. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:58 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (8c965a1 -> 086e247) Message-ID: <158220803810.31201.4100068576283546061@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard 8c965a1 fetch2/svn: Avoid UnboundLocalError exception discard 68d2e8a runqueue: Possible tid handling optimisation add 16c4e93 fetch2/svn: Avoid UnboundLocalError exception new 086e247 runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8c965a1) \ N -- N -- N refs/heads/master-next (086e247) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 14:13:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 14:13:59 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158220803810.31201.4100068576283546061@git.openembedded.org> References: <158220803810.31201.4100068576283546061@git.openembedded.org> Message-ID: <20200220141358.3924F232892@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 086e24701b81d73ee290b5e0e4d7b9621c38ecc8 Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? 4.3 Message-ID: <158221140274.25589.8627043394862327646@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 5ab6f1e make: 4.2.1 -> 4.3 5ab6f1e is described below commit 5ab6f1e057c35f1e2b5fd8e7b0eec3988d370b88 Author: Jens Rehsack AuthorDate: Thu Feb 13 14:36:16 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ---------------------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ------------ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 10 ++++ 5 files changed, 11 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..a3eb9d9 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:39 +0000 Subject: [oe-commits] [meta-openembedded] 01/10: quagga: fix tmpfiles snippet to refer to /run instead of /var/run In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162238.B3AE82328A4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ff543375f47abc994c00e05f4f70d4a83c30a25a Author: Callaghan, Dan AuthorDate: Tue Feb 11 16:08:33 2020 +1000 quagga: fix tmpfiles snippet to refer to /run instead of /var/run This fixes a complaint from systemd on boot: systemd-tmpfiles[393]: [/etc/tmpfiles.d/quagga.conf:1] Line references path below legacy directory /var/run/, updating /var/run/quagga ? /run/quagga; please update the tmpfiles.d/ drop-in file accordingly. Signed-off-by: Dan Callaghan Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index dfd6aa7..2673a89 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -117,7 +117,7 @@ do_install () { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/run/quagga 0755 quagga quagga -" \ + echo "d /run/quagga 0755 quagga quagga -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:40 +0000 Subject: [oe-commits] [meta-openembedded] 02/10: quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162238.CEF4B2328A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 28a3bbff54bf8974a4eae42870cb118151b04ebe Author: Callaghan, Dan AuthorDate: Wed Feb 19 22:08:03 2020 +1000 quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d Package-owned tmpfiles snippets belong in /usr/lib/tmpfiles.d, /etc/tmpfiles.d is for administrator customisations. Signed-off-by: Dan Callaghan Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 2673a89..310bc7e 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -116,9 +116,9 @@ do_install () { done if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d + install -d ${D}${nonarch_libdir}/tmpfiles.d echo "d /run/quagga 0755 quagga quagga -" \ - > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf fi # Remove sysinit script if sysvinit is not in DISTRO_FEATURES @@ -166,6 +166,8 @@ FILES_${PN}-ospfclient = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.* FILES_${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \ ${sysconfdir}/init.d/watchquagga" +FILES_${PN} += "${nonarch_libdir}/tmpfiles.d/*.conf" + # Indicate that the default files are configuration files CONFFILES_${PN} = "${sysconfdir}/default/quagga \ ${sysconfdir}/quagga/bgpd.conf \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:38 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (7cd9fcb -> 71239cd) Message-ID: <158221575814.17383.13020036257968055651@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 7cd9fcb quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d discard 46e90f0 quagga: fix tmpfiles snippet to refer to /run instead of /var/run discard 33eeb4a libharu: New recipe new ff54337 quagga: fix tmpfiles snippet to refer to /run instead of /var/run new 28a3bbf quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d new c58d9d5 fio: remove disabling of compiler optimizations new 90d73b1 mbedtls: add native and nativesdk to BBCLASSEXTEND new 883966a libzip: upgrade 1.6.0 -> 1.6.1 new fd53a1a net-snmp: Add pkgconfig file support new 0845f5f libpeas: upgrade 1.24.1 -> 1.25.3 new 0daeae1 makedumpfile: upgrade 1.6.6 -> 1.6.7 new 746390a oprofile: Fix build with bfd 2.34+ new 71239cd python3-grpcio: fix do_compile error for native This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7cd9fcb) \ N -- N -- N refs/heads/master-next (71239cd) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-connectivity/mbedtls/mbedtls_2.16.3.bb | 2 + ...fig-support-for-building-applications-and.patch | 170 +++++++++++++++++++++ .../recipes-protocols/net-snmp/net-snmp_5.8.bb | 1 + meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 - .../libzip/{libzip_1.6.0.bb => libzip_1.6.1.bb} | 4 +- .../{libpeas_1.24.1.bb => libpeas_1.25.3.bb} | 4 +- ...0001-makedumpfile-replace-hardcode-CFLAGS.patch | 6 +- ...e-libebl-from-required-libraries-during-l.patch | 34 ----- ...makedumpfile_1.6.6.bb => makedumpfile_1.6.7.bb} | 5 +- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++ .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ------- meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 24 --- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 6 +- .../python/python3-grpcio_1.27.1.bb | 4 +- 15 files changed, 267 insertions(+), 126 deletions(-) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch rename meta-oe/recipes-extended/libzip/{libzip_1.6.0.bb => libzip_1.6.1.bb} (77%) rename meta-oe/recipes-gnome/libpeas/{libpeas_1.24.1.bb => libpeas_1.25.3.bb} (80%) delete mode 100644 meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch rename meta-oe/recipes-kernel/makedumpfile/{makedumpfile_1.6.6.bb => makedumpfile_1.6.7.bb} (88%) create mode 100644 meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch delete mode 100644 meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch delete mode 100644 meta-oe/recipes-support/libharu/libharu_2.3.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:41 +0000 Subject: [oe-commits] [meta-openembedded] 03/10: fio: remove disabling of compiler optimizations In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162238.E383E2328AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c58d9d500f90246d2d879e720fdfa5bbbc731c7f Author: onathan Richardson AuthorDate: Tue Feb 18 13:07:51 2020 -0800 fio: remove disabling of compiler optimizations Disabling compiler optimizations affects fio performance by 25-30% so remove this from EXTRA_OECONF. Disabling of optimizations should be machine specific if there are bugs in the code instead of the default. Optimizations were removed in this commit: https://git.openembedded.org/meta-openembedded/commit/?id=739349da0826221f98648b64b693f9ae33e7d4ea Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb index 482928c..b15d7ba 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -33,7 +33,6 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "--disable-optimizations" do_configure() { ./configure ${EXTRA_OECONF} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:42 +0000 Subject: [oe-commits] [meta-openembedded] 04/10: mbedtls: add native and nativesdk to BBCLASSEXTEND In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162238.EF1B92328AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 90d73b1b91c11a65e6247c35caacb583620f9a23 Author: Pierre-Jean Texier AuthorDate: Tue Feb 18 09:00:50 2020 +0000 mbedtls: add native and nativesdk to BBCLASSEXTEND Fixes: ERROR: Nothing PROVIDES 'mbedtls-native' Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb index 79d0dbe..99c1867 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb @@ -39,3 +39,5 @@ RPROVIDES_${PN} = "polarssl" PACKAGES =+ "${PN}-programs" FILES_${PN}-programs = "${bindir}/" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:43 +0000 Subject: [oe-commits] [meta-openembedded] 05/10: libzip: upgrade 1.6.0 -> 1.6.1 In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162239.094852328AF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 883966a8bf4dede057559d8fb903494f797cf3b5 Author: Pierre-Jean Texier AuthorDate: Tue Feb 18 09:28:58 2020 +0000 libzip: upgrade 1.6.0 -> 1.6.1 See https://github.com/nih-at/libzip/releases/tag/rel-1-6-1 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-extended/libzip/{libzip_1.6.0.bb => libzip_1.6.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/libzip/libzip_1.6.0.bb b/meta-oe/recipes-extended/libzip/libzip_1.6.1.bb similarity index 77% rename from meta-oe/recipes-extended/libzip/libzip_1.6.0.bb rename to meta-oe/recipes-extended/libzip/libzip_1.6.1.bb index e4c282f..41ad552 100644 --- a/meta-oe/recipes-extended/libzip/libzip_1.6.0.bb +++ b/meta-oe/recipes-extended/libzip/libzip_1.6.1.bb @@ -15,5 +15,5 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[md5sum] = "c0245c3e68e472d75d9f8572e24eb5d0" -SRC_URI[sha256sum] = "a6cd804b4b3cffd997bd563fec693eb7eb052c225909a98a620689c2befb699b" +SRC_URI[md5sum] = "f9a228619aab2446addc9c9e0e2de149" +SRC_URI[sha256sum] = "705dac7a671b3f440181481e607b0908129a9cf1ddfcba75d66436c0e7d33641" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:45 +0000 Subject: [oe-commits] [meta-openembedded] 07/10: libpeas: upgrade 1.24.1 -> 1.25.3 In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162239.27EE52328B5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0845f5f77c90df04f7b477143c412522a6d8b200 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:40:20 2020 -0800 libpeas: upgrade 1.24.1 -> 1.25.3 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-gnome/libpeas/{libpeas_1.24.1.bb => libpeas_1.25.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb similarity index 80% rename from meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb rename to meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb index 6c8e0e0..57419a4 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb @@ -10,8 +10,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache -SRC_URI[archive.md5sum] = "bbecf334a7333d0a5d4d655ba38be9b4" -SRC_URI[archive.sha256sum] = "9c3acf7a567cbb4f8bf62b096e013f12c3911cc850c3fa9900cbd5aa4f6ec284" +SRC_URI[archive.md5sum] = "08bfff8f9688cf630dcb0f950617661f" +SRC_URI[archive.sha256sum] = "1c9bbb29740c29cd6e1dd0c9964722ff08cd5e6f68f1b5c135bc391a6ce97639" PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:44 +0000 Subject: [oe-commits] [meta-openembedded] 06/10: net-snmp: Add pkgconfig file support In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162239.1BE472328B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fd53a1ab86839930219017c16d4441289e4cace6 Author: Jeremy Puhlman AuthorDate: Wed Feb 19 16:29:12 2020 -0800 net-snmp: Add pkgconfig file support Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- ...fig-support-for-building-applications-and.patch | 170 +++++++++++++++++++++ .../recipes-protocols/net-snmp/net-snmp_5.8.bb | 1 + 2 files changed, 171 insertions(+) diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch new file mode 100644 index 0000000..6cb9588 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch @@ -0,0 +1,170 @@ +From aea8c2f0bf8004c8da8ca9acb04ab07798cd8068 Mon Sep 17 00:00:00 2001 +From: Hugh McMaster +Date: Wed, 3 Apr 2019 21:36:03 +1100 +Subject: [PATCH] Add pkg-config support for building applications and + sub-agents + +The netsnmp package should be used when building Net-SNMP applications. +The netsnmp-agent package should be used when building Net-SNMP subagents. + +Signed-off-by: Hugh McMaster +[ bvanassche: edited makefile code and .pc files; added ./configure changes ] + + +Upstream-Status: Backport +https://sourceforge.net/p/net-snmp/patches/_discuss/thread/a0d66e91dd/f940/attachment/0001-Add-pkg-config-support-for-building-applications-and.patch + +--- + Makefile.in | 2 ++ + Makefile.rules | 30 ++++++++++++++++++++++++++---- + configure | 4 ++++ + configure.ac | 1 + + netsnmp-agent.pc.in | 12 ++++++++++++ + netsnmp.pc.in | 12 ++++++++++++ + 6 files changed, 57 insertions(+), 4 deletions(-) + create mode 100644 netsnmp-agent.pc.in + create mode 100644 netsnmp.pc.in + +diff --git a/Makefile.in b/Makefile.in +index 9dbdde1353b1..ec972636c279 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -35,6 +35,7 @@ INSTALLBUILTHEADERS=include/net-snmp/net-snmp-config.h + INSTALLBUILTINCLUDEHEADERS=@FEATUREHEADERS@ + INSTALLBINSCRIPTS=net-snmp-config net-snmp-create-v3-user + INSTALLUCDHEADERS=ucd-snmp-config.h version.h mib_module_config.h ++INSTALL_PKGCONFIG=netsnmp.pc netsnmp-agent.pc + + # + # other install rules. +@@ -275,6 +276,7 @@ configclean: makefileclean + libtool include/net-snmp/net-snmp-config.h \ + net-snmp-config net-snmp-config-x configure-summary \ + net-snmp-create-v3-user net-snmp-create-v3-user-x ++ rm -f *.pc + rm -f mibs/.index + rm -f include/net-snmp/agent/mib_module_config.h \ + include/net-snmp/agent/agent_module_config.h \ +diff --git a/Makefile.rules b/Makefile.rules +index 9e9e9009e5d2..e714f91e725e 100644 +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -85,12 +85,14 @@ subdirs: + # installlibs handles local, ucd and subdir libs. need to do subdir libs + # before bins, sinze those libs may be needed for successful linking + install: installlocalheaders @installucdheaders@ \ +- installlibs \ +- installlocalbin installlocalsbin \ ++ installlibs install_pkgconfig \ ++ installlocalbin installlocalsbin \ + installsubdirs $(OTHERINSTALL) + +-uninstall: uninstalllibs uninstallbin uninstallsbin uninstallheaders \ +- uninstallsubdirs $(OTHERUNINSTALL) ++uninstall: uninstalllibs uninstall_pkgconfig \ ++ uninstallbin uninstallsbin \ ++ uninstallheaders \ ++ uninstallsubdirs $(OTHERUNINSTALL) + + installprogs: installbin installsbin + +@@ -287,6 +289,26 @@ uninstalllibs: + done \ + fi + ++# ++# pkg-config files ++# ++install_pkgconfig: $(INSTALL_PKGCONFIG) ++ @if test "x$(INSTALL_PKGCONFIG)" != x; then \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir)/pkgconfig; \ ++ for i in $(INSTALL_PKGCONFIG); do \ ++ echo "installing $$i in $(INSTALL_PREFIX)$(libdir)/pkgconfig"; \ ++ done; \ ++ $(INSTALL) $(INSTALL_PKGCONFIG) $(INSTALL_PREFIX)$(libdir)/pkgconfig; \ ++ fi ++ ++uninstall_pkgconfig: ++ @if test "x$(INSTALL_PKGCONFIG)" != x; then \ ++ for i in $(INSTALL_PKGCONFIG); do \ ++ echo "removing $$i from $(INSTALL_PREFIX)$(libdir)/pkgconfig"; \ ++ $(UNINSTALL) $(INSTALL_PREFIX)$(libdir)/pkgconfig/$$i;\ ++ done; \ ++ fi ++ + # + # normal bin binaries + # +diff --git a/configure b/configure +index 5ec44f5ce082..5103a4dc9d88 100755 +--- a/configure ++++ b/configure +@@ -30422,6 +30422,8 @@ ac_config_files="$ac_config_files net-snmp-config:net-snmp-config.in" + + ac_config_files="$ac_config_files net-snmp-create-v3-user:net-snmp-create-v3-user.in" + ++ac_config_files="$ac_config_files netsnmp.pc:netsnmp.pc.in netsnmp-agent.pc:netsnmp-agent.pc.in" ++ + ac_config_files="$ac_config_files dist/generation-scripts/gen-variables:dist/generation-scripts/gen-variables.in" + + ac_config_files="$ac_config_files local/snmpconf" +@@ -31445,6 +31447,8 @@ do + "mibs/Makefile") CONFIG_FILES="$CONFIG_FILES mibs/Makefile:Makefile.top:mibs/Makefile.in:Makefile.rules" ;; + "net-snmp-config") CONFIG_FILES="$CONFIG_FILES net-snmp-config:net-snmp-config.in" ;; + "net-snmp-create-v3-user") CONFIG_FILES="$CONFIG_FILES net-snmp-create-v3-user:net-snmp-create-v3-user.in" ;; ++ "netsnmp.pc") CONFIG_FILES="$CONFIG_FILES netsnmp.pc:netsnmp.pc.in" ;; ++ "netsnmp-agent.pc") CONFIG_FILES="$CONFIG_FILES netsnmp-agent.pc:netsnmp-agent.pc.in" ;; + "dist/generation-scripts/gen-variables") CONFIG_FILES="$CONFIG_FILES dist/generation-scripts/gen-variables:dist/generation-scripts/gen-variables.in" ;; + "local/snmpconf") CONFIG_FILES="$CONFIG_FILES local/snmpconf" ;; + "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; +diff --git a/configure.ac b/configure.ac +index 4c4dce09d488..d62a02da5d88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -136,6 +136,7 @@ AC_CONFIG_FILES([net-snmp-config:net-snmp-config.in], + [chmod +x net-snmp-config]) + AC_CONFIG_FILES([net-snmp-create-v3-user:net-snmp-create-v3-user.in], + [chmod +x net-snmp-create-v3-user]) ++AC_CONFIG_FILES([netsnmp.pc:netsnmp.pc.in netsnmp-agent.pc:netsnmp-agent.pc.in]) + AC_CONFIG_FILES([dist/generation-scripts/gen-variables:dist/generation-scripts/gen-variables.in]) + AC_CONFIG_FILES([local/snmpconf]) + +diff --git a/netsnmp-agent.pc.in b/netsnmp-agent.pc.in +new file mode 100644 +index 000000000000..3a1c77bbf814 +--- /dev/null ++++ b/netsnmp-agent.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++includedir=@includedir@ ++libdir=@libdir@ ++ ++Name: netsnmp-agent (@PACKAGE_NAME@) ++Description: SNMP (Simple Network Management Protocol) sub-agent SDK. ++URL: http://www.net-snmp.org ++Version: @PACKAGE_VERSION@ ++Cflags: -I${includedir} ++Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp ++Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ +diff --git a/netsnmp.pc.in b/netsnmp.pc.in +new file mode 100644 +index 000000000000..0a1f5785a4f4 +--- /dev/null ++++ b/netsnmp.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++includedir=@includedir@ ++libdir=@libdir@ ++ ++Name: netsnmp (@PACKAGE_NAME@) ++Description: SNMP (Simple Network Management Protocol) daemon and applications. ++URL: http://www.net-snmp.org ++Version: @PACKAGE_VERSION@ ++Cflags: -I${includedir} ++Libs: -L${libdir} -lnetsnmp ++Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ +-- +2.21.0.196.g041f5ea1cf98 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb index 192b6b5..317350e 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb @@ -27,6 +27,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://reproducibility-have-printcap.patch \ file://reproducibility-accept-configure-options-from-env.patch \ file://0001-net-snmp-fix-compile-error-disable-des.patch \ + file://0001-Add-pkg-config-support-for-building-applications-and.patch \ " SRC_URI[md5sum] = "63bfc65fbb86cdb616598df1aff6458a" SRC_URI[sha256sum] = "b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:46 +0000 Subject: [oe-commits] [meta-openembedded] 08/10: makedumpfile: upgrade 1.6.6 -> 1.6.7 In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162239.330232328B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0daeae19f694d45116e8ce509c64657b280e7f27 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:40:21 2020 -0800 makedumpfile: upgrade 1.6.6 -> 1.6.7 refresh the following patch: 0001-makedumpfile-replace-hardcode-CFLAGS.patch 0003-build-Delete-libebl-from-required-libraries-during-l.patch removed since it is included in 1.6.7 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...0001-makedumpfile-replace-hardcode-CFLAGS.patch | 6 ++-- ...e-libebl-from-required-libraries-during-l.patch | 34 ---------------------- ...makedumpfile_1.6.6.bb => makedumpfile_1.6.7.bb} | 5 ++-- 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index c0f82f3..ff093a7 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -83,7 +83,7 @@ index 1fdb628..5dce589 100644 OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) @@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) - LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz + LIBS = -ldw -lbz2 -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) -LIBS := -static $(LIBS) +LIBS := $(LIBS) @@ -102,7 +102,7 @@ index 1fdb628..5dce589 100644 endif LIBS := -lpthread $(LIBS) -@@ -82,14 +83,14 @@ LIBS := $(LIBS) $(call try-run,\ +@@ -87,14 +88,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -119,7 +119,7 @@ index 1fdb628..5dce589 100644 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -100,7 +101,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) +@@ -105,7 +106,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch deleted file mode 100644 index 4095643..0000000 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 460851c15e807d1a2515dfb985423f8a6624f4aa Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 8 Jan 2020 19:14:19 -0800 -Subject: [PATCH 3/3] build: Delete libebl from required libraries during link - -This is a static library from elfutils, which is not made available when -static archives are disabled, this can result in link failures e.g. - -aarch64-yoe-linux-musl/9.2.0/ld: cannot find -lebl -collect2: error: ld returned 1 exit status -Makefile:93: recipe for target 'makedumpfile' failed - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 5dce589..c3a4054 100644 ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) - SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c - OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) - --LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz -+LIBS = -ldw -lbz2 -ldl -lelf -lz - ifneq ($(LINKTYPE), dynamic) - LIBS := $(LIBS) - endif --- -2.24.1 - diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb similarity index 88% rename from meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb rename to meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb index 6924e39..8d1676a 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb @@ -24,10 +24,9 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ - file://0003-build-Delete-libebl-from-required-libraries-during-l.patch \ " -SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064" -SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324" +SRC_URI[md5sum] = "808ef840ca49ca6bfde77c097cf429f5" +SRC_URI[sha256sum] = "e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/" UPSTREAM_CHECK_REGEX = "makedumpfile/(?P\d+(\.\d+)+)/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:47 +0000 Subject: [oe-commits] [meta-openembedded] 09/10: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162239.3D4C02328B7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 746390a8c9c1cd64bbcf7e1efc385570ded47633 Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:22:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:22:48 +0000 Subject: [oe-commits] [meta-openembedded] 10/10: python3-grpcio: fix do_compile error for native In-Reply-To: <158221575814.17383.13020036257968055651@git.openembedded.org> References: <158221575814.17383.13020036257968055651@git.openembedded.org> Message-ID: <20200220162239.4675D2328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 71239cd350068b2142d577dacfd08a52eb2014e8 Author: Qi.Chen at windriver.com AuthorDate: Thu Feb 20 18:49:10 2020 +0800 python3-grpcio: fix do_compile error for native When building python3-grpcio-native, we will meet do_compile error because of no 'cc'. In fact, 'cc' is not in our hosttools. So fix to use gcc and make the patch also apply to native. Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- .../0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 6 +++--- meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 131daac..f39a82a 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -1,4 +1,4 @@ -From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 +1From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Aug 2017 09:04:07 -0700 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options @@ -24,7 +24,7 @@ Signed-off-by: Khem Raj def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') - cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], @@ -57,7 +57,7 @@ Signed-off-by: Khem Raj """ # TODO(lidiz) Remove the generated a.out for success tests. - cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb index bc2b70c..42260cb 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "${PYTHON_PN}-protobuf" -SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ - file://ppc-boringssl-support.patch \ +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" +SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \ file://riscv64_support.patch \ " SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:43:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:43:10 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (5ab6f1e -> 09558d5) Message-ID: <158221699053.13264.10098657502645476529@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 5ab6f1e make: 4.2.1 -> 4.3 new 09558d5 wayland: convert to meson build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5ab6f1e) \ N -- N -- N refs/heads/master-next (09558d5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ++++++++++++++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ++++ meta/recipes-devtools/make/make_4.3.bb | 10 ---- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++++++ ...-find-the-native-wayland-scanner-directly.patch | 27 +++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ---------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++-- 9 files changed, 182 insertions(+), 48 deletions(-) create mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make_4.2.1.bb delete mode 100644 meta/recipes-devtools/make/make_4.3.bb create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 16:43:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 16:43:11 +0000 Subject: [oe-commits] [openembedded-core] 01/01: wayland: convert to meson build In-Reply-To: <158221699053.13264.10098657502645476529@git.openembedded.org> References: <158221699053.13264.10098657502645476529@git.openembedded.org> Message-ID: <20200220164310.E31192328A4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 09558d588cc9a4dd81f621a6375a5f2caa70fe8b Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:43 2020 +0100 wayland: convert to meson build Replace an autotools-specific .pc adjustment patch with a meson-specific one. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++++++++++++++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ---------------------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++++---- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch new file mode 100644 index 0000000..2199548 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -0,0 +1,26 @@ +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Feb 2020 21:46:18 +0100 +Subject: [PATCH] Do not hardcode the path to wayland-scanner + +This results in host contamination during builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 294aee0..7e410fa 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,7 +49,7 @@ pkgconfig.generate( + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000..f98037a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d..0000000 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075..a702b3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 18:17:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 18:17:50 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (71239cd -> c4d1dcc) Message-ID: <158222267033.19437.1051138371212761418@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 71239cd python3-grpcio: fix do_compile error for native new c2904a2 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher new c4d1dcc s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../packagegroups/packagegroup-meta-oe.bb | 8 +- .../files/0001-ppt.c-Do-not-include-sys-io.h.patch | 28 - .../samsung-soc-utils/s3c24xx-gpio_svn.bb | 22 - .../samsung-soc-utils/s3c64xx-gpio_svn.bb | 21 - .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 40 -- .../usbpath/usbpath/configure.patch | 11 - meta-oe/recipes-support/usbpath/usbpath_svn.bb | 21 - .../0001-makefile-Pass-CFLAGS-to-compile.patch | 26 - .../0002-fix-err-API-to-have-format-string.patch | 656 --------------------- meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb | 25 - 10 files changed, 4 insertions(+), 854 deletions(-) delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb delete mode 100644 meta-oe/recipes-support/usbpath/usbpath/configure.patch delete mode 100644 meta-oe/recipes-support/usbpath/usbpath_svn.bb delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 18:17:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 18:17:51 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher In-Reply-To: <158222267033.19437.1051138371212761418@git.openembedded.org> References: <158222267033.19437.1051138371212761418@git.openembedded.org> Message-ID: <20200220181750.890D42328AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c2904a2eb7b55cb69346942849b837a8937441b6 Author: Martin Jansa AuthorDate: Thu Feb 20 18:52:34 2020 +0100 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher * svn checkouts from http://svn.openmoko.org/ are now redirected to github: svn --non-interactive --trust-server-cert co --no-auth-cache --ignore-externals -r 4949 http://svn.openmoko.org/trunk/src/target/gpio at 4949 gpio Redirecting to URL 'https://github.com/openmoko/openmoko-svn': A gpio/branches A gpio/branches/oe A gpio/branches/oe/pre-20070305 A gpio/branches/oe/pre-20070305/README A gpio/branches/oe/pre-20070305/classes A gpio/branches/oe/pre-20070305/classes/autotools.bbclass A gpio/branches/oe/pre-20070305/classes/base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-panel-plugin.bbclass * unfortunately this is causing the checkout to start from trunk, not the subdirectory specified in the URL (e.g. /trunk/src/target/gpio) and then S variable points to incorrect directory as discussed here: http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205028.html * use git fetcher directly to remove the dependency on subversion-native * for simplicity use the same SRCREV and PV for all of these, there wasn't any commit in last 8 years (not anyone can expect new commits), I don't expect anyone nowadays actually using these recipes which I've imported from meta-smartphone in 2011 - that's why I will send their removal in follow-up commit. Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 +++---- .../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +++--- ...2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++++------ .../usbpath/{usbpath_svn.bb => usbpath_git.bb} | 10 +++++----- .../wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 ++++++------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb similarity index 73% rename from meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb rename to meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb index 255754d..98573a0 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb @@ -3,11 +3,10 @@ SECTION = "console/utils" AUTHOR = "Werner Almesberger " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" -PR = "r2" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" S = "${WORKDIR}/gpio" CLEANBROKEN = "1" diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb similarity index 74% rename from meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb rename to meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb index 976a4f1..9978171 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb @@ -3,10 +3,10 @@ SECTION = "console/utils" AUTHOR = "Werner Almesberger " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" S = "${WORKDIR}/gpio" CLEANBROKEN = "1" diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb similarity index 78% rename from meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb rename to meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb index 3a5172e..2837403 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb @@ -3,13 +3,12 @@ SECTION = "devel" AUTHOR = "Harald Welte " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -SRCREV = "4268" -PV = "0.1+svnr${SRCPV}" -PR = "r1" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ - " +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ + file://0001-ppt.c-Do-not-include-sys-io.h.patch \ +" S = "${WORKDIR}/sjf2410-linux" inherit native deploy diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb similarity index 68% rename from meta-oe/recipes-support/usbpath/usbpath_svn.bb rename to meta-oe/recipes-support/usbpath/usbpath_git.bb index 6c9cd04..a3c7590 100644 --- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb +++ b/meta-oe/recipes-support/usbpath/usbpath_git.bb @@ -8,12 +8,12 @@ DEPENDS_class-native = "virtual/libusb0-native" BBCLASSEXTEND = "native" -SRCREV = "3172" -PV = "0.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \ - file://configure.patch" +PV = "1.0+git${SRCPV}" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ + file://configure.patch \ +" S = "${WORKDIR}/usbpath" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb similarity index 58% rename from meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb rename to meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb index c66572b..23273ca 100644 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +++ b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb @@ -2,14 +2,13 @@ SUMMARY = "Atheros 6K Wifi configuration utility" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" SECTION = "console/network" -SRCREV = "5394" -PV = "0.0.0+svnr${SRCPV}" -PR = "r2" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ - " +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ + file://0001-makefile-Pass-CFLAGS-to-compile.patch \ + file://0002-fix-err-API-to-have-format-string.patch \ +" S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" CLEANBROKEN = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 18:17:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 18:17:52 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes In-Reply-To: <158222267033.19437.1051138371212761418@git.openembedded.org> References: <158222267033.19437.1051138371212761418@git.openembedded.org> Message-ID: <20200220181750.9DCCE2328AF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c4d1dcc425557d4442c0262309e7f7aa2e71a1e1 Author: Martin Jansa AuthorDate: Thu Feb 20 18:52:35 2020 +0100 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes * I don't expect anyone nowadays actually using these recipes which I've imported from meta-smartphone in 2011. Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-oe.bb | 8 +- .../files/0001-ppt.c-Do-not-include-sys-io.h.patch | 28 - .../samsung-soc-utils/s3c24xx-gpio_git.bb | 21 - .../samsung-soc-utils/s3c64xx-gpio_git.bb | 21 - .../samsung-soc-utils/sjf2410-linux-native_git.bb | 39 -- .../usbpath/usbpath/configure.patch | 11 - meta-oe/recipes-support/usbpath/usbpath_git.bb | 21 - .../0001-makefile-Pass-CFLAGS-to-compile.patch | 26 - .../0002-fix-err-API-to-have-format-string.patch | 656 --------------------- meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb | 24 - 10 files changed, 4 insertions(+), 851 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d2e8ea4..0bda946 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -254,13 +254,13 @@ RDEPENDS_packagegroup-meta-oe-support ="\ multipath-tools nano neon nmon numactl onig openct openldap \ opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ - pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \ - sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ + pv pxaregs raptor2 rdfind read-edid rsnapshot \ + satyr sdparm pty-forward-native serial-forward \ sg3-utils sharutils smem spitools srecord ssiapi stm32flash \ syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ tree uhubctl unixodbc uriparser usb-modeswitch \ - usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ - vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \ + usb-modeswitch-data uthash utouch-evemu utouch-frame \ + vim vim-tiny websocketpp xdelta3 xdg-user-dirs xmlstarlet \ zbar zile \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis toscoterm uim synergy utouch-mtview links-x11 fltk pidgin-otr", "", d)} \ libcanberra \ diff --git a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch b/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch deleted file mode 100644 index 4e6c250..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd244ae648789591f0fb79e74d2b8f6c5b15d6e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 00:47:14 +0000 -Subject: [PATCH] ppt.c: Do not include sys/io.h - -newer versions of glibc has removed it - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - ppt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ppt.c b/ppt.c -index 0bae2d0..0ef279f 100644 ---- a/ppt.c -+++ b/ppt.c -@@ -5,7 +5,6 @@ - #else - #include - #include --#include - #include - #include - #include --- -2.17.1 - diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb deleted file mode 100644 index 98573a0..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb deleted file mode 100644 index 9978171..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb deleted file mode 100644 index 2837403..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "JTAG utility to interface w/ a S3C2410 device" -SECTION = "devel" -AUTHOR = "Harald Welte " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ -" -S = "${WORKDIR}/sjf2410-linux" - -inherit native deploy - -CFLAGS += "-DLINUX_PPDEV" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 sjf2410 ${D}/${bindir} -} - -do_deploy() { - install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} -} - -addtask deploy before do_build after do_install - -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" -# cleandirs should possibly be in deploy.bbclass but we need it -do_deploy[cleandirs] = "${DEPLOYDIR}" -# clear stamp-extra-info since MACHINE_ARCH is normally put there by -# deploy.bbclass -do_deploy[stamp-extra-info] = "" - diff --git a/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-oe/recipes-support/usbpath/usbpath/configure.patch deleted file mode 100644 index 271e6a5..0000000 --- a/meta-oe/recipes-support/usbpath/usbpath/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: usbpath/configure.ac -=================================================================== ---- usbpath.orig/configure.ac 2014-07-17 20:40:26.000000000 +0000 -+++ usbpath/configure.ac 2014-07-18 07:01:40.933474420 +0000 -@@ -1,5 +1,5 @@ - AC_INIT([usbpath],[0.1]) --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_RANLIB diff --git a/meta-oe/recipes-support/usbpath/usbpath_git.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb deleted file mode 100644 index a3c7590..0000000 --- a/meta-oe/recipes-support/usbpath/usbpath_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Convert the physical locations of a USB device to/from its number" -AUTHOR = "Werner Almesberger " -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" -DEPENDS = "virtual/libusb0" -DEPENDS_class-native = "virtual/libusb0-native" - -BBCLASSEXTEND = "native" - -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ - file://configure.patch \ -" -S = "${WORKDIR}/usbpath" - -inherit autotools pkgconfig - -RDEPENDS_${PN} += "perl" diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch deleted file mode 100644 index 90eff5b..0000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0378cbb323c662a565f7f3de2dee3d8a646e7bd1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 09:32:42 -0700 -Subject: [PATCH 1/2] makefile: Pass CFLAGS to compile - -Set CC if not already set - -Signed-off-by: Khem Raj ---- - host/tools/wmiconfig/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/tools/wmiconfig/Makefile b/host/tools/wmiconfig/Makefile -index c6738c5..3253a7e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CC :=$(ATH_CROSS_COMPILE_TYPE)gcc -+CC ?= $(ATH_CROSS_COMPILE_TYPE)gcc - - all: -- $(CC) -Wall -DUSER_KEYS -g $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig -+ $(CC) -Wall -DUSER_KEYS -g $(CFLAGS) $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch deleted file mode 100644 index f67f784..0000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch +++ /dev/null @@ -1,656 +0,0 @@ -From 909ebdde4ee2233d65de8fa01fde8e9a3bec12b7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 09:33:26 -0700 -Subject: [PATCH 2/2] fix err() API to have format string - -Fixes errors with hardening flags - -Signed-off-by: Khem Raj ---- - host/tools/wmiconfig/wmiconfig.c | 148 +++++++++++++++++++-------------------- - 1 file changed, 74 insertions(+), 74 deletions(-) - -diff --git a/host/tools/wmiconfig/wmiconfig.c b/host/tools/wmiconfig/wmiconfig.c -index 21c9dcd..a6ec481 100644 ---- a/wmiconfig.c -+++ b/wmiconfig.c -@@ -483,7 +483,7 @@ main (int argc, char **argv) - strcpy(ifname, ethIf); - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) { -- err(1, "socket"); -+ err(1, "%s", "socket"); - } - - while (1) { -@@ -1506,28 +1506,28 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)filterCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETBSSFILTER, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWER_MODE: - ifr.ifr_data = (void *)pwrCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETPWR, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PM_PARAMS: - ifr.ifr_data = (void *)pmParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PMPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_IBSS_PM_CAPS: - ifr.ifr_data = (void *)adhocPmCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ERROR_DETECTION: -@@ -1535,7 +1535,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_HB_CHALLENGE_RESP: -@@ -1543,7 +1543,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - #ifdef USER_KEYS -@@ -1554,7 +1554,7 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - break; -@@ -1575,7 +1575,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)sParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETSCAN, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_VERSION: -@@ -1586,7 +1586,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)revinfo; - if (ioctl(s, AR6000_IOCTL_WMI_GETREV, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Host Rev = 0x%x(%u.%u.%u.%u), Target Rev = 0x%x(%u.%u.%u.%u)\n", - revinfo->host_ver, -@@ -1606,14 +1606,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)listenCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETLISTENINT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BMISS_TIME: - ifr.ifr_data = (void *)bmissCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BMISS_TIME, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RSSI_THRESHOLDS: -@@ -1621,14 +1621,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SNR_THRESHOLDS: - ifr.ifr_data = (void *)snrThresholdParam; - if (ioctl(s, AR6000_IOCTL_WMI_SET_SNRTHRESHOLD, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CLR_RSSISNR: -@@ -1636,7 +1636,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LQ_THRESHOLDS: -@@ -1644,7 +1644,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_CHANNEL: -@@ -1693,18 +1693,18 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_WMI_SET_CHANNELPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SSID: - if (index > MAX_PROBED_SSID_INDEX) { - printf("num option for ssid command too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - if (strlen((char *)ssid) > sizeof (ssidCmd->ssid)) { - printf("ssid name too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - ssidCmd->entryIndex = index; -@@ -1722,7 +1722,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ssidCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PROBEDSSID, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BADAP: -@@ -1735,7 +1735,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)badApCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BADAP, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CREATE_QOS: -@@ -1794,7 +1794,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)crePStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_CREATE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_TARGET_STATS: -@@ -1807,7 +1807,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)&tgtStatsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_TARGET_STATS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printTargetStats(&(tgtStatsCmd.targetStats)); - break; -@@ -1815,7 +1815,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)pBitMask; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DELETE_QOS: -@@ -1824,7 +1824,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)delPStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_DELETE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_QOS_QUEUE: -@@ -1840,7 +1840,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)getQosQueueCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_QOS_QUEUE, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - printf("Active TSIDs \n"); -@@ -1855,7 +1855,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ieInfo; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ASSOC_INFO, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AC_PARAMS: -@@ -1871,14 +1871,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)acParamsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ACCESS_PARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_DISC_TIMEOUT: - ifr.ifr_data = (void *)discCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_DISC_TIMEOUT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ADHOC_BSSID: -@@ -1887,7 +1887,7 @@ main (int argc, char **argv) - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { - printf("fail to set adhoc bssid \n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_OPT_MODE: -@@ -1895,7 +1895,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_OPT_SEND_FRAME: -@@ -1903,7 +1903,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BEACON_INT: -@@ -1911,7 +1911,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_VOICE_PKT_SIZE: -@@ -1919,7 +1919,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MAX_SP: -@@ -1927,7 +1927,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_TBL: -@@ -1935,7 +1935,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ROAM_CTRL: -@@ -1943,7 +1943,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWERSAVE_TIMERS: -@@ -1951,7 +1951,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_POWER_MODE: -@@ -1959,7 +1959,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Power mode is %s\n", - (getPowerMode->powerMode == MAX_PERF_POWER) ? "maxperf" : "rec"); -@@ -1969,7 +1969,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_DATA: -@@ -1977,7 +1977,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_STATUS: -@@ -1985,7 +1985,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_PARAMS: -@@ -1993,7 +1993,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RETRYLIMITS: -@@ -2001,14 +2001,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_START_SCAN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_STARTSCAN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_FIX_RATES: -@@ -2031,14 +2031,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_FIX_RATES: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GETFIXRATES; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } else { - int i; - printf("Fix rate set index:"); -@@ -2057,7 +2057,7 @@ main (int argc, char **argv) - index--; - setAuthMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_REASSOC_MODE: -@@ -2067,42 +2067,42 @@ main (int argc, char **argv) - index--; - setReassocMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LPREAMBLE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_LPREAMBLE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RTS: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_RTS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WMM: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WMM; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_TXOP: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_TXOP; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_READ: - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("diagdata: 0x%x\n", *diagdata); - break; -@@ -2110,7 +2110,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_WRITE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_RD: -@@ -2118,7 +2118,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - else - { -@@ -2139,14 +2139,14 @@ main (int argc, char **argv) - index--; - setKeepAlive->keepaliveInterval = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_KEEPALIVE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_KEEPALIVE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Keepalive interval is %d secs and AP is %s\n", - getKeepAlive->keepaliveInterval, (getKeepAlive->configured ? -@@ -2156,63 +2156,63 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_APPIE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MGMT_FRM_RX_FILTER: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_CFG_MODULE: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_CFG_MODULE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_GET_DEBUG_LOGS: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_HOST_SLEEP_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WOW_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WOW_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_ADD_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_ADD_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DEL_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_DEL_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_WOW_LIST: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_WOW_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_DUMP_CHIP_MEM: -@@ -2225,7 +2225,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("0x%04x:0x%04x\n", *diagaddr, *diagdata); - } -@@ -2237,21 +2237,21 @@ main (int argc, char **argv) - index = optind - 1; - *connectCtrlFlags = strtoul(argv[index], NULL, 0); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DUMP_HTC_CREDITS: - ((int *)buf)[0] = AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AKMP_INFO: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_AKMP_PARAMS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PMKID_LIST: -@@ -2259,7 +2259,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - } else { - printf("No PMKIDs entered\n"); -@@ -2269,7 +2269,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BSS_PMKID_INFO: -@@ -2277,7 +2277,7 @@ main (int argc, char **argv) - iwr.u.data.length = sizeof(*pi_cmd); - if (ioctl(s, IEEE80211_IOCTL_ADDPMKID, &iwr) < 0) { - printf("ADDPMKID IOCTL Error\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - default: --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb deleted file mode 100644 index 23273ca..0000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Atheros 6K Wifi configuration utility" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" -SECTION = "console/network" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ -" -S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" - -CLEANBROKEN = "1" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 wmiconfig ${D}${bindir} -} - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:16:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:16:06 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (09558d5 -> 85281f8) Message-ID: <158224056672.1335.259793796952814918@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 09558d5 wayland: convert to meson build discard 4ea0f5b oeqa/logparser: Fix performance issues with ptest log parsing discard 0ca1fc2 babeltrace: added ptest discard 461d4b7 util-linux: fix hwclock settimeofday error discard 8f76b77 mc: upgrade 4.8.23 -> 4.8.24 new d56aa6d util-linux: fix hwclock settimeofday error new 6eacf9e babeltrace: added ptest new fca9ae6 oeqa/logparser: Fix performance issues with ptest log parsing new 6844ad9 wayland: convert to meson build new 85281f8 wayland: Fix strndup detection on MinGW This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (09558d5) \ N -- N -- N refs/heads/master-next (85281f8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...0001-Add-option-to-control-configure-args.patch | 99 +++++++++++++++++++ ...et-3629-configure.ac-drop-bundled-gettext.patch | 110 +++++++++++++++++++++ .../mc/{mc_4.8.24.bb => mc_4.8.23.bb} | 6 +- ...0001-build-Fix-strndup-detection-on-MinGW.patch | 39 ++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + 5 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch create mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch rename meta/recipes-extended/mc/{mc_4.8.24.bb => mc_4.8.23.bb} (88%) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:16:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:16:08 +0000 Subject: [oe-commits] [openembedded-core] 02/05: babeltrace: added ptest In-Reply-To: <158224056672.1335.259793796952814918@git.openembedded.org> References: <158224056672.1335.259793796952814918@git.openembedded.org> Message-ID: <20200220231607.2AD572328B5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6eacf9e78d0025732e405b0e069e0a01540274dd Author: Anders Wallin AuthorDate: Thu Feb 20 06:23:44 2020 +0100 babeltrace: added ptest Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-kernel/lttng/babeltrace/run-ptest | 9 +++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 ++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 23865ac..752a088 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -61,6 +61,7 @@ PTESTS_FAST = "\ #" PTESTS_SLOW = "\ + babeltrace-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000..f4b7ce1 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index b6b7653..c050dc6 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -7,14 +7,92 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ + file://run-ptest \ + " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk" + +addtask do_patch_ptest_path after do_patch before do_configure +do_patch_ptest_path () { + for f in $(grep -l -r abs_top_srcdir ${S}/tests); do + sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} + done + + for f in $(grep -l -r abs_top_builddir ${S}/tests); do + sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} + done + for f in $(grep -l -r GREP ${S}/tests); do + sed -i 's:\@GREP\@:grep:' ${f} + done + + for f in $(grep -l -r SED ${S}/tests); do + sed -i 's:\@SED\@:sed:' ${f} + done +} + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + # Copy required files from source directory + for f in config/tap-driver.sh config/test-driver; do + install -D "${S}/$f" "${D}${PTEST_PATH}/$f" + done + install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" + cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ + ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/$(check_SCRIPTS)/s/^/#/' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Remove path to babeltrace. + for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do + sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} + done + for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do + sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} + done +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:16:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:16:07 +0000 Subject: [oe-commits] [openembedded-core] 01/05: util-linux: fix hwclock settimeofday error In-Reply-To: <158224056672.1335.259793796952814918@git.openembedded.org> References: <158224056672.1335.259793796952814918@git.openembedded.org> Message-ID: <20200220231607.1DCDB2328B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d56aa6de2a0caa113b880403ad145834d912f4fc Author: Liwei Song AuthorDate: Thu Feb 20 11:50:45 2020 +0800 util-linux: fix hwclock settimeofday error The change of settimeofday() systemcall since Glibc 2.31 will cause "hwclock -s" doesn't work with error: "hwclock: settimeofday() failed: Invalid argument" Backport a upstream patch to fix this issue. Signed-off-by: Liwei Song Signed-off-by: Richard Purdie --- ...1-hwclock-fix-for-glibc-2.31-settimeofday.patch | 112 +++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.34.bb | 1 + 2 files changed, 113 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch new file mode 100644 index 0000000..0672c35 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch @@ -0,0 +1,112 @@ +From ee85d3967ea09b215fcea5efdd90bbbf5e74a681 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 19 Feb 2020 15:50:47 +0100 +Subject: [PATCH] hwclock: fix for glibc 2.31 settimeofday() + +glibc announce: + ... settimeofday can no longer be used to set the time and the offset + simultaneously. If both of its two arguments are non-null, the call + will fail (setting errno to EINVAL). + +It means we need to call settimeofday(NULL, tz) and settimeofday(tv, NULL). + +Unfortunately, settimeofday(NULL, tz) has very special warp-clock +semantic if used as the very first settimeofday() call. It means we +have to be sure that we do not touch warp-clock if we need only need +to modify system TZ. So, let's always call settimeofday(NULL, 0) +before settimeofday(NULL, tz) for UTC rtc mode when modify system TZ. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/ee85d3967ea09b215fcea5efdd90bbbf5e74a681] + +CC: J William Piggott +Signed-off-by: Karel Zak +Addresses: https://github.com/karelzak/util-linux/issues/957 +Signed-off-by: Liwei Song +--- + sys-utils/hwclock.c | 49 ++++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index e736da7179f8..16576bc186ff 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -658,6 +658,9 @@ display_time(struct timeval hwctime) + * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale. + * firsttime: locks the warp_clock function (initialized to 1 at boot). + * ++ * Note that very first settimeofday(NULL, tz) modifies warp-clock as well as ++ * system TZ. ++ * + * +---------------------------------------------------------------------------+ + * | op | RTC scale | settimeofday calls | + * |---------|-----------|-----------------------------------------------------| +@@ -675,41 +678,45 @@ set_system_clock(const struct hwclock_control *ctl, + struct tm broken; + int minuteswest; + int rc = 0; +- const struct timezone tz_utc = { 0 }; + + localtime_r(&newtime.tv_sec, &broken); + minuteswest = -get_gmtoff(&broken) / 60; + + if (ctl->verbose) { +- if (ctl->hctosys && !ctl->universal) +- printf(_("Calling settimeofday(NULL, %d) to set " +- "persistent_clock_is_local.\n"), minuteswest); +- if (ctl->systz && ctl->universal) ++ if (ctl->universal) + puts(_("Calling settimeofday(NULL, 0) " +- "to lock the warp function.")); ++ "to lock the warp function.")); ++ else ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "persistent_clock_is_local and " ++ "the kernel timezone.\n"), minuteswest); ++ ++ if (ctl->universal && minuteswest) ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "the kernel timezone.\n"), minuteswest); ++ + if (ctl->hctosys) +- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), +- newtime.tv_sec, newtime.tv_usec, minuteswest); +- else { +- printf(_("Calling settimeofday(NULL, %d) "), minuteswest); +- if (ctl->universal) +- puts(_("to set the kernel timezone.")); +- else +- puts(_("to warp System time.")); +- } ++ printf(_("Calling settimeofday(%ld.%06ld, 0) to set " ++ "the kernel time.\n"), newtime.tv_sec, newtime.tv_usec); + } + + if (!ctl->testing) { ++ const struct timezone tz_utc = { 0 }; + const struct timezone tz = { minuteswest }; + +- if (ctl->hctosys && !ctl->universal) /* set PCIL */ ++ /* warp-clock */ ++ if (ctl->universal) ++ rc = settimeofday(NULL, &tz_utc); /* lock to UTC */ ++ else ++ rc = settimeofday(NULL, &tz); /* set PCIL and TZ */ ++ ++ /* set timezone */ ++ if (!rc && ctl->universal && minuteswest) + rc = settimeofday(NULL, &tz); +- if (ctl->systz && ctl->universal) /* lock warp_clock */ +- rc = settimeofday(NULL, &tz_utc); ++ ++ /* set time */ + if (!rc && ctl->hctosys) +- rc = settimeofday(&newtime, &tz); +- else if (!rc) +- rc = settimeofday(NULL, &tz); ++ rc = settimeofday(&newtime, NULL); + + if (rc) { + warn(_("settimeofday() failed")); +-- +2.17.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb index e9c2d80..557449d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.34.bb @@ -8,6 +8,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:16:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:16:09 +0000 Subject: [oe-commits] [openembedded-core] 03/05: oeqa/logparser: Fix performance issues with ptest log parsing In-Reply-To: <158224056672.1335.259793796952814918@git.openembedded.org> References: <158224056672.1335.259793796952814918@git.openembedded.org> Message-ID: <20200220231607.3723D2328B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fca9ae63b0c05b482ea5fd4901e3bc9f90b4dfdd Author: Richard Purdie AuthorDate: Thu Feb 20 13:57:50 2020 +0000 oeqa/logparser: Fix performance issues with ptest log parsing On the autobuilder a ptest log with 2.1 million lines took around 18 hours to process. This is clearly crazy. We can tweak the processing code to: a) Stop repeatedly joining large strings together (append to a list instead) b) Use one startswith expression instead of multiple re.search() operations With this change it takes 18 hours down to around 12s. [YOCTO #13696] Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 7313df8..5403721 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -25,13 +25,20 @@ class PtestParser(object): section_regex['exitcode'] = re.compile(r"^ERROR: Exit status is (.+)") section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") + # Cache markers so we don't take the re.search() hit all the time. + markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + def newsection(): - return { 'name': "No-section", 'log': "" } + return { 'name': "No-section", 'log': [] } current_section = newsection() with open(logfile, errors='replace') as f: for line in f: + if not line.startswith(markers): + current_section['log'].append(line) + continue + result = section_regex['begin'].search(line) if result: current_section['name'] = result.group(1) @@ -61,7 +68,7 @@ class PtestParser(object): current_section[t] = result.group(1) continue - current_section['log'] = current_section['log'] + line + current_section['log'].append(line) for t in test_regex: result = test_regex[t].search(line) @@ -70,6 +77,11 @@ class PtestParser(object): self.results[current_section['name']] = {} self.results[current_section['name']][result.group(1).strip()] = t + # Python performance for repeatedly joining long strings is poor, do it all at once at the end. + # For 2.1 million lines in a log this reduces 18 hours to 12s. + for section in self.sections: + self.sections[section]['log'] = "".join(self.sections[section]['log']) + return self.results, self.sections # Log the results as files. The file name is the section name and the contents are the tests in that section. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:16:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:16:10 +0000 Subject: [oe-commits] [openembedded-core] 04/05: wayland: convert to meson build In-Reply-To: <158224056672.1335.259793796952814918@git.openembedded.org> References: <158224056672.1335.259793796952814918@git.openembedded.org> Message-ID: <20200220231607.44DF22328B7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6844ad9b9de53c4b225f961fbcfb77df413b8acd Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:43 2020 +0100 wayland: convert to meson build Replace an autotools-specific .pc adjustment patch with a meson-specific one. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++++++++++++++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ---------------------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++++---- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch new file mode 100644 index 0000000..2199548 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -0,0 +1,26 @@ +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Feb 2020 21:46:18 +0100 +Subject: [PATCH] Do not hardcode the path to wayland-scanner + +This results in host contamination during builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 294aee0..7e410fa 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,7 +49,7 @@ pkgconfig.generate( + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000..f98037a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d..0000000 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075..a702b3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:16:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:16:11 +0000 Subject: [oe-commits] [openembedded-core] 05/05: wayland: Fix strndup detection on MinGW In-Reply-To: <158224056672.1335.259793796952814918@git.openembedded.org> References: <158224056672.1335.259793796952814918@git.openembedded.org> Message-ID: <20200220231607.51B6F2328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85281f8a248d181ba630c10c1a189c8311e9cdc4 Author: Joshua Watt AuthorDate: Thu Feb 20 16:49:31 2020 -0600 wayland: Fix strndup detection on MinGW Applies a patch to fix strndup being detected as present incorrectly when building for MinGW. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- ...0001-build-Fix-strndup-detection-on-MinGW.patch | 39 ++++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch new file mode 100644 index 0000000..e445838 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -0,0 +1,39 @@ +From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Thu, 20 Feb 2020 15:20:45 -0600 +Subject: [PATCH] build: Fix strndup detection on MinGW + +GCC and meson conspire together to incorrectly detect that strndup() +exists on MinGW as __builtin_strndup, when no such function exists. As a +work around, meson will skip looking for __builtin functions if an +'#include' is in the prefix, so add '#include ' when looking +for strndup(). + +See: https://github.com/mesonbuild/meson/issues/3672 + +Signed-off-by: Joshua Watt +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 26b084f..c05d019 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,11 +36,11 @@ have_funcs = [ + 'posix_fallocate', + 'prctl', + 'memfd_create', +- 'strndup', + ] + foreach f: have_funcs + config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) + endforeach ++config_h.set('HAVE_STRNDUP', cc.has_function('strndup', prefix:'#include ')) + + if get_option('libraries') + ffi_dep = dependency('libffi') +-- +2.17.1 + diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index a702b3f..6a6e749 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -15,6 +15,7 @@ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ + file://0001-build-Fix-strndup-detection-on-MinGW.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:32:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:32:28 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c4d1dcc -> 9dcd8ee) Message-ID: <158224154858.6271.17815719388472615778@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard c4d1dcc s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes discard c2904a2 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher discard 71239cd python3-grpcio: fix do_compile error for native discard 746390a oprofile: Fix build with bfd 2.34+ new 7d242bc python3-grpcio: fix do_compile error for native new 6902dcd s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher new 7449a3e s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes new 59daa12 libcamera: Bumped to latest source revision new 9dcd8ee oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c4d1dcc) \ N -- N -- N refs/heads/master-next (9dcd8ee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...n-import-python3-to-use-also-from-sysroot.patch | 61 ---------------------- .../recipes-multimedia/libcamera/libcamera.bb | 5 +- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:32:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:32:29 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: python3-grpcio: fix do_compile error for native In-Reply-To: <158224154858.6271.17815719388472615778@git.openembedded.org> References: <158224154858.6271.17815719388472615778@git.openembedded.org> Message-ID: <20200220233228.BC3F32328B7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7d242bcfc77f00ce9acec6541a4f5711d8d4a51b Author: Qi.Chen at windriver.com AuthorDate: Thu Feb 20 18:49:10 2020 +0800 python3-grpcio: fix do_compile error for native When building python3-grpcio-native, we will meet do_compile error because of no 'cc'. In fact, 'cc' is not in our hosttools. So fix to use gcc and make the patch also apply to native. Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- .../0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 6 +++--- meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 131daac..f39a82a 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -1,4 +1,4 @@ -From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 +1From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Aug 2017 09:04:07 -0700 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options @@ -24,7 +24,7 @@ Signed-off-by: Khem Raj def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') - cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], @@ -57,7 +57,7 @@ Signed-off-by: Khem Raj """ # TODO(lidiz) Remove the generated a.out for success tests. - cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb index bc2b70c..42260cb 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "${PYTHON_PN}-protobuf" -SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ - file://ppc-boringssl-support.patch \ +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" +SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \ file://riscv64_support.patch \ " SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:32:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:32:31 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes In-Reply-To: <158224154858.6271.17815719388472615778@git.openembedded.org> References: <158224154858.6271.17815719388472615778@git.openembedded.org> Message-ID: <20200220233228.D96EE2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7449a3e08389a0c50cdf17bc16995ef1678dc2d2 Author: Martin Jansa AuthorDate: Thu Feb 20 18:52:35 2020 +0100 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes * I don't expect anyone nowadays actually using these recipes which I've imported from meta-smartphone in 2011. Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-oe.bb | 8 +- .../files/0001-ppt.c-Do-not-include-sys-io.h.patch | 28 - .../samsung-soc-utils/s3c24xx-gpio_git.bb | 21 - .../samsung-soc-utils/s3c64xx-gpio_git.bb | 21 - .../samsung-soc-utils/sjf2410-linux-native_git.bb | 39 -- .../usbpath/usbpath/configure.patch | 11 - meta-oe/recipes-support/usbpath/usbpath_git.bb | 21 - .../0001-makefile-Pass-CFLAGS-to-compile.patch | 26 - .../0002-fix-err-API-to-have-format-string.patch | 656 --------------------- meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb | 24 - 10 files changed, 4 insertions(+), 851 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d2e8ea4..0bda946 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -254,13 +254,13 @@ RDEPENDS_packagegroup-meta-oe-support ="\ multipath-tools nano neon nmon numactl onig openct openldap \ opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ - pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \ - sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ + pv pxaregs raptor2 rdfind read-edid rsnapshot \ + satyr sdparm pty-forward-native serial-forward \ sg3-utils sharutils smem spitools srecord ssiapi stm32flash \ syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ tree uhubctl unixodbc uriparser usb-modeswitch \ - usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ - vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \ + usb-modeswitch-data uthash utouch-evemu utouch-frame \ + vim vim-tiny websocketpp xdelta3 xdg-user-dirs xmlstarlet \ zbar zile \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis toscoterm uim synergy utouch-mtview links-x11 fltk pidgin-otr", "", d)} \ libcanberra \ diff --git a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch b/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch deleted file mode 100644 index 4e6c250..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd244ae648789591f0fb79e74d2b8f6c5b15d6e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 00:47:14 +0000 -Subject: [PATCH] ppt.c: Do not include sys/io.h - -newer versions of glibc has removed it - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - ppt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ppt.c b/ppt.c -index 0bae2d0..0ef279f 100644 ---- a/ppt.c -+++ b/ppt.c -@@ -5,7 +5,6 @@ - #else - #include - #include --#include - #include - #include - #include --- -2.17.1 - diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb deleted file mode 100644 index 98573a0..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb deleted file mode 100644 index 9978171..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb deleted file mode 100644 index 2837403..0000000 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "JTAG utility to interface w/ a S3C2410 device" -SECTION = "devel" -AUTHOR = "Harald Welte " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ -" -S = "${WORKDIR}/sjf2410-linux" - -inherit native deploy - -CFLAGS += "-DLINUX_PPDEV" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 sjf2410 ${D}/${bindir} -} - -do_deploy() { - install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} -} - -addtask deploy before do_build after do_install - -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" -# cleandirs should possibly be in deploy.bbclass but we need it -do_deploy[cleandirs] = "${DEPLOYDIR}" -# clear stamp-extra-info since MACHINE_ARCH is normally put there by -# deploy.bbclass -do_deploy[stamp-extra-info] = "" - diff --git a/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-oe/recipes-support/usbpath/usbpath/configure.patch deleted file mode 100644 index 271e6a5..0000000 --- a/meta-oe/recipes-support/usbpath/usbpath/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: usbpath/configure.ac -=================================================================== ---- usbpath.orig/configure.ac 2014-07-17 20:40:26.000000000 +0000 -+++ usbpath/configure.ac 2014-07-18 07:01:40.933474420 +0000 -@@ -1,5 +1,5 @@ - AC_INIT([usbpath],[0.1]) --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_RANLIB diff --git a/meta-oe/recipes-support/usbpath/usbpath_git.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb deleted file mode 100644 index a3c7590..0000000 --- a/meta-oe/recipes-support/usbpath/usbpath_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Convert the physical locations of a USB device to/from its number" -AUTHOR = "Werner Almesberger " -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" -DEPENDS = "virtual/libusb0" -DEPENDS_class-native = "virtual/libusb0-native" - -BBCLASSEXTEND = "native" - -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ - file://configure.patch \ -" -S = "${WORKDIR}/usbpath" - -inherit autotools pkgconfig - -RDEPENDS_${PN} += "perl" diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch deleted file mode 100644 index 90eff5b..0000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0378cbb323c662a565f7f3de2dee3d8a646e7bd1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 09:32:42 -0700 -Subject: [PATCH 1/2] makefile: Pass CFLAGS to compile - -Set CC if not already set - -Signed-off-by: Khem Raj ---- - host/tools/wmiconfig/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/tools/wmiconfig/Makefile b/host/tools/wmiconfig/Makefile -index c6738c5..3253a7e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CC :=$(ATH_CROSS_COMPILE_TYPE)gcc -+CC ?= $(ATH_CROSS_COMPILE_TYPE)gcc - - all: -- $(CC) -Wall -DUSER_KEYS -g $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig -+ $(CC) -Wall -DUSER_KEYS -g $(CFLAGS) $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch deleted file mode 100644 index f67f784..0000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch +++ /dev/null @@ -1,656 +0,0 @@ -From 909ebdde4ee2233d65de8fa01fde8e9a3bec12b7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 09:33:26 -0700 -Subject: [PATCH 2/2] fix err() API to have format string - -Fixes errors with hardening flags - -Signed-off-by: Khem Raj ---- - host/tools/wmiconfig/wmiconfig.c | 148 +++++++++++++++++++-------------------- - 1 file changed, 74 insertions(+), 74 deletions(-) - -diff --git a/host/tools/wmiconfig/wmiconfig.c b/host/tools/wmiconfig/wmiconfig.c -index 21c9dcd..a6ec481 100644 ---- a/wmiconfig.c -+++ b/wmiconfig.c -@@ -483,7 +483,7 @@ main (int argc, char **argv) - strcpy(ifname, ethIf); - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) { -- err(1, "socket"); -+ err(1, "%s", "socket"); - } - - while (1) { -@@ -1506,28 +1506,28 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)filterCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETBSSFILTER, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWER_MODE: - ifr.ifr_data = (void *)pwrCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETPWR, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PM_PARAMS: - ifr.ifr_data = (void *)pmParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PMPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_IBSS_PM_CAPS: - ifr.ifr_data = (void *)adhocPmCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ERROR_DETECTION: -@@ -1535,7 +1535,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_HB_CHALLENGE_RESP: -@@ -1543,7 +1543,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - #ifdef USER_KEYS -@@ -1554,7 +1554,7 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - break; -@@ -1575,7 +1575,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)sParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETSCAN, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_VERSION: -@@ -1586,7 +1586,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)revinfo; - if (ioctl(s, AR6000_IOCTL_WMI_GETREV, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Host Rev = 0x%x(%u.%u.%u.%u), Target Rev = 0x%x(%u.%u.%u.%u)\n", - revinfo->host_ver, -@@ -1606,14 +1606,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)listenCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETLISTENINT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BMISS_TIME: - ifr.ifr_data = (void *)bmissCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BMISS_TIME, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RSSI_THRESHOLDS: -@@ -1621,14 +1621,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SNR_THRESHOLDS: - ifr.ifr_data = (void *)snrThresholdParam; - if (ioctl(s, AR6000_IOCTL_WMI_SET_SNRTHRESHOLD, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CLR_RSSISNR: -@@ -1636,7 +1636,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LQ_THRESHOLDS: -@@ -1644,7 +1644,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_CHANNEL: -@@ -1693,18 +1693,18 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_WMI_SET_CHANNELPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SSID: - if (index > MAX_PROBED_SSID_INDEX) { - printf("num option for ssid command too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - if (strlen((char *)ssid) > sizeof (ssidCmd->ssid)) { - printf("ssid name too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - ssidCmd->entryIndex = index; -@@ -1722,7 +1722,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ssidCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PROBEDSSID, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BADAP: -@@ -1735,7 +1735,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)badApCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BADAP, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CREATE_QOS: -@@ -1794,7 +1794,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)crePStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_CREATE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_TARGET_STATS: -@@ -1807,7 +1807,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)&tgtStatsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_TARGET_STATS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printTargetStats(&(tgtStatsCmd.targetStats)); - break; -@@ -1815,7 +1815,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)pBitMask; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DELETE_QOS: -@@ -1824,7 +1824,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)delPStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_DELETE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_QOS_QUEUE: -@@ -1840,7 +1840,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)getQosQueueCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_QOS_QUEUE, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - printf("Active TSIDs \n"); -@@ -1855,7 +1855,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ieInfo; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ASSOC_INFO, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AC_PARAMS: -@@ -1871,14 +1871,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)acParamsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ACCESS_PARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_DISC_TIMEOUT: - ifr.ifr_data = (void *)discCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_DISC_TIMEOUT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ADHOC_BSSID: -@@ -1887,7 +1887,7 @@ main (int argc, char **argv) - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { - printf("fail to set adhoc bssid \n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_OPT_MODE: -@@ -1895,7 +1895,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_OPT_SEND_FRAME: -@@ -1903,7 +1903,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BEACON_INT: -@@ -1911,7 +1911,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_VOICE_PKT_SIZE: -@@ -1919,7 +1919,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MAX_SP: -@@ -1927,7 +1927,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_TBL: -@@ -1935,7 +1935,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ROAM_CTRL: -@@ -1943,7 +1943,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWERSAVE_TIMERS: -@@ -1951,7 +1951,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_POWER_MODE: -@@ -1959,7 +1959,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Power mode is %s\n", - (getPowerMode->powerMode == MAX_PERF_POWER) ? "maxperf" : "rec"); -@@ -1969,7 +1969,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_DATA: -@@ -1977,7 +1977,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_STATUS: -@@ -1985,7 +1985,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_PARAMS: -@@ -1993,7 +1993,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RETRYLIMITS: -@@ -2001,14 +2001,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_START_SCAN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_STARTSCAN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_FIX_RATES: -@@ -2031,14 +2031,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_FIX_RATES: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GETFIXRATES; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } else { - int i; - printf("Fix rate set index:"); -@@ -2057,7 +2057,7 @@ main (int argc, char **argv) - index--; - setAuthMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_REASSOC_MODE: -@@ -2067,42 +2067,42 @@ main (int argc, char **argv) - index--; - setReassocMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LPREAMBLE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_LPREAMBLE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RTS: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_RTS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WMM: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WMM; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_TXOP: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_TXOP; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_READ: - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("diagdata: 0x%x\n", *diagdata); - break; -@@ -2110,7 +2110,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_WRITE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_RD: -@@ -2118,7 +2118,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - else - { -@@ -2139,14 +2139,14 @@ main (int argc, char **argv) - index--; - setKeepAlive->keepaliveInterval = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_KEEPALIVE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_KEEPALIVE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Keepalive interval is %d secs and AP is %s\n", - getKeepAlive->keepaliveInterval, (getKeepAlive->configured ? -@@ -2156,63 +2156,63 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_APPIE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MGMT_FRM_RX_FILTER: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_CFG_MODULE: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_CFG_MODULE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_GET_DEBUG_LOGS: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_HOST_SLEEP_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WOW_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WOW_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_ADD_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_ADD_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DEL_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_DEL_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_WOW_LIST: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_WOW_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_DUMP_CHIP_MEM: -@@ -2225,7 +2225,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("0x%04x:0x%04x\n", *diagaddr, *diagdata); - } -@@ -2237,21 +2237,21 @@ main (int argc, char **argv) - index = optind - 1; - *connectCtrlFlags = strtoul(argv[index], NULL, 0); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DUMP_HTC_CREDITS: - ((int *)buf)[0] = AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AKMP_INFO: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_AKMP_PARAMS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PMKID_LIST: -@@ -2259,7 +2259,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - } else { - printf("No PMKIDs entered\n"); -@@ -2269,7 +2269,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BSS_PMKID_INFO: -@@ -2277,7 +2277,7 @@ main (int argc, char **argv) - iwr.u.data.length = sizeof(*pi_cmd); - if (ioctl(s, IEEE80211_IOCTL_ADDPMKID, &iwr) < 0) { - printf("ADDPMKID IOCTL Error\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - default: --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb deleted file mode 100644 index 23273ca..0000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Atheros 6K Wifi configuration utility" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" -SECTION = "console/network" -PV = "1.0+git${SRCPV}" - -SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" -SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ -" -S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" - -CLEANBROKEN = "1" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 wmiconfig ${D}${bindir} -} - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:32:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:32:30 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher In-Reply-To: <158224154858.6271.17815719388472615778@git.openembedded.org> References: <158224154858.6271.17815719388472615778@git.openembedded.org> Message-ID: <20200220233228.C98CC2328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6902dcd2edc3a08f6929e19e9a9c18493883f9d2 Author: Martin Jansa AuthorDate: Thu Feb 20 18:52:34 2020 +0100 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher * svn checkouts from http://svn.openmoko.org/ are now redirected to github: svn --non-interactive --trust-server-cert co --no-auth-cache --ignore-externals -r 4949 http://svn.openmoko.org/trunk/src/target/gpio at 4949 gpio Redirecting to URL 'https://github.com/openmoko/openmoko-svn': A gpio/branches A gpio/branches/oe A gpio/branches/oe/pre-20070305 A gpio/branches/oe/pre-20070305/README A gpio/branches/oe/pre-20070305/classes A gpio/branches/oe/pre-20070305/classes/autotools.bbclass A gpio/branches/oe/pre-20070305/classes/base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-panel-plugin.bbclass * unfortunately this is causing the checkout to start from trunk, not the subdirectory specified in the URL (e.g. /trunk/src/target/gpio) and then S variable points to incorrect directory as discussed here: http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205028.html * use git fetcher directly to remove the dependency on subversion-native * for simplicity use the same SRCREV and PV for all of these, there wasn't any commit in last 8 years (not anyone can expect new commits), I don't expect anyone nowadays actually using these recipes which I've imported from meta-smartphone in 2011 - that's why I will send their removal in follow-up commit. Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 +++---- .../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +++--- ...2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++++------ .../usbpath/{usbpath_svn.bb => usbpath_git.bb} | 10 +++++----- .../wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 ++++++------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb similarity index 73% rename from meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb rename to meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb index 255754d..98573a0 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb @@ -3,11 +3,10 @@ SECTION = "console/utils" AUTHOR = "Werner Almesberger " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" -PR = "r2" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" S = "${WORKDIR}/gpio" CLEANBROKEN = "1" diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb similarity index 74% rename from meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb rename to meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb index 976a4f1..9978171 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb @@ -3,10 +3,10 @@ SECTION = "console/utils" AUTHOR = "Werner Almesberger " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" S = "${WORKDIR}/gpio" CLEANBROKEN = "1" diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb similarity index 78% rename from meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb rename to meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb index 3a5172e..2837403 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb @@ -3,13 +3,12 @@ SECTION = "devel" AUTHOR = "Harald Welte " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -SRCREV = "4268" -PV = "0.1+svnr${SRCPV}" -PR = "r1" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ - " +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ + file://0001-ppt.c-Do-not-include-sys-io.h.patch \ +" S = "${WORKDIR}/sjf2410-linux" inherit native deploy diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb similarity index 68% rename from meta-oe/recipes-support/usbpath/usbpath_svn.bb rename to meta-oe/recipes-support/usbpath/usbpath_git.bb index 6c9cd04..a3c7590 100644 --- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb +++ b/meta-oe/recipes-support/usbpath/usbpath_git.bb @@ -8,12 +8,12 @@ DEPENDS_class-native = "virtual/libusb0-native" BBCLASSEXTEND = "native" -SRCREV = "3172" -PV = "0.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \ - file://configure.patch" +PV = "1.0+git${SRCPV}" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ + file://configure.patch \ +" S = "${WORKDIR}/usbpath" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb similarity index 58% rename from meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb rename to meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb index c66572b..23273ca 100644 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +++ b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb @@ -2,14 +2,13 @@ SUMMARY = "Atheros 6K Wifi configuration utility" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" SECTION = "console/network" -SRCREV = "5394" -PV = "0.0.0+svnr${SRCPV}" -PR = "r2" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ - " +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ + file://0001-makefile-Pass-CFLAGS-to-compile.patch \ + file://0002-fix-err-API-to-have-format-string.patch \ +" S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" CLEANBROKEN = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:32:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:32:32 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: libcamera: Bumped to latest source revision In-Reply-To: <158224154858.6271.17815719388472615778@git.openembedded.org> References: <158224154858.6271.17815719388472615778@git.openembedded.org> Message-ID: <20200220233228.E8EFA2328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 59daa1229a36abc63431e4b290bb175949407dab Author: Madhavan Krishnan AuthorDate: Tue Jan 21 08:08:43 2020 +0100 libcamera: Bumped to latest source revision libcamera uses the host machine python instead of sysroot, We use the patch file for libcamera source to use the sysroot python. But libcamera team has fix this issue and, pushed the changes to libcamera source, now we are pointing to that particular source revision of libcamera. In musl, we faced the compilation iisue, so we changed the source revision pointing to the fix of musl compilation issue. Signed-off-by: Khem Raj --- ...n-import-python3-to-use-also-from-sysroot.patch | 61 ---------------------- .../recipes-multimedia/libcamera/libcamera.bb | 5 +- 2 files changed, 2 insertions(+), 64 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch b/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch deleted file mode 100644 index fc56a68..0000000 --- a/meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ea47e53911213d71e997eb34848ae72735bacc82 Mon Sep 17 00:00:00 2001 -From: madhavank27 -Date: Thu, 9 Jan 2020 07:42:18 +0100 -Subject: [PATCH] meson: import python3 to use also from sysroot - -importing python module can provide the exact path -which can be used in desktop build as well as from -any build system - -Upstream-Status: Pending -Signed-off-by: madhavank27 ---- - include/libcamera/meson.build | 4 +++- - src/libcamera/meson.build | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build -index 99abf06..83525e2 100644 ---- a/include/libcamera/meson.build -+++ b/include/libcamera/meson.build -@@ -21,13 +21,15 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera') - install_headers(libcamera_api, - subdir : include_dir) - -+python_mod = import('python3').find_python() -+ - gen_controls = files('../../src/libcamera/gen-controls.py') - - control_ids_h = custom_target('control_ids_h', - input : files('../../src/libcamera/control_ids.yaml', 'control_ids.h.in'), - output : 'control_ids.h', - depend_files : gen_controls, -- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'], -+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'], - install : true, - install_dir : join_paths('include', include_dir)) - -diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build -index c4f965b..243935b 100644 ---- a/src/libcamera/meson.build -+++ b/src/libcamera/meson.build -@@ -65,13 +65,15 @@ if libudev.found() - ]) - endif - -+python_mod = import('python3').find_python() -+ - gen_controls = files('gen-controls.py') - - control_ids_cpp = custom_target('control_ids_cpp', - input : files('control_ids.yaml', 'control_ids.cpp.in'), - output : 'control_ids.cpp', - depend_files : gen_controls, -- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@']) -+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@']) - - libcamera_sources += control_ids_cpp - libcamera_sources += control_ids_h --- -2.7.4 - diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index b95bf6d..3f8fe2f 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ - file://0001-meson-import-python3-to-use-also-from-sysroot.patch \ " -SRCREV = "53eab996809e826bc914e4c34c78fe74d86f8dc4" +SRCREV = "a8be6e94e79f602d543a15afd44ef60e378b138f" -PV = "201910+git${SRCPV}" +PV = "202002+git${SRCPV}" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 20 23:32:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 20 Feb 2020 23:32:33 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158224154858.6271.17815719388472615778@git.openembedded.org> References: <158224154858.6271.17815719388472615778@git.openembedded.org> Message-ID: <20200220233228.F30392328BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9dcd8eebeb5e59bc89f4371590d44210d81488b4 Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 05:00:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 05:00:57 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (9dcd8ee -> 2f8560b) Message-ID: <158226125775.31622.8680935677542852254@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 9dcd8ee oprofile: Fix build with bfd 2.34+ new 19f6227 syslog-ng: Remove config nag on boot new 2f8560b oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9dcd8ee) \ N -- N -- N refs/heads/master-next (2f8560b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd | 2 +- meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 05:00:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 05:00:58 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: syslog-ng: Remove config nag on boot In-Reply-To: <158226125775.31622.8680935677542852254@git.openembedded.org> References: <158226125775.31622.8680935677542852254@git.openembedded.org> Message-ID: <20200221050057.ED1082328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 19f622749e6b84485c440f0cb560e1913c7c3e4a Author: Jeremy Puhlman AuthorDate: Thu Feb 20 16:35:51 2020 -0800 syslog-ng: Remove config nag on boot [2020-02-16T22:13:56.331425] WARNING: Configuration file format is too old, syslog-ng is running in compatibility mode. Please update it to use the syslo g-ng 3.24 format at your time of convenience. To upgrade the configuration, please review the warnings about incompatible changes printed by syslog-ng, a nd once completed change the @version header at the top of the configuration file Signed-off-by: Jeremy Puhlman Signed-off-by: Khem Raj --- meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd | 2 +- meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 965abf7..6a86276 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,4 +1,4 @@ - at version: 3.19 + at version: 3.24 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 2b39b8c..32b9861 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,4 +1,4 @@ - at version: 3.19 + at version: 3.24 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 05:00:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 05:00:59 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158226125775.31622.8680935677542852254@git.openembedded.org> References: <158226125775.31622.8680935677542852254@git.openembedded.org> Message-ID: <20200221050058.074112328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2f8560b16e0d237ca9ae107ca45aebb1fbdaf041 Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:22 +0000 Subject: [oe-commits] [openembedded-core] 02/26: selftest/context: Avoid tracebacks from tests using multiprocessing In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.4F23A2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d9c62ffac611310efd47ed6397d31dccb72fe868 Author: Richard Purdie AuthorDate: Wed Feb 19 17:27:26 2020 +0000 selftest/context: Avoid tracebacks from tests using multiprocessing We can see tracebacks where the SIGTERM handler catches things it shouldn't. Avoid exit(1) unless we're the process that it was intended for. [YOCTO #13664] Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c4eb5d6..3d3b19c 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -280,11 +280,15 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc def _signal_clean_handler(self, signum, frame): - sys.exit(1) + if self.ourpid == os.getpid(): + sys.exit(1) def run(self, logger, args): self._process_args(logger, args) + # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf + # but don't interfer with other processes + self.ourpid = os.getpid() signal.signal(signal.SIGTERM, self._signal_clean_handler) rc = None -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:21 +0000 Subject: [oe-commits] [openembedded-core] 01/26: lttng-tools: upgrade 2.11.0 -> 2.11.2 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.3F0A82328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 712a634c61ebc7ebda2669daf21460394f6ac2cd Author: Richard Purdie AuthorDate: Tue Feb 18 14:09:00 2020 -0800 lttng-tools: upgrade 2.11.0 -> 2.11.2 Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb8963..36a19ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:20 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (10c2216 -> ffa91ff) Message-ID: <158227796073.14405.8091912688817468758@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 10c2216 oescripts.py: use unittest.SkipUnless for class skip new 712a634 lttng-tools: upgrade 2.11.0 -> 2.11.2 new d9c62ff selftest/context: Avoid tracebacks from tests using multiprocessing new 50238b0 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest new b8ea8a9 oeqa/selftest: Drop 'backup' code and SIGTERM handler new 9d447fc webkitgtk: x11 and wayland are not mutually exclusive new 85431fe webkitgtk: unbreak wayland build new 1bddd7a weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines new 96e6434 qemumips: use std vga instead of cirrus vga new 7fc4dc3 createrepo-c: upgrade 0.15.5 -> 0.15.7 new 2c492e3 epiphany: upgrade 3.34.3.1 -> 3.34.4 new 66885ec libsecret: upgrade 0.20.0 -> 0.20.1 new c94ae81 meson: upgrade 0.53.0 -> 0.53.1 new b877317 vala: upgrade 0.46.5 -> 0.46.6 new c524e93 virglrenderer: upgrade 0.8.1 -> 0.8.2 new 00cc977 iproute2: add devlink support to iproute2 new 174cd0d libubootenv: bump to revision ba952d0 new 7b43e04 scripts/combo-layer: Fix deprecation warning new 989f3f9 libxkbcommon: upgrade 0.9.1 -> 0.10.0 new 5de2a4f man-pages: upgrade 5.04 -> 5.05 new 058e72b mesa: upgrade 19.3.3 -> 19.3.4 new fcaca33 nfs-utils: upgrade 2.4.2 -> 2.4.3 new b80bf70 util-linux: fix hwclock settimeofday error new b266a1a babeltrace: added ptest new 01c9f40 oeqa/logparser: Fix performance issues with ptest log parsing new 88494d1 wayland: convert to meson build new ffa91ff wayland: Fix strndup detection on MinGW The 26 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/maintainers.inc | 2 + meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/conf/machine/include/qemuboot-mips.inc | 2 +- meta/lib/oeqa/core/context.py | 12 +- meta/lib/oeqa/core/utils/concurrencytest.py | 35 +---- meta/lib/oeqa/selftest/case.py | 30 +---- meta/lib/oeqa/selftest/context.py | 93 +++++++------ meta/lib/oeqa/utils/logparser.py | 16 ++- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 +- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++-- .../0001-Don-t-build-tools-with-CC_FOR_BUILD.patch | 40 ------ ...le.am-fix-undefined-function-for-libnsm.a.patch | 12 +- .../{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} | 5 +- ...1-hwclock-fix-for-glibc-2.31-settimeofday.patch | 112 ++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.34.bb | 1 + ...eaterepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- meta/recipes-devtools/meson/meson.inc | 4 +- .../0001-Make-CPU-family-warnings-fatal.patch | 2 +- ...02-Support-building-allarch-recipes-again.patch | 2 +- .../meson/meson/0003-native_bindir.patch | 12 +- .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 ...k-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 .../vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 +- .../{man-pages_5.04.bb => man-pages_5.05.bb} | 4 +- .../{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 +- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- .../mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} | 0 .../mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} | 4 +- ...rglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- ...0001-build-Fix-strndup-detection-on-MinGW.patch | 39 ++++++ ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ----- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 12 +- .../wayland/weston-init/qemux86-64/weston.ini | 0 .../wayland/weston-init/qemux86/weston.ini | 0 ...ibxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} | 4 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ------ .../xserver-xf86-config/qemumips64/xorg.conf | 39 ------ .../lttng/{lttng-tools => babeltrace}/run-ptest | 7 +- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 +++++++++++- ...lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 +- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++ scripts/combo-layer | 2 +- 47 files changed, 471 insertions(+), 463 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} (96%) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} (95%) rename meta/recipes-devtools/meson/{meson_0.53.0.bb => meson_0.53.1.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} (100%) rename meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} (57%) rename meta/recipes-extended/man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} (87%) rename meta/recipes-gnome/epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} (85%) delete mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch rename meta/recipes-gnome/libsecret/{libsecret_0.20.0.bb => libsecret_0.20.1.bb} (81%) rename meta/recipes-graphics/mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} (88%) rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} (94%) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch copy scripts/pybootchartgui/pybootchartgui/__init__.py => meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini (100%) copy scripts/pybootchartgui/pybootchartgui/__init__.py => meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini (100%) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} (88%) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf copy meta/recipes-kernel/lttng/{lttng-tools => babeltrace}/run-ptest (57%) rename meta/recipes-kernel/lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} (98%) create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:23 +0000 Subject: [oe-commits] [openembedded-core] 03/26: oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.5C9072328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 50238b0717b04e0a1fa69d618e8c8aa8445a80b0 Author: Richard Purdie AuthorDate: Wed Feb 19 18:19:49 2020 +0000 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++---- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------------ meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a5..16320af 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e..fac59f7 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c..cd89326 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting" % newbuilddir) + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:24 +0000 Subject: [oe-commits] [openembedded-core] 04/26: oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.6C38D2328BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b8ea8a910267fee4bb9e57f24ba829064e22d016 Author: Richard Purdie AuthorDate: Wed Feb 19 18:32:19 2020 +0000 oeqa/selftest: Drop 'backup' code and SIGTERM handler Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------------ meta/lib/oeqa/selftest/context.py | 47 +++------------------------------------ 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d..dcad4f7 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index cd89326..409698d 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:27 +0000 Subject: [oe-commits] [openembedded-core] 07/26: weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.95CA92328BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1bddd7ac64bc0a863dec38bf4d9671f9f1a51b03 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:44 2020 +0100 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000..e69de29 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:25 +0000 Subject: [oe-commits] [openembedded-core] 05/26: webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.7A73B2328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9d447fc61dca53bf41b31acb6e4083a10935ca8c Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:41 2020 +0100 webkitgtk: x11 and wayland are not mutually exclusive Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1..153bc8d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:29 +0000 Subject: [oe-commits] [openembedded-core] 09/26: createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.B1E772328C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7fc4dc3452b884f9e342372e019ad58462c1d9da Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:46 2020 +0100 createrepo-c: upgrade 0.15.5 -> 0.15.7 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c..c6a53ff 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:26 +0000 Subject: [oe-commits] [openembedded-core] 06/26: webkitgtk: unbreak wayland build In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.880D82328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 85431fe5c16ce1aa0916e57e820ff69c5aa0612a Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:42 2020 +0100 webkitgtk: unbreak wayland build webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ [RP: Add missing maintainers entries] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 ++ meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 901d607..5f1dae9 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -397,6 +397,7 @@ RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libwpe = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster " RECIPE_MAINTAINER_pn-libxau = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster " @@ -711,6 +712,7 @@ RECIPE_MAINTAINER_pn-which = "Anuj Mittal " RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal " RECIPE_MAINTAINER_pn-wireless-regdb = "Adrian Bunk " RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-wpebackend-fdo = "Alexander Kanavin " RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster " RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal " RECIPE_MAINTAINER_pn-xauth = "Armin Kuster " diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000..346ca9b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8d..5857237 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000..7db5806 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:30 +0000 Subject: [oe-commits] [openembedded-core] 10/26: epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.BD67D2328C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c492e3310ffe8078e63ae37cc94bb5e193ffc74 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:47 2020 +0100 epiphany: upgrade 3.34.3.1 -> 3.34.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e15733..ddb4c27 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:28 +0000 Subject: [oe-commits] [openembedded-core] 08/26: qemumips: use std vga instead of cirrus vga In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.A370E2328BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 96e6434239268fd0fc021bda9c8fedd998597097 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:45 2020 +0100 qemumips: use std vga instead of cirrus vga This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ---------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ---------------------- 3 files changed, 1 insertion(+), 79 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c..f1f7c2a 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:34 +0000 Subject: [oe-commits] [openembedded-core] 14/26: virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.EBDCC2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c524e9372939c0915f150079e786bbfe613f58a1 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:52 2020 +0100 virglrenderer: upgrade 0.8.1 -> 0.8.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 1336188..1046b85 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:33 +0000 Subject: [oe-commits] [openembedded-core] 13/26: vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.E02BA2328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b8773177938bd94fc67ab65a586881df965d0d8a Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:51 2020 +0100 vala: upgrade 0.46.5 -> 0.46.6 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d10..66f6203 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:31 +0000 Subject: [oe-commits] [openembedded-core] 11/26: libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.C85562328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 66885ec7ac3a1ed978f64b148e209ea132aca6b2 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:48 2020 +0100 libsecret: upgrade 0.20.0 -> 0.20.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-collection-Rename-internal-functions-to-.patch | 144 --------------------- .../{libsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b..0000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab..72511af 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:32 +0000 Subject: [oe-commits] [openembedded-core] 12/26: meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093921.D49DA2328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c94ae81f9ebf9d4d3546a86e097cdba51b3468b0 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:49 2020 +0100 meson: upgrade 0.53.0 -> 0.53.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- .../meson/0002-Support-building-allarch-recipes-again.patch | 2 +- meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 .../{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d3..d391c9c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4c..9ce31e5 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe..ce18660 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9..dc822fb 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:36 +0000 Subject: [oe-commits] [openembedded-core] 16/26: libubootenv: bump to revision ba952d0 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.109482328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 174cd0d15fb8879a28b9a069a2e504617c0be1a7 Author: Pierre-Jean Texier AuthorDate: Wed Feb 19 22:37:12 2020 +0100 libubootenv: bump to revision ba952d0 This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier Acked-by: Stefano Babic Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..7a7ec4c 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -11,8 +11,9 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" +PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:35 +0000 Subject: [oe-commits] [openembedded-core] 15/26: iproute2: add devlink support to iproute2 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.036C12328B7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 00cc9773505b2afd002f9b2d72330e517af97d0c Author: Scott Branden AuthorDate: Wed Feb 19 12:41:03 2020 -0800 iproute2: add devlink support to iproute2 Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b84..403d264 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:39 +0000 Subject: [oe-commits] [openembedded-core] 19/26: man-pages: upgrade 5.04 -> 5.05 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.336C02328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5de2a4f729860a1ae462b64e5cc17e938518c061 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:16 2020 -0800 man-pages: upgrade 5.04 -> 5.05 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/man-pages/man-pages_5.04.bb b/meta/recipes-extended/man-pages/man-pages_5.05.bb similarity index 87% rename from meta/recipes-extended/man-pages/man-pages_5.04.bb rename to meta/recipes-extended/man-pages/man-pages_5.05.bb index be45675..b95872e 100644 --- a/meta/recipes-extended/man-pages/man-pages_5.04.bb +++ b/meta/recipes-extended/man-pages/man-pages_5.05.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "14d33d3fe02577a33aab26eb75df39cb" -SRC_URI[sha256sum] = "8c6ab56b654a6dd00e3759279954a25fc68b258b8f493a75af55ea7b6401fdb2" +SRC_URI[md5sum] = "cdad5deb15117e60a6d9e3a6bdc035b5" +SRC_URI[sha256sum] = "43c33d2eea9ba989c18eef90298cf6d5521ff038deb51cda0ecd0fdc3cec2b7d" inherit manpages -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:40 +0000 Subject: [oe-commits] [openembedded-core] 20/26: mesa: upgrade 19.3.3 -> 19.3.4 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.3D1102328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 058e72b96c451f0a6f7773afa76db17f39bca77e Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:25 2020 -0800 mesa: upgrade 19.3.3 -> 19.3.4 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.3.bb b/meta/recipes-graphics/mesa/mesa_19.3.4.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa_19.3.4.bb index 7e0c5d6..5f456c2 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.4.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" -SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" +SRC_URI[md5sum] = "09e7700d9af511384d131fb77b5802cb" +SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:41 +0000 Subject: [oe-commits] [openembedded-core] 21/26: nfs-utils: upgrade 2.4.2 -> 2.4.3 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.496092328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fcaca33d458449379eeb2f99b613f8be1e6a44ce Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:34 2020 -0800 nfs-utils: upgrade 2.4.2 -> 2.4.3 0001-Don-t-build-tools-with-CC_FOR_BUILD.patch Removed since it is included in 2.4.3. refresh the following patch: 0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-Don-t-build-tools-with-CC_FOR_BUILD.patch | 40 ---------------------- ...le.am-fix-undefined-function-for-libnsm.a.patch | 12 ++++--- .../{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} | 5 ++- 3 files changed, 10 insertions(+), 47 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch deleted file mode 100644 index 23bc3ea..0000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 13 Feb 2019 09:28:07 +0100 -Subject: [PATCH] Don't build tools with CC_FOR_BUILD - -The tools are intended for the target not for the host. - -Upstream-Status: Pending - -Signed-off-by: Pascal Bach ---- - tools/locktest/Makefile.am | 1 - - tools/rpcgen/Makefile.am | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index 3156815..87d0bac 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = testlk -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89..3e092c9 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = rpcgen --- -2.11.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch index fcb0e99..bd35014 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch @@ -28,10 +28,10 @@ Rebase it. Signed-off-by: Robert Yang --- support/misc/Makefile.am | 2 +- - support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- + support/misc/file.c | 115 --------------------------------------------------------------------------------------------------------------- support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/Makefile.am | 2 +- - 4 files changed, 113 insertions(+), 113 deletions(-) + 4 files changed, 113 insertions(+), 117 deletions(-) diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am index f9993e3..8b0e9db 100644 @@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644 MAINTAINERCLEANFILES = Makefile.in diff --git a/support/misc/file.c b/support/misc/file.c deleted file mode 100644 -index e7c3819..0000000 +index 06f6bb2..0000000 --- a/support/misc/file.c +++ /dev/null -@@ -1,111 +0,0 @@ +@@ -1,115 +0,0 @@ -/* - * Copyright 2009 Oracle. All rights reserved. - * Copyright 2017 Red Hat, Inc. All rights reserved. @@ -72,6 +72,10 @@ index e7c3819..0000000 - * along with nfs-utils. If not, see . - */ - +-#ifdef HAVE_CONFIG_H +-#include +-#endif +- -#include - -#include diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb similarity index 96% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb index 6647d34..42a4ba3 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ - file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ file://clang-warnings.patch \ " -SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" -SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" +SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c" +SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:42 +0000 Subject: [oe-commits] [openembedded-core] 22/26: util-linux: fix hwclock settimeofday error In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.553482328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b80bf70748609b92ce766d11380353fdfbb1d916 Author: Liwei Song AuthorDate: Thu Feb 20 11:50:45 2020 +0800 util-linux: fix hwclock settimeofday error The change of settimeofday() systemcall since Glibc 2.31 will cause "hwclock -s" doesn't work with error: "hwclock: settimeofday() failed: Invalid argument" Backport a upstream patch to fix this issue. Signed-off-by: Liwei Song Signed-off-by: Richard Purdie --- ...1-hwclock-fix-for-glibc-2.31-settimeofday.patch | 112 +++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.34.bb | 1 + 2 files changed, 113 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch new file mode 100644 index 0000000..0672c35 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch @@ -0,0 +1,112 @@ +From ee85d3967ea09b215fcea5efdd90bbbf5e74a681 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 19 Feb 2020 15:50:47 +0100 +Subject: [PATCH] hwclock: fix for glibc 2.31 settimeofday() + +glibc announce: + ... settimeofday can no longer be used to set the time and the offset + simultaneously. If both of its two arguments are non-null, the call + will fail (setting errno to EINVAL). + +It means we need to call settimeofday(NULL, tz) and settimeofday(tv, NULL). + +Unfortunately, settimeofday(NULL, tz) has very special warp-clock +semantic if used as the very first settimeofday() call. It means we +have to be sure that we do not touch warp-clock if we need only need +to modify system TZ. So, let's always call settimeofday(NULL, 0) +before settimeofday(NULL, tz) for UTC rtc mode when modify system TZ. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/ee85d3967ea09b215fcea5efdd90bbbf5e74a681] + +CC: J William Piggott +Signed-off-by: Karel Zak +Addresses: https://github.com/karelzak/util-linux/issues/957 +Signed-off-by: Liwei Song +--- + sys-utils/hwclock.c | 49 ++++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index e736da7179f8..16576bc186ff 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -658,6 +658,9 @@ display_time(struct timeval hwctime) + * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale. + * firsttime: locks the warp_clock function (initialized to 1 at boot). + * ++ * Note that very first settimeofday(NULL, tz) modifies warp-clock as well as ++ * system TZ. ++ * + * +---------------------------------------------------------------------------+ + * | op | RTC scale | settimeofday calls | + * |---------|-----------|-----------------------------------------------------| +@@ -675,41 +678,45 @@ set_system_clock(const struct hwclock_control *ctl, + struct tm broken; + int minuteswest; + int rc = 0; +- const struct timezone tz_utc = { 0 }; + + localtime_r(&newtime.tv_sec, &broken); + minuteswest = -get_gmtoff(&broken) / 60; + + if (ctl->verbose) { +- if (ctl->hctosys && !ctl->universal) +- printf(_("Calling settimeofday(NULL, %d) to set " +- "persistent_clock_is_local.\n"), minuteswest); +- if (ctl->systz && ctl->universal) ++ if (ctl->universal) + puts(_("Calling settimeofday(NULL, 0) " +- "to lock the warp function.")); ++ "to lock the warp function.")); ++ else ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "persistent_clock_is_local and " ++ "the kernel timezone.\n"), minuteswest); ++ ++ if (ctl->universal && minuteswest) ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "the kernel timezone.\n"), minuteswest); ++ + if (ctl->hctosys) +- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), +- newtime.tv_sec, newtime.tv_usec, minuteswest); +- else { +- printf(_("Calling settimeofday(NULL, %d) "), minuteswest); +- if (ctl->universal) +- puts(_("to set the kernel timezone.")); +- else +- puts(_("to warp System time.")); +- } ++ printf(_("Calling settimeofday(%ld.%06ld, 0) to set " ++ "the kernel time.\n"), newtime.tv_sec, newtime.tv_usec); + } + + if (!ctl->testing) { ++ const struct timezone tz_utc = { 0 }; + const struct timezone tz = { minuteswest }; + +- if (ctl->hctosys && !ctl->universal) /* set PCIL */ ++ /* warp-clock */ ++ if (ctl->universal) ++ rc = settimeofday(NULL, &tz_utc); /* lock to UTC */ ++ else ++ rc = settimeofday(NULL, &tz); /* set PCIL and TZ */ ++ ++ /* set timezone */ ++ if (!rc && ctl->universal && minuteswest) + rc = settimeofday(NULL, &tz); +- if (ctl->systz && ctl->universal) /* lock warp_clock */ +- rc = settimeofday(NULL, &tz_utc); ++ ++ /* set time */ + if (!rc && ctl->hctosys) +- rc = settimeofday(&newtime, &tz); +- else if (!rc) +- rc = settimeofday(NULL, &tz); ++ rc = settimeofday(&newtime, NULL); + + if (rc) { + warn(_("settimeofday() failed")); +-- +2.17.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb index e9c2d80..557449d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.34.bb @@ -8,6 +8,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:37 +0000 Subject: [oe-commits] [openembedded-core] 17/26: scripts/combo-layer: Fix deprecation warning In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.1C2212328BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7b43e04424985cf71b9263969830c9e4e9d72e01 Author: Richard Purdie AuthorDate: Wed Feb 19 22:53:08 2020 +0000 scripts/combo-layer: Fix deprecation warning Resolve: combo-layer:83: DeprecationWarning: This method will be removed in future versions. Use 'parser.read_file()' instead. Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 9b50e98..a634dd6 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -80,7 +80,7 @@ class Configuration(object): logger.debug("Loading config file %s" % self.conffile) self.parser = configparser.ConfigParser() with open(self.conffile) as f: - self.parser.readfp(f) + self.parser.read_file(f) # initialize default values self.commit_msg_template = "Automatic commit to update last_revision" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:38 +0000 Subject: [oe-commits] [openembedded-core] 18/26: libxkbcommon: upgrade 0.9.1 -> 0.10.0 In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.25CF22328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 989f3f99f0ec385b0fc1c7d83f03800fd9327c94 Author: Wang Mingyu AuthorDate: Thu Feb 20 01:41:00 2020 -0800 libxkbcommon: upgrade 0.9.1 -> 0.10.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb similarity index 88% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb index c147428..16d9c36 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "4662756fd73ab0ac9e32efdad8f807f6" -SRC_URI[sha256sum] = "d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0" +SRC_URI[md5sum] = "2d9ad3a46b317138b5e72a91cf105451" +SRC_URI[sha256sum] = "57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:46 +0000 Subject: [oe-commits] [openembedded-core] 26/26: wayland: Fix strndup detection on MinGW In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.83B752328BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ffa91ff19f73c3ed4060a6ecd3b6da7f46732cb3 Author: Joshua Watt AuthorDate: Thu Feb 20 16:49:31 2020 -0600 wayland: Fix strndup detection on MinGW Applies a patch to fix strndup being detected as present incorrectly when building for MinGW. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- ...0001-build-Fix-strndup-detection-on-MinGW.patch | 39 ++++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch new file mode 100644 index 0000000..e445838 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -0,0 +1,39 @@ +From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Thu, 20 Feb 2020 15:20:45 -0600 +Subject: [PATCH] build: Fix strndup detection on MinGW + +GCC and meson conspire together to incorrectly detect that strndup() +exists on MinGW as __builtin_strndup, when no such function exists. As a +work around, meson will skip looking for __builtin functions if an +'#include' is in the prefix, so add '#include ' when looking +for strndup(). + +See: https://github.com/mesonbuild/meson/issues/3672 + +Signed-off-by: Joshua Watt +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 26b084f..c05d019 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,11 +36,11 @@ have_funcs = [ + 'posix_fallocate', + 'prctl', + 'memfd_create', +- 'strndup', + ] + foreach f: have_funcs + config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) + endforeach ++config_h.set('HAVE_STRNDUP', cc.has_function('strndup', prefix:'#include ')) + + if get_option('libraries') + ffi_dep = dependency('libffi') +-- +2.17.1 + diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index a702b3f..6a6e749 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -15,6 +15,7 @@ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ + file://0001-build-Fix-strndup-detection-on-MinGW.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:43 +0000 Subject: [oe-commits] [openembedded-core] 23/26: babeltrace: added ptest In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.60BE02328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b266a1ac662405e5bab98657c30b1a13cd86d046 Author: Anders Wallin AuthorDate: Thu Feb 20 06:23:44 2020 +0100 babeltrace: added ptest Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-kernel/lttng/babeltrace/run-ptest | 9 +++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 ++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 23865ac..752a088 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -61,6 +61,7 @@ PTESTS_FAST = "\ #" PTESTS_SLOW = "\ + babeltrace-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000..f4b7ce1 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index b6b7653..c050dc6 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -7,14 +7,92 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ + file://run-ptest \ + " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk" + +addtask do_patch_ptest_path after do_patch before do_configure +do_patch_ptest_path () { + for f in $(grep -l -r abs_top_srcdir ${S}/tests); do + sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} + done + + for f in $(grep -l -r abs_top_builddir ${S}/tests); do + sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} + done + for f in $(grep -l -r GREP ${S}/tests); do + sed -i 's:\@GREP\@:grep:' ${f} + done + + for f in $(grep -l -r SED ${S}/tests); do + sed -i 's:\@SED\@:sed:' ${f} + done +} + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + # Copy required files from source directory + for f in config/tap-driver.sh config/test-driver; do + install -D "${S}/$f" "${D}${PTEST_PATH}/$f" + done + install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" + cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ + ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/$(check_SCRIPTS)/s/^/#/' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Remove path to babeltrace. + for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do + sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} + done + for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do + sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} + done +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:45 +0000 Subject: [oe-commits] [openembedded-core] 25/26: wayland: convert to meson build In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.7869F2328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 88494d118b8ae85b3946df716cfa242a1858f270 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:43 2020 +0100 wayland: convert to meson build Replace an autotools-specific .pc adjustment patch with a meson-specific one. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-not-hardcode-the-path-to-wayland-scanner.patch | 26 ++++++++++++++++++ ...-find-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ---------------------- meta/recipes-graphics/wayland/wayland_1.18.0.bb | 11 ++++---- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch new file mode 100644 index 0000000..2199548 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -0,0 +1,26 @@ +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Feb 2020 21:46:18 +0100 +Subject: [PATCH] Do not hardcode the path to wayland-scanner + +This results in host contamination during builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 294aee0..7e410fa 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,7 +49,7 @@ pkgconfig.generate( + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000..f98037a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d..0000000 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075..a702b3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:39:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:39:44 +0000 Subject: [oe-commits] [openembedded-core] 24/26: oeqa/logparser: Fix performance issues with ptest log parsing In-Reply-To: <158227796073.14405.8091912688817468758@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> Message-ID: <20200221093922.6B8F52328BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 01c9f40b979e36a53e789a6bedd89b6d9557dce3 Author: Richard Purdie AuthorDate: Thu Feb 20 13:57:50 2020 +0000 oeqa/logparser: Fix performance issues with ptest log parsing On the autobuilder a ptest log with 2.1 million lines took around 18 hours to process. This is clearly crazy. We can tweak the processing code to: a) Stop repeatedly joining large strings together (append to a list instead) b) Use one startswith expression instead of multiple re.search() operations With this change it takes 18 hours down to around 12s. [YOCTO #13696] Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 7313df8..5403721 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -25,13 +25,20 @@ class PtestParser(object): section_regex['exitcode'] = re.compile(r"^ERROR: Exit status is (.+)") section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") + # Cache markers so we don't take the re.search() hit all the time. + markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + def newsection(): - return { 'name': "No-section", 'log': "" } + return { 'name': "No-section", 'log': [] } current_section = newsection() with open(logfile, errors='replace') as f: for line in f: + if not line.startswith(markers): + current_section['log'].append(line) + continue + result = section_regex['begin'].search(line) if result: current_section['name'] = result.group(1) @@ -61,7 +68,7 @@ class PtestParser(object): current_section[t] = result.group(1) continue - current_section['log'] = current_section['log'] + line + current_section['log'].append(line) for t in test_regex: result = test_regex[t].search(line) @@ -70,6 +77,11 @@ class PtestParser(object): self.results[current_section['name']] = {} self.results[current_section['name']][result.group(1).strip()] = t + # Python performance for repeatedly joining long strings is poor, do it all at once at the end. + # For 2.1 million lines in a log this reduces 18 hours to 12s. + for section in self.sections: + self.sections[section]['log'] = "".join(self.sections[section]['log']) + return self.results, self.sections # Log the results as files. The file name is the section name and the contents are the tests in that section. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:02 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (85281f8 -> d771d86) Message-ID: <158227800279.15554.17974975610236326040@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 85281f8 wayland: Fix strndup detection on MinGW discard 6844ad9 wayland: convert to meson build discard fca9ae6 oeqa/logparser: Fix performance issues with ptest log parsing discard 6eacf9e babeltrace: added ptest discard d56aa6d util-linux: fix hwclock settimeofday error discard 5e98b29 nfs-utils: upgrade 2.4.2 -> 2.4.3 discard 054fa7f mesa: upgrade 19.3.3 -> 19.3.4 discard fccfbf1 man-pages: upgrade 5.04 -> 5.05 discard 1cfd171 libxkbcommon: upgrade 0.9.1 -> 0.10.0 discard 74a8fb4 scripts/combo-layer: Fix deprecation warning discard 41d6995 libubootenv: bump to revision ba952d0 discard 5bae36a iproute2: add devlink support to iproute2 discard e043229 virglrenderer: upgrade 0.8.1 -> 0.8.2 discard 6e20f32 vala: upgrade 0.46.5 -> 0.46.6 discard 5d888ff meson: upgrade 0.53.0 -> 0.53.1 discard 5236fea libsecret: upgrade 0.20.0 -> 0.20.1 discard fc993d1 epiphany: upgrade 3.34.3.1 -> 3.34.4 discard a45d535 createrepo-c: upgrade 0.15.5 -> 0.15.7 discard 3f140c3 qemumips: use std vga instead of cirrus vga discard 2ea2589 weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines discard 5fa4184 webkitgtk: unbreak wayland build discard 6deda40 webkitgtk: x11 and wayland are not mutually exclusive discard ab9e6e8 oeqa/selftest: Drop 'backup' code and SIGTERM handler discard b868674 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest discard de4210c selftest/context: Avoid tracebacks from tests using multiprocessing discard f5396fd lttng-tools: upgrade 2.11.0 -> 2.11.2 discard d30092e HACK: extra debug discard fd10ee7 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard d56ca2a sstatesig: Log timestamps for hashequiv in reprodubile builds discard a966e82 HACK: signing: Add extra test debug discard ee50415 glew/curl: specify exclusive package configs discard cfc5bcc base.bbclass: extend PACKAGECONFIG for conflict package configs add 712a634 lttng-tools: upgrade 2.11.0 -> 2.11.2 add d9c62ff selftest/context: Avoid tracebacks from tests using multiprocessing add 50238b0 oeqa/selftest: Standardise seperate builddir for concurrent and non-concurrent selftest add b8ea8a9 oeqa/selftest: Drop 'backup' code and SIGTERM handler add 9d447fc webkitgtk: x11 and wayland are not mutually exclusive add 85431fe webkitgtk: unbreak wayland build add 1bddd7a weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines add 96e6434 qemumips: use std vga instead of cirrus vga add 7fc4dc3 createrepo-c: upgrade 0.15.5 -> 0.15.7 add 2c492e3 epiphany: upgrade 3.34.3.1 -> 3.34.4 add 66885ec libsecret: upgrade 0.20.0 -> 0.20.1 add c94ae81 meson: upgrade 0.53.0 -> 0.53.1 add b877317 vala: upgrade 0.46.5 -> 0.46.6 add c524e93 virglrenderer: upgrade 0.8.1 -> 0.8.2 add 00cc977 iproute2: add devlink support to iproute2 add 174cd0d libubootenv: bump to revision ba952d0 add 7b43e04 scripts/combo-layer: Fix deprecation warning add 989f3f9 libxkbcommon: upgrade 0.9.1 -> 0.10.0 add 5de2a4f man-pages: upgrade 5.04 -> 5.05 add 058e72b mesa: upgrade 19.3.3 -> 19.3.4 add fcaca33 nfs-utils: upgrade 2.4.2 -> 2.4.3 add b80bf70 util-linux: fix hwclock settimeofday error add b266a1a babeltrace: added ptest add 01c9f40 oeqa/logparser: Fix performance issues with ptest log parsing add 88494d1 wayland: convert to meson build add ffa91ff wayland: Fix strndup detection on MinGW new 7fa8f82 base.bbclass: extend PACKAGECONFIG for conflict package configs new b618172 glew/curl: specify exclusive package configs new 02146e1 HACK: signing: Add extra test debug new bc32fa1 sstatesig: Log timestamps for hashequiv in reprodubile builds new 022493b rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new d771d86 HACK: extra debug This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (85281f8) \ N -- N -- N refs/heads/master-next (d771d86) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:05 +0000 Subject: [oe-commits] [openembedded-core] 03/06: HACK: signing: Add extra test debug In-Reply-To: <158227800279.15554.17974975610236326040@git.openembedded.org> References: <158227800279.15554.17974975610236326040@git.openembedded.org> Message-ID: <20200221094003.1092E2328BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 02146e11221013128b7f9a07b878187242caf06c Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:03 +0000 Subject: [oe-commits] [openembedded-core] 01/06: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158227800279.15554.17974975610236326040@git.openembedded.org> References: <158227800279.15554.17974975610236326040@git.openembedded.org> Message-ID: <20200221094002.ECAED2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7fa8f82557bc00e88ee489d7c763ddffdd2b493d Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:06 +0000 Subject: [oe-commits] [openembedded-core] 04/06: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158227800279.15554.17974975610236326040@git.openembedded.org> References: <158227800279.15554.17974975610236326040@git.openembedded.org> Message-ID: <20200221094003.1B9562328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bc32fa18a0135f161e6476024522462660396b7b Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:04 +0000 Subject: [oe-commits] [openembedded-core] 02/06: glew/curl: specify exclusive package configs In-Reply-To: <158227800279.15554.17974975610236326040@git.openembedded.org> References: <158227800279.15554.17974975610236326040@git.openembedded.org> Message-ID: <20200221094003.0396D2328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b618172bbcf090ab5caa9f94fa5585e514285e58 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:08 +0000 Subject: [oe-commits] [openembedded-core] 06/06: HACK: extra debug In-Reply-To: <158227800279.15554.17974975610236326040@git.openembedded.org> References: <158227800279.15554.17974975610236326040@git.openembedded.org> Message-ID: <20200221094003.32FF92328BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d771d86c73aa31c50d9160b235a2bcd3115d4f25 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:40:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:40:07 +0000 Subject: [oe-commits] [openembedded-core] 05/06: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158227800279.15554.17974975610236326040@git.openembedded.org> References: <158227800279.15554.17974975610236326040@git.openembedded.org> Message-ID: <20200221094003.27CAB2328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 022493b12eafcb0cf1280a7af522b468b4cf153b Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..b2eada5 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:21 +0000 Subject: [oe-commits] [openembedded-core] branch warrior updated (a63d59f -> 8063a12) Message-ID: <158227868167.22141.10815143790770448112@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch warrior in repository openembedded-core. from a63d59f sanity.bbclass: Move sanity_info from conf to cache new 2be6ab4 libxml2: Fix CVE-2019-19956 new 0a88a86 rsync: whitelist CVE-2017-16548 new ea05533 cpio: fix CVE-2019-14866 new 71edff0 linux-yocto/4.19: update to v4.19.72 new bdc7d1a linux-yocto/4.19: update to v4.19.78 new 6984430 linux-yocto/4.19: update to v4.19.84 new fca2e86 linux-yocto/4.19: update to v4.19.87 new 3e69681 python2: add ntpath new 1d1dcea timezone: update to 2019b new 0d58f5a timezone:upgrade 2019b -> 2019c new 1c16c37 linux-firmware: bump to 20190618 new b1433f3 linux-firmware: add PE back new 34428ec linux-firmware: Upgrade 20190618 -> 20190815 new 8063a12 linux-firmware: update packaging for brcm files The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 +++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + .../python/python/python2-manifest.json | 1 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 +++++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + meta/recipes-extended/timezone/timezone.inc | 10 +- ...-firmware_git.bb => linux-firmware_20190815.bb} | 26 +- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +- 11 files changed, 397 insertions(+), 33 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch rename meta/recipes-kernel/linux-firmware/{linux-firmware_git.bb => linux-firmware_20190815.bb} (98%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:22 +0000 Subject: [oe-commits] [openembedded-core] 01/14: libxml2: Fix CVE-2019-19956 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.243E52328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 2be6ab4249c4f49c9ffcd9bb8fea964c8c5d449c Author: Rahul Chauhan AuthorDate: Fri Feb 7 08:36:22 2020 +0530 libxml2: Fix CVE-2019-19956 Signed-off-by: Rahul Chauhan Signed-off-by: Armin Kuster --- .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 39 insertions(+) diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch new file mode 100644 index 0000000..43c3589 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch @@ -0,0 +1,38 @@ +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Rahul Chauhan +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index b7ecd65..491f5c9 100644 +--- a/parser.c ++++ b/parser.c +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.7.4 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 62643bc..67c2d4f 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-CVE-2017-8872.patch \ file://fix-CVE-2018-14404.patch \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ + file://fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:23 +0000 Subject: [oe-commits] [openembedded-core] 02/14: rsync: whitelist CVE-2017-16548 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.313892328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 0a88a86d92b294175c14c7c5a2533d4e418fec6a Author: Lee Chee Yang AuthorDate: Tue Jan 21 13:26:47 2020 +0800 rsync: whitelist CVE-2017-16548 patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce (From OE-Core rev: 1e2739c821312527010fb0afbde5a20cd3f03d24) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit 842bd7ca21efc6378ba24a8d0bf065c4d0f54f1d) Signed-off-by: Armin Kuster --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d06..152ff02 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:24 +0000 Subject: [oe-commits] [openembedded-core] 03/14: cpio: fix CVE-2019-14866 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.3A4EF2328BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit ea0553398a2882a7a6e3c276dd3d81129a417a25 Author: Anuj Mittal AuthorDate: Wed Feb 5 12:39:05 2020 +0800 cpio: fix CVE-2019-14866 Signed-off-by: Anuj Mittal (cherry picked from commit 3a9872c664cdc5c5a6ac712142ce1d28d6fcd6d1) Signed-off-by: Armin Kuster --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 +++++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + 2 files changed, 317 insertions(+) diff --git a/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch new file mode 100644 index 0000000..5d587fc --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch @@ -0,0 +1,316 @@ +CVE: CVE-2019-14866 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=7554e3e42cd72f6f8304410c47fe6f8918e9bfd7] +Signed-off-by: Anuj Mittal + +From a052401293e45a13cded5959b258204dae6d0af5 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 3 Nov 2019 23:59:39 +0200 +Subject: [PATCH] Fix CVE-2019-14866 + +* src/copyout.c (to_ascii): Additional argument nul controls whether +to add the terminating nul character. +(field_width_error): Improve diagnostics: print the actual and the +maximum allowed field value. +* src/extern.h (to_ascii, field_width_error): New prototypes. +* src/tar.c (to_oct): Remove. +(to_oct_or_error): New function. +(TO_OCT): New macro. +(write_out_tar_header): Use TO_OCT and to_ascii. Return 0 on +success, 1 on error. +--- + src/copyout.c | 49 ++++++++++++++++++++++-------------- + src/extern.h | 15 +++++++++-- + src/tar.c | 69 ++++++++++++++++++++++++--------------------------- + 3 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..1ae5477 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -269,26 +269,32 @@ writeout_final_defers (int out_des) + so it should be moved to paxutils too. + Allowed values for logbase are: 1 (binary), 2, 3 (octal), 4 (hex) */ + int +-to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase) ++to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, bool nul) + { + static char codetab[] = "0123456789ABCDEF"; +- int i = digits; +- +- do ++ ++ if (nul) ++ where[--digits] = 0; ++ while (digits > 0) + { +- where[--i] = codetab[(v & ((1 << logbase) - 1))]; ++ where[--digits] = codetab[(v & ((1 << logbase) - 1))]; + v >>= logbase; + } +- while (i); + + return v != 0; + } + +-static void +-field_width_error (const char *filename, const char *fieldname) ++void ++field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul) + { +- error (0, 0, _("%s: field width not sufficient for storing %s"), +- filename, fieldname); ++ char valbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%s"), ++ filename, fieldname, ++ STRINGIFY_BIGINT (value, valbuf), ++ STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8), ++ maxbuf)); + } + + static void +@@ -303,7 +309,7 @@ to_ascii_or_warn (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + field_width_warning (filename, fieldname); + } + +@@ -312,9 +318,9 @@ to_ascii_or_error (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + { +- field_width_error (filename, fieldname); ++ field_width_error (filename, fieldname, n, digits, false); + return 1; + } + return 0; +@@ -371,7 +377,7 @@ write_out_new_ascii_header (const char *magic_string, + _("name size"))) + return 1; + p += 8; +- to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16); ++ to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16, false); + + tape_buffered_write (ascii_header, out_des, sizeof ascii_header); + +@@ -388,7 +394,7 @@ write_out_old_ascii_header (dev_t dev, dev_t rdev, + char ascii_header[76]; + char *p = ascii_header; + +- to_ascii (p, file_hdr->c_magic, 6, LG_8); ++ to_ascii (p, file_hdr->c_magic, 6, LG_8, false); + p += 6; + to_ascii_or_warn (p, dev, 6, LG_8, file_hdr->c_name, _("device number")); + p += 6; +@@ -492,7 +498,10 @@ write_out_binary_header (dev_t rdev, + short_hdr.c_namesize = file_hdr->c_namesize & 0xFFFF; + if (short_hdr.c_namesize != file_hdr->c_namesize) + { +- field_width_error (file_hdr->c_name, _("name size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%u"), ++ file_hdr->c_name, _("name size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFu); + return 1; + } + +@@ -502,7 +511,10 @@ write_out_binary_header (dev_t rdev, + if (((off_t)short_hdr.c_filesizes[0] << 16) + short_hdr.c_filesizes[1] + != file_hdr->c_filesize) + { +- field_width_error (file_hdr->c_name, _("file size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%lu"), ++ file_hdr->c_name, _("file size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFFFFFlu); + return 1; + } + +@@ -552,8 +564,7 @@ write_out_header (struct cpio_file_stat *file_hdr, int out_des) + error (0, 0, _("%s: file name too long"), file_hdr->c_name); + return 1; + } +- write_out_tar_header (file_hdr, out_des); /* FIXME: No error checking */ +- return 0; ++ return write_out_tar_header (file_hdr, out_des); + + case arf_binary: + return write_out_binary_header (makedev (file_hdr->c_rdev_maj, +diff --git a/src/extern.h b/src/extern.h +index e27d662..f9ef56a 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -117,6 +117,10 @@ void print_name_with_quoting (char *p); + /* copyout.c */ + int write_out_header (struct cpio_file_stat *file_hdr, int out_des); + void process_copy_out (void); ++int to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, ++ bool nul); ++void field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul); + + /* copypass.c */ + void process_copy_pass (void); +@@ -145,7 +149,7 @@ int make_path (char *argpath, uid_t owner, gid_t group, + const char *verbose_fmt_string); + + /* tar.c */ +-void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); ++int write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); + int null_block (long *block, int size); + void read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des); + int otoa (char *s, unsigned long *n); +@@ -204,9 +208,16 @@ void cpio_safer_name_suffix (char *name, bool link_target, + int cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir); + void change_dir (void); + +-/* FIXME: These two defines should be defined in paxutils */ ++/* FIXME: The following three should be defined in paxutils */ + #define LG_8 3 + #define LG_16 4 ++/* The maximum uintmax_t value that can be represented with DIGITS digits, ++ assuming that each digit is BITS_PER_DIGIT wide. */ ++#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ ++ ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ ++ ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ ++ : (uintmax_t) -1) ++ + + uintmax_t from_ascii (char const *where, size_t digs, unsigned logbase); + +diff --git a/src/tar.c b/src/tar.c +index a2ce171..ef58027 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -79,36 +79,17 @@ stash_tar_filename (char *prefix, char *filename) + return hold_tar_filename; + } + +-/* Convert a number into a string of octal digits. +- Convert long VALUE into a DIGITS-digit field at WHERE, +- including a trailing space and room for a NUL. DIGITS==3 means +- 1 digit, a space, and room for a NUL. +- +- We assume the trailing NUL is already there and don't fill it in. +- This fact is used by start_header and finish_header, so don't change it! +- +- This is be equivalent to: +- sprintf (where, "%*lo ", digits - 2, value); +- except that sprintf fills in the trailing NUL and we don't. */ +- +-static void +-to_oct (register long value, register int digits, register char *where) ++static int ++to_oct_or_error (uintmax_t value, size_t digits, char *where, char const *field, ++ char const *file) + { +- --digits; /* Leave the trailing NUL slot alone. */ +- +- /* Produce the digits -- at least one. */ +- do ++ if (to_ascii (where, value, digits, LG_8, true)) + { +- where[--digits] = '0' + (char) (value & 7); /* One octal digit. */ +- value >>= 3; ++ field_width_error (file, field, value, digits, true); ++ return 1; + } +- while (digits > 0 && value != 0); +- +- /* Add leading zeroes, if necessary. */ +- while (digits > 0) +- where[--digits] = '0'; ++ return 0; + } +- + + + /* Compute and return a checksum for TAR_HDR, +@@ -134,10 +115,22 @@ tar_checksum (struct tar_header *tar_hdr) + return sum; + } + ++#define TO_OCT(file_hdr, c_fld, digits, tar_hdr, tar_field) \ ++ do \ ++ { \ ++ if (to_oct_or_error (file_hdr -> c_fld, \ ++ digits, \ ++ tar_hdr -> tar_field, \ ++ #tar_field, \ ++ file_hdr->c_name)) \ ++ return 1; \ ++ } \ ++ while (0) ++ + /* Write out header FILE_HDR, including the file name, to file + descriptor OUT_DES. */ + +-void ++int + write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + { + int name_len; +@@ -166,11 +159,11 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + + /* Ustar standard (POSIX.1-1988) requires the mode to contain only 3 octal + digits */ +- to_oct (file_hdr->c_mode & MODE_ALL, 8, tar_hdr->mode); +- to_oct (file_hdr->c_uid, 8, tar_hdr->uid); +- to_oct (file_hdr->c_gid, 8, tar_hdr->gid); +- to_oct (file_hdr->c_filesize, 12, tar_hdr->size); +- to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime); ++ TO_OCT (file_hdr, c_mode & MODE_ALL, 8, tar_hdr, mode); ++ TO_OCT (file_hdr, c_uid, 8, tar_hdr, uid); ++ TO_OCT (file_hdr, c_gid, 8, tar_hdr, gid); ++ TO_OCT (file_hdr, c_filesize, 12, tar_hdr, size); ++ TO_OCT (file_hdr, c_mtime, 12, tar_hdr, mtime); + + switch (file_hdr->c_mode & CP_IFMT) + { +@@ -182,7 +175,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); + tar_hdr->typeflag = LNKTYPE; +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + } + else + tar_hdr->typeflag = REGTYPE; +@@ -208,7 +201,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + than TARLINKNAMESIZE. */ + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + break; + #endif /* CP_IFLNK */ + } +@@ -227,13 +220,15 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + if (name) + strcpy (tar_hdr->gname, name); + +- to_oct (file_hdr->c_rdev_maj, 8, tar_hdr->devmajor); +- to_oct (file_hdr->c_rdev_min, 8, tar_hdr->devminor); ++ TO_OCT (file_hdr, c_rdev_maj, 8, tar_hdr, devmajor); ++ TO_OCT (file_hdr, c_rdev_min, 8, tar_hdr, devminor); + } + +- to_oct (tar_checksum (tar_hdr), 8, tar_hdr->chksum); ++ to_ascii (tar_hdr->chksum, tar_checksum (tar_hdr), 8, LG_8, true); + + tape_buffered_write ((char *) &tar_rec, out_des, TARRECORDSIZE); ++ ++ return 0; + } + + /* Return nonzero iff all the bytes in BLOCK are NUL. +-- +2.24.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 3713bf0..5abe494 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ file://0001-Fix-segfault-with-append.patch \ + file://CVE-2019-14866.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:29 +0000 Subject: [oe-commits] [openembedded-core] 08/14: python2: add ntpath In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.7EA8C2328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 3e69681857b88be44797d1d302b9e44a46a7634d Author: Armin Kuster AuthorDate: Tue Feb 4 07:06:08 2020 -0800 python2: add ntpath python3 has this but python is missing this. [Yocto #13740] Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit af41a2238beec0c34c1c1e5f25eed55f2a214643) Signed-off-by: Armin Kuster --- meta/recipes-devtools/python/python/python2-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index eb52e86..fd98774 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -267,6 +267,7 @@ "${libdir}/python2.7/lib-dynload/xreadlines.so", "${libdir}/python2.7/linecache.py", "${libdir}/python2.7/new.py", + "${libdir}/python2.7/ntpath.py", "${libdir}/python2.7/os.py", "${libdir}/python2.7/platform.py", "${libdir}/python2.7/posixpath.py", -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:25 +0000 Subject: [oe-commits] [openembedded-core] 04/14: linux-yocto/4.19: update to v4.19.72 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.4CAE22328BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 71edff03db1a508ab9e1a919b5a5b90ee7316609 Author: Bruce Ashfield AuthorDate: Tue Sep 24 18:00:55 2019 -0400 linux-yocto/4.19: update to v4.19.72 Updating to the latest -korg -stable relase. A summary of the changes follows: ee809c7e0895 Linux 4.19.72 991467a47cf2 Revert "x86/apic: Include the LDR when clearing out APIC registers" 0f134f6e722c libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer 5049632bc958 x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement() b8727dff55f0 KVM: arm/arm64: VGIC: Properly initialise private IRQ affinity 1a31b0d0ddfa afs: Fix leak in afs_lookup_cell_rcu() 111d36b6fb7e KVM: arm/arm64: Only skip MMIO insn once b84817d96e0f ceph: fix buffer free while holding i_ceph_lock in fill_inode() 5cd1e3552f0e ceph: fix buffer free while holding i_ceph_lock in __ceph_build_xattrs_blob() dfb8712c7acc ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr() ddb55cc39c70 selftests/kvm: make platform_info_test pass on AMD 6cb9f8d60f8f selftests: kvm: fix state save/load on processors without XSAVE 08c2052815e3 infiniband: hfi1: fix memory leaks d1b7f3252d56 infiniband: hfi1: fix a memory leak bug adb87027b5ff IB/mlx4: Fix memory leaks 5e416b11b4a9 nvme-multipath: fix possible I/O hang when paths are updated 5bbebceec61d Tools: hv: kvp: eliminate 'may be used uninitialized' warning 1d42e40fe3c5 Input: hyperv-keyboard: Use in-place iterator API in the channel callback e02aac3edb46 x86/boot/compressed/64: Fix boot on machines with broken E820 table 05d611c4ffb7 HID: cp2112: prevent sleeping function called from invalid context 5e1d50a3eafe kprobes: Fix potential deadlock in kprobe_optimizer() a5839b6b3a79 ravb: Fix use-after-free ravb_tstamp_skb 54eac3997ee4 wimax/i2400m: fix a memory leak bug 7506e8c4bec8 net: cavium: fix driver name ea78dc8b5e66 ibmvnic: Unmap DMA address of TX descriptor buffers after use 4fcb9b3f263e net: kalmia: fix memory leaks 1ad45d0f69d2 cx82310_eth: fix a memory leak bug ac3cc25f380b vfs: fix page locking deadlocks when deduping files 9ea1feadf5e0 lan78xx: Fix memory leaks 375ab446ec76 net: myri10ge: fix memory leaks f13b7ec5e1c5 liquidio: add cleanup in octeon_setup_iq() 2c3dd20f852a cxgb4: fix a memory leak bug b8cd0b7b09ed scsi: target: tcmu: avoid use-after-free after command timeout 6c9a1e17d063 scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure b3496367d9cb drm/mediatek: set DMA max segment size c9f595453bc3 drm/mediatek: use correct device to import PRIME buffers a54fa5dff8cd netfilter: nft_flow_offload: skip tcp rst and fin packets 6052090280b8 gpio: Fix build error of function redefinition cc8aa6155611 ibmveth: Convert multicast list size for little-endian system 32e912b91b5d Bluetooth: btqca: Add a short delay before downloading the NVM 7b7a11549dc1 net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx 752832f2e8c9 hv_netvsc: Fix a warning of suspicious RCU usage 463d87bc13ff tools: bpftool: fix error message (prog -> object) 5776970fb4ec netfilter: nf_tables: use-after-free in failing rule with bound set d22ed7b72acf net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context 3ddda4f3114b spi: bcm2835aux: fix corruptions for longer spi transfers fe49c3de7372 spi: bcm2835aux: remove dangerous uncontrolled read of fifo a4a9ee79036b spi: bcm2835aux: unifying code between polling and interrupt driven code ee271ead3b61 x86/boot: Preserve boot_params.secure_boot from sanitizing 9484203d254d net/rds: Fix info leak in rds6_inc_info_copy() 5977bc19ce7f tcp: remove empty skb from write queue in error cases 6f3126379879 tcp: inherit timestamp on mtu probe 6f8348f63706 net: stmmac: dwmac-rk: Don't fail if phy regulator is absent 38166934f89c net_sched: fix a NULL pointer deref in ipt action 5ff0ab0c668b net: sched: act_sample: fix psample group handling on overwrite 6a2bd8261630 net: fix skb use after free in netpoll 8a5d27eaba68 mld: fix memory leak in mld_del_delrec() e7d2672c66e4 Linux 4.19.71 72168ae78629 Revert "Input: elantech - enable SMBus on new (2018+) systems" 0fed55c248d9 Linux 4.19.70 9854d089f790 Revert "ASoC: Fail card instantiation if DAI format setup fails" e064466cb614 mt76: mt76x0u: do not reset radio on resume b307f99dca5a x86/ptrace: fix up botched merge of spectrev1 fix 3b26fa9e3ec3 i2c: piix4: Fix port selection for AMD Family 16h Model 30h 4f4be79c9ee7 NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0 b5891b624b9a NFS: Pass error information to the pgio error cleanup routine 812de6dee596 NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend() 57c491fd844d NFS: Clean up list moves of struct nfs_page 79f1b33c53a0 KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI ab8ecc278dc8 KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long db1841a2dd4c KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling 938e383738d9 mac80211: Correctly set noencrypt for PAE frames 4f139c0376fb mac80211: Don't memset RXCB prior to PAE intercept 58f91aac4dfe mac80211: fix possible sta leak 945b35972803 Revert "cfg80211: fix processing world regdomain when non modular" 690a424838ca crypto: ccp - Ignore unconfigured CCP device on suspend/resume 4e77b2ea941b VMCI: Release resource if the work is already queued 2a964875def7 bus: hisi_lpc: Add .remove method to avoid driver unbind crash 649532efef46 bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free 68b58d392464 drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe() c7615333645d drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest 6d3003f56449 drm/amdgpu: Add APTX quirk for Dell Latitude 5495 c4616a9b3d3f lib: logic_pio: Add logic_pio_unregister_range() 7faef13e6f68 lib: logic_pio: Avoid possible overlap for unregistering regions b865c2c6e3f2 lib: logic_pio: Fix RCU usage 79829fc4ff33 fsi: scom: Don't abort operations for minor errors e44840b7320c typec: tcpm: fix a typo in the comparison of pdo_max_voltage e91c9c119dba intel_th: pci: Add Tiger Lake support ce1c894e1e89 intel_th: pci: Add support for another Lewisburg PCH cad1d3bfdd5d stm class: Fix a double free of stm_source_device abc42341b6c4 mmc: core: Fix init of SD cards reporting an invalid VDD range 1ecc65e1418b mmc: sdhci-of-at91: add quirk for broken HS200 be8e9fa67ea7 mei: me: add Tiger Lake point LP device ID 5ed36421af24 USB: storage: ums-realtek: Whitelist auto-delink support f79d1598968b USB: storage: ums-realtek: Update module parameter description for auto_delink_en f46fd68a541f usb: host: xhci: rcar: Fix typo in compatible string matching 7af7737491ce usb: host: ohci: fix a race condition between shutdown and irq a209827549da usb: chipidea: udc: don't do hardware access if gadget has stopped 97bec7afb98f usb: hcd: use managed device resources ebad9fd106da USB: cdc-wdm: fix race between write and disconnect due to flag abuse cbf5a279a22d usb-storage: Add new JMS567 revision to unusual_devs 8ea639525db6 ftrace: Check for empty hash and comment the race with registering probes 9d98e0f4859d ftrace: Check for successful allocation of hash f184b16748f4 ftrace: Fix NULL pointer dereference in t_probe_next() edc454cd5a04 x86/apic: Include the LDR when clearing out APIC registers 959832657c03 x86/apic: Do not initialize LDR and DFR for bigsmp 941d875cd44a uprobes/x86: Fix detection of 32-bit user mode 3c2b4827798e KVM: x86: Don't update RIP or do single-step on faulting emulation 3ec35109c80a kvm: x86: skip populating logical dest map if apic is not sw enabled cbd905dac535 ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604 b5d1f31d97af ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate() 98a2017c4a17 ALSA: seq: Fix potential concurrent access to the deleted pool 842317de9797 ALSA: hda - Fixes inverted Conexant GPIO mic mute led 5ef43bdc7321 ALSA: line6: Fix memory leak at line6_init_pcm() error path c94c0bf878bf ALSA: usb-audio: Check mixer unit bitmap yet more strictly 5dd2db1ab006 mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n 9febfd30aede ipv4/icmp: fix rt dst dev null pointer dereference 0a6a9c473080 tcp: make sure EPOLLOUT wont be missed 3e79bd1e4f9a net/smc: make sure EPOLLOUT is raised ff129837a5f6 ipv6: Default fib6_type to RTN_UNICAST when not set 02127bdfee97 ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set a1407b26a6ed net: tls, fix sk_write_space NULL write when tx disabled fdc4400e9628 net/tls: swap sk_write_space on close f7009bbaff54 net/tls: Fixed return value when tls_complete_pending_work() fails dc066fd0d073 drm/tilcdc: Register cpufreq notifier after we have initialized crtc eba86f0a909f scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value edd40f54736d drm/bridge: tfp410: fix memleak in get_modes() 2fa7c944e11f watchdog: bcm2835_wdt: Fix module autoload a3eb2eba2f79 drm/i915: fix broadwell EU computation c61c7246dc1f tools: hv: fix KVP and VSS daemons exit code 0c39d818aae4 tools: hv: fixed Python pep8/flake8 warnings for lsvmbus 39ad18a042ab usb: host: fotg2: restart hcd after port reset 37654abed26f drm/ast: Fixed reboot test may cause system hanged 1cc2ef1cfbd8 i2c: emev2: avoid race when unregistering slave client 7048cd814f4e i2c: rcar: avoid race when unregistering slave client 8bd5426889c2 arm64: cpufeature: Don't treat granule sizes as strict eb535aaf3cd7 xen/blkback: fix memory leaks 339c1572a266 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt 122ab8ea641c usb: gadget: composite: Clear "suspended" on reset/disconnect 21ec20f62fae iommu/dma: Handle SG length overflow better 7f4b81365e83 omap-dma/omap_vout_vrfb: fix off-by-one fi value 71d24f45f905 dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler() 377ebe613ed8 auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach 2f87eb895ebd soundwire: cadence_master: fix definitions for INTSTAT0/1 29b064d300a2 soundwire: cadence_master: fix register definition for SLAVE_STATE 4a9829195d9e nvme-pci: Fix async probe remove race 431f579a5349 nvme: fix a possible deadlock when passthru commands sent to a multipath device 32c0b8f10351 nvmet-loop: Flush nvme_delete_wq when removing the port 9c55dc85d890 afs: Only update d_fsdata if different in afs_d_revalidate() 24e093b96905 fs: afs: Fix a possible null-pointer dereference in afs_put_read() 8e5179f982f9 afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u() dfc438c0bc6d afs: Fix the CB.ProbeUuid service handler to reply correctly 7436dc2adeff nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns 2013d6ec0bc0 dmaengine: ste_dma40: fix unneeded variable warning 97ab07e11fbf Linux 4.19.69 6d47174198ac rxrpc: Fix local refcounting ce3f9e194d25 rxrpc: Fix local endpoint replacement a05354cbb822 rxrpc: Fix read-after-free in rxrpc_queue_local() f28023c4eedc rxrpc: Fix local endpoint refcounting 32df8a30b734 powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB 0d5e34c1e263 dm zoned: fix potential NULL dereference in dmz_do_reclaim() 655bb2c4ace4 xfs: always rejoin held resources during defer roll 83a8e6b2f2e3 xfs: Add attibute remove and helper functions b21ff6cfcc24 xfs: Add attibute set and helper functions b3a248f2307c xfs: Add helper function xfs_attr_try_sf_addname a9912f346bdc xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h 17c2b7af71f2 xfs: don't trip over uninitialized buffer on extent read of corrupted inode 11f85d4d77af xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT ed11e6003314 mm/zsmalloc.c: fix race condition in zs_destroy_pool b30a2f608e94 mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely db67ac031655 mm, page_owner: handle THP splits correctly 42731deff2ea genirq: Properly pair kobject_del() with kobject_add() c14fe4e8fd01 dm zoned: properly handle backing device failure 4530f2f1a79a dm zoned: improve error handling in i/o map code 8b7c17bb2753 dm zoned: improve error handling in reclaim ded8e524cfa6 dm table: fix invalid memory accesses with too high sector number 53e73d1079d7 dm space map metadata: fix missing store of apply_bops() return value 2cff6c87a0dc dm raid: add missing cleanup in raid_ctr() 795b0572729b dm integrity: fix a crash due to BUG_ON in __journal_read_write() 8114012de6c1 dm btree: fix order of block initialization in btree_split_beneath e0fb8135de9e dm kcopyd: always complete failed jobs f7d157f33001 x86/boot: Fix boot regression caused by bootparam sanitizing d955601166f8 x86/boot: Save fields explicitly, zero out everything else e063b03b451a x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h 685e598e447e x86/apic: Handle missing global clockevent gracefully f9747104a5c8 x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386 cf13e30c58d4 userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx a6f236e1bd97 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE 3783c7ee9920 gpiolib: never report open-drain/source lines as 'input' to user-space f88c31b43bab drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX 51f6afddb147 libceph: fix PG split vs OSD (re)connect race f2951720629e ceph: don't try fill file_lock on unsuccessful GETFILELOCK reply 7bed2889cd18 ceph: clear page dirty before invalidate page a8f7703f2213 clk: socfpga: stratix10: fix rate caclulationg for cnt_clks b608a5a238d5 Revert "dm bufio: fix deadlock with loop device" 375c6c72f56c HID: wacom: Correct distance scale for 2nd-gen Intuos devices 8317fe4a3906 HID: wacom: correct misreported EKR ring values 3c4b283a0deb selftests: kvm: Adding config fragments ef61b79017ff KVM: arm: Don't write junk to CP15 registers on reset d5cb5b493030 KVM: arm64: Don't write junk to sysregs on reset 590549487679 perf pmu-events: Fix missing "cpu_clk_unhalted.core" event 06ed429b9018 perf cpumap: Fix writing to illegal memory in handling cpumap mask e49cfed0a8cb perf ftrace: Fix failure to set cpumask when only one cpu is present 7aa8dfa450b4 block, bfq: handle NULL return value by bfq_init_rq() fa6f4687805a drm/vmwgfx: fix memory leak when too many retries have occurred 923de016dc88 x86/lib/cpu: Address missing prototypes warning 3ca013cd63be libata: add SG safety checks in SFF pio transfers 3b84bbef51c4 libata: have ata_scsi_rw_xlat() fail invalid passthrough requests e0c030221b1f net: hisilicon: Fix dma_map_single failed on arm64 4ab3052568e5 net: hisilicon: fix hip04-xmit never return TX_BUSY 09ec5bf10749 net: hisilicon: make hip04_tx_reclaim non-reentrant b8d03c79e403 net: stmmac: tc: Do not return a fragment entry b6cd6d18423e net: stmmac: Fix issues when number of Queues >= 4 45e7e4e66b08 net: cxgb3_main: Fix a resource leak in a error path in 'init_one()' db106f695414 s390: put _stext and _etext into .text section 33bdea175df0 SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL fab5a1fd17a6 SMB3: Fix potential memory leak when processing compound chain 6cb4997861c8 drm/rockchip: Suspend DP late 1c6ca0921705 HID: input: fix a4tech horizontal wheel custom usage f6f9c4491ec5 HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on Saitek X52 b6fb2f5b33f2 NFS: Fix regression whereby fscache errors are appearing on 'nofsc' mounts 66daeec347f0 NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim() d1ba0b81e709 net/ethernet/qlogic/qed: force the string buffer NULL-terminated 35d9e9211baf can: peak_usb: force the string buffer NULL-terminated 895c8fcfedad can: sja1000: force the string buffer NULL-terminated a3d1263c9b03 perf bench numa: Fix cpu0 binding 4533d08b6528 net: phy: phy_led_triggers: Fix a possible null-pointer dereference in phy_led_trigger_change_speed() 07efe13b95ab isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack 4db2043eec46 rxrpc: Fix the lack of notification when sendmsg() fails on a DATA packet 0d68fbc2d07b rxrpc: Fix potential deadlock 63dd147e7af0 netfilter: ipset: Fix rename concurrency with listing ea08214d8cd0 netfilter: ipset: Copy the right MAC address in bitmap:ip,mac and hash:ip,mac sets 5a072ef6a296 netfilter: ipset: Actually allow destination MAC address for hash:ip,mac sets too ba42212ac0a0 mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl() 32cbe03539ac isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain() 8a24df575c97 qed: RDMA - Fix the hw_ver returned in device attributes cb64e86ee0d1 net: usb: qmi_wwan: Add the BroadMobi BM818 card bfa713f5cec5 ASoC: ti: davinci-mcasp: Correct slot_width posed constraint dd0ff288e344 ASoC: rockchip: Fix mono capture c5cb10632c0f st_nci_hci_connectivity_event_received: null check the allocation 0d73ba88f466 st21nfca_connectivity_event_received: null check the allocation 714a8438fc8a ASoC: Fail card instantiation if DAI format setup fails bd2f4c7c2d6a can: gw: Fix error path of cgw_module_init 3257103502cf can: mcp251x: add error check when wq alloc failed dbf790dcb8a9 can: dev: call netif_carrier_off() in register_candev() 43d31fd9a8f2 selftests: forwarding: gre_multipath: Fix flower filters ef52e2b9a621 selftests: forwarding: gre_multipath: Enable IPv4 forwarding 192bbe9d57ed net: mvpp2: Don't check for 3 consecutive Idle frames for 10G links a1e5a76db8dd bonding: Force slave speed check after link state recovery for 802.3ad b7038c195fd1 selftests/bpf: fix sendmsg6_prog on s390 e6dc6409f474 ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks 71305e8ee503 netfilter: ebtables: fix a memory leak bug in compat 70b4edd74b6d mips: fix cacheinfo 326175aa28fd MIPS: kernel: only use i8253 clocksource with periodic clockevent a6067c6e630f HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT def4c11b3131 Linux 4.19.68 7c13983a2860 mmc: sdhci-of-arasan: Do now show error message in case of deffered probe 447f5f48f4fa net/mlx5e: Use flow keys dissector to parse packets for ARFS fbd8ab680675 net/mlx5e: Only support tx/rx pause setting for port owner b3410f0f8505 xen/netback: Reset nr_frags before freeing skb cc4ff0f4f564 tipc: initialise addr_trail_end when setting node addresses e89bb758c030 team: Add vlan tx offload to hw_enc_features eeb148d20819 sctp: fix the transport error_count check 227f204ad197 sctp: fix memleak in sctp_send_reset_streams 154e6bc497c9 net/packet: fix race in tpacket_snd() f588dccfc137 net/mlx4_en: fix a memory leak bug 8905a249448c net: dsa: Check existence of .port_mdb_add callback before calling it d61d8ea9ca12 bonding: Add vlan tx offload to hw_enc_features 40933af400c5 bnx2x: Fix VF's VLAN reconfiguration in reload. 03d54393e3d7 iommu/amd: Move iommu_init_pci() to .init section 62e023ddd01a Input: psmouse - fix build error of multiple definition 28ff7d3b3fda netfilter: conntrack: Use consistent ct id hash calculation 30b9da0ec2a2 arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side a1cd2f7015bd dm: disable DISCARD if the underlying storage no longer supports it 4af28b2f19b0 drm/i915/cfl: Add a new CFL PCI ID. 3ca5b7b4afee USB: serial: option: Add Motorola modem UARTs e480d6cf6f79 USB: serial: option: add the BroadMobi BM818 card 8175fa2987a6 USB: serial: option: Add support for ZTE MF871A afb677b29995 USB: serial: option: add D-Link DWM-222 device ID 487d66ae8f45 USB: CDC: fix sanity checks in CDC union parser c02c0249ce55 usb: cdc-acm: make sure a refcount is taken early enough f417f9715f4c usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role" 7f52d6d2a82d USB: core: Fix races in character device registration and deregistraion 367d103a4a93 iio: adc: max9611: Fix temperature reading in probe dac96992f00a staging: comedi: dt3000: Fix rounding up of timer divisor 2e394bcfdcf3 staging: comedi: dt3000: Fix signed integer overflow 'divider * base' 8c7053d162d9 KVM: arm/arm64: Sync ICH_VMCR_EL2 back when about to block c8d95668c4ca arm64: KVM: regmap: Fix unexpected switch fall-through 0755b6b152cb asm-generic: fix -Wtype-limits compiler warnings 7113a1bc19fa ocfs2: remove set but not used variable 'last_hash' 01d8d08f4cd4 Revert "kmemleak: allow to coexist with fault injection" cf9a18d7bcd0 drm/exynos: fix missing decrement of retry counter c256729f2695 drm: msm: Fix add_gpu_components b4f0fee7f77c IB/mad: Fix use-after-free in ib mad completion handling a0258ff4993f IB/mlx5: Fix MR registration flow to use UMR properly efb742ce4e27 IB/core: Add mitigation for Spectre V1 4a0d2eeea27a arm64/mm: fix variable 'pud' set but not used 6af9263f685d arm64: unwind: Prohibit probing on return_address() ffb1a76d1c29 arm64/efi: fix variable 'si' set but not used 48522289bf50 kbuild: Check for unknown options with cc-option usage in Kconfig and clang b3aebdd46d63 kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules 23bc01f0d955 ata: libahci: do not complain in case of deferred probe 68340db992f6 drm/amdgpu: fix a potential information leaking bug 02d4fe0193d5 scsi: qla2xxx: Fix possible fcport null-pointer dereferences 3435e025ed71 scsi: hpsa: correct scsi command status issue after reset f833deae2a06 Btrfs: fix deadlock between fiemap and transaction commits 202aa96f052a drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m f69fd790edf7 libata: zpodd: Fix small read overflow in zpodd_get_mech_type() 0a19fff567a0 perf header: Fix use of unitialized value warning ab5aa579ca82 perf header: Fix divide by zero error if f_header.attr_size==0 a5e40452c916 irqchip/irq-imx-gpcv2: Forward irq type to parent dcb73180de61 irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail e72e6ba17ab4 xen/pciback: remove set but not used variable 'old_state' ca5b26a8f1d8 clk: renesas: cpg-mssr: Fix reset control race condition af2ed1a05a7a clk: sprd: Select REGMAP_MMIO to avoid compile errors 3e5f29b66675 clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1 28fd9b37b6bb riscv: Make __fstate_clean() work correctly. cef0e9eb2231 netfilter: ebtables: also count base chain policies 07d92caeb945 net: usb: pegasus: fix improper read if get_registers() fail f13de3d677d1 Input: iforce - add sanity checks 08b3af00a161 Input: kbtab - sanity check for endpoint type b545dc9debe6 HID: hiddev: do cleanup in failure of opening a device 0aab1a4653a6 HID: hiddev: avoid opening a disconnected device 537d957b144f HID: holtek: test for sanity of intfdata 9585f4440cec ALSA: hda - Let all conexant codec enter D3 when rebooting e58ba88d6c60 ALSA: hda - Add a generic reboot_notify 6c4a536ca97b ALSA: hda - Fix a memory leak bug 1bf5f827564c ALSA: hda - Apply workaround for another AMD chip 1022:1487 58b9f19ee438 ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit 46f9a1bc60a4 ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term d5bb12402805 ALSA: hda/realtek - Add quirk for HP Envy x360 61f6ecb75845 xtensa: add missing isync to the cpu_reset TLB code 7c001e5aab6d cpufreq: schedutil: Don't skip freq update when limits change 7f68aa2e3e1b Revert "pwm: Set class for exported channels in sysfs" 056368fc3ef7 mm/usercopy: use memory range to be accessed for wraparound check c8282f1b5653 mm/memcontrol.c: fix use after free in mem_cgroup_iter() 3c0cb90e9212 mm: mempolicy: handle vma with unmovable pages mapped correctly in mbind cd825d87140d mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified f0fed8283deb mm/hmm: fix bad subpage pointer in try_to_unmap_one 3858cca150c6 seq_file: fix problem when seeking mid-record 50d15197254a sh: kernel: hw_breakpoint: Fix missing break in switch statement a5aa80588fcd Linux 4.19.67 ac2951114955 iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support 6a81677a2e65 iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT on version < 41 80bac45e3ad8 iwlwifi: mvm: fix an out-of-bound access 7626b510fc77 iwlwifi: don't unmap as page memory that was mapped as single b38c56b76dcc mwifiex: fix 802.11n/WPA detection 2bc73d914114 KVM: Fix leak vCPU's VMCS value into other pCPU d1489f0b4de7 NFSv4: Fix an Oops in nfs4_do_setattr 898c19f1b4c8 smb3: send CAP_DFS capability during session setup 50831f1a2f57 SMB3: Fix deadlock in validate negotiate hits reconnect 2afa6c13e498 dax: dax_layout_busy_page() should not unmap cow pages a566750c3a78 mac80211: don't WARN on short WMM parameters from AP af9d64f871cf ALSA: hda - Workaround for crackled sound on AMD controller (1022:1457) 06f0bcaceb8c ALSA: hda - Don't override global PCM hw info flag 1c286e4e13f2 ALSA: hiface: fix multiple memory leak bugs bc972b6b52e2 ALSA: firewire: fix a memory leak bug edc388566a1d drm/i915: Fix wrong escape clock divisor init for GLK a73027204ac5 hwmon: (nct7802) Fix wrong detection of in4 presence 9ce1b3eb5489 can: peak_usb: pcan_usb_fd: Fix info-leaks to USB devices cab569a44a52 can: peak_usb: pcan_usb_pro: Fix info-leaks to USB devices d4d904e4e258 ALSA: usb-audio: fix a memory leak bug e0d262a57fc7 x86/purgatory: Do not use __builtin_memcpy and __builtin_memset 118293070096 HID: sony: Fix race condition between rumble and device remove. 5c4689cbe95a s390/dma: provide proper ARCH_ZONE_DMA_BITS value d768173982ec perf/core: Fix creating kernel counters for PMUs that override event->cpu 06dc92142b5e tty/ldsem, locking/rwsem: Add missing ACQUIRE to read_failed sleep loop 0ba69e96cc62 test_firmware: fix a memory leak bug cdd92ebe29c2 scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG b620c6d5779a scsi: ibmvfc: fix WARN_ON during event pool release f254faed4153 scsi: megaraid_sas: fix panic on loading firmware crashdump bb41940c89bd ARM: dts: bcm: bcm47094: add missing #cells for mdio-bus-mux 19e7df3e4fe7 ARM: davinci: fix sleep.S build error on ARMv4 bdce5621e6b0 nvme: fix multipath crash when ANA is deactivated b1689742ff4a ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() 38c919ec7b30 drbd: dynamically allocate shash descriptor f4e2d182d6a6 perf probe: Avoid calling freeing routine multiple times for same pointer 101a155436fe perf tools: Fix proper buffer size for feature processing b065f404c946 ALSA: compress: Be more restrictive about when a drain is allowed 30dd700da7de ALSA: compress: Don't allow paritial drain operations on capture streams f1ea9a638770 ALSA: compress: Prevent bypasses of set_params b9e2fa1e15b7 ALSA: compress: Fix regression on compressed capture streams 77868c0003cc s390/qdio: add sanity checks to the fast-requeue path 8729fe83b0d5 cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init() 991c4756be69 drm: silence variable 'conn' set but not used ca1b1940a32a hwmon: (nct6775) Fix register address and added missed tolerance for nct6106 56dc57c705ef allocate_flower_entry: should check for null deref f4cfdd46b356 mac80211: don't warn about CW params when not using them f2fd89817212 nl80211: fix NL80211_HE_MAX_CAPABILITY_LEN 492c158ab2c0 iscsi_ibft: make ISCSI_IBFT dependson ACPI instead of ISCSI_IBFT_FIND 8d641499bf96 drm/amd/display: Increase size of audios array f9420bfa29f9 drm/amd/display: Only enable audio if speaker allocation exists 3998e684463a drm/amd/display: Fix dc_create failure handling and 666 color depths e7a8a794109c drm/amd/display: use encoder's engine id to find matched free audio device 2a5e21adc71b drm/amd/display: Wait for backlight programming completion in set backlight level 056af94d6e10 scripts/sphinx-pre-install: fix script for RHEL/CentOS 36b6458d8541 netfilter: nft_hash: fix symhash with modulus one 6f1d7f0d6689 netfilter: conntrack: always store window size un-scaled 307b6e5d90dc netfilter: Fix rpfilter dropping vrf packets by mistake 6f9dff8d1d58 vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn bb312b4aa8b0 netfilter: nfnetlink: avoid deadlock due to synchronous request_module f61c4d3a1f18 can: peak_usb: fix potential double kfree_skb() 0e9038a26c9b can: rcar_canfd: fix possible IRQ storm on high load 9479a0589923 usb: typec: tcpm: Ignore unsupported/unknown alternate mode requests 3f524b631db7 usb: typec: tcpm: Add NULL check before dereferencing config bbc2e8206012 usb: typec: tcpm: remove tcpm dir if no children 2ec5c9b785f4 usb: typec: tcpm: free log buf memory when remove debug file 33f2240acfa8 usb: yurex: Fix use-after-free in yurex_delete 49888a4f0ebc usb: host: xhci-rcar: Fix timeout in xhci_suspend() 21344f0575f0 gfs2: gfs2_walk_metadata fix b674f7914a64 x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS 0a9e41e27659 perf record: Fix module size on s390 f1f662894361 perf db-export: Fix thread__exec_comm() 532db2b9756a perf annotate: Fix s390 gap between kernel end and module start 46b306f3cd7b mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy() 9935d7ed8406 x86/mm: Sync also unmappings in vmalloc_sync_all() dd524d488f5b x86/mm: Check for pfn instead of page in vmalloc_sync_one() b8a2169bcad8 Input: synaptics - enable RMI mode for HP Spectre X360 3d180fe5cd76 Input: elantech - enable SMBus on new (2018+) systems ce7d4fe4e52b Input: usbtouchscreen - initialize PM mutex before using it c9a1c10487b9 loop: set PF_MEMALLOC_NOIO for the worker thread d79d76f2bbb0 mmc: cavium: Add the missing dma unmap when the dma has finished. fd3f902dd1d5 mmc: cavium: Set the correct dma max segment size for mmc_host 9575ba61ba19 sound: fix a memory leak bug d397091dbac0 usb: iowarrior: fix deadlock on disconnect b43611cd762c usb: usbfs: fix double-free of usb memory upon submiturb error 6dbc3b74daeb crypto: ccp - Ignore tag length when decrypting GCM ciphertext 30692edea30d crypto: ccp - Add support for valid authsize values less than 16 1c4393df3622 crypto: ccp - Fix oops by properly managing allocated structures b9de21575a20 staging: android: ion: Bail out upon SIGKILL when allocating memory. 6b8f93b5a4f7 staging: gasket: apex: fix copy-paste typo fcab37830177 iio: adc: max9611: Fix misuse of GENMASK macro 805bd34ac269 iio: cros_ec_accel_legacy: Fix incorrect channel setting 893af1c79e42 Linux 4.19.66 48fcdaba7b0d spi: bcm2835: Fix 3-wire mode if DMA is enabled ebda41dd170f cgroup: Fix css_task_iter_advance_css_set() cset skip condition 0a9abd277819 cgroup: css_task_iter_skip()'d iterators must be advanced before accessed 4340d175b898 cgroup: Include dying leaders with live threads in PROCS iterations 370b9e6399da cgroup: Implement css_task_iter_skip() 7528e95b7519 cgroup: Call cgroup_release() before __exit_signal() e6e9bcef12ca compat_ioctl: pppoe: fix PPPOEIOCSFWD handling 473430ed6117 r8169: don't use MSI before RTL8168d 0ccf47265e4c net/mlx5e: Prevent encap flow counter update async to user query cd84a10792f0 net/mlx5: Fix modify_cq_in alignment f378724e10ce tun: mark small packets as owned by the tap sock 5295d6515485 tipc: compat: allow tipc commands without arguments eaa34bd4f7b5 ocelot: Cancel delayed work before wq destruction cd7f02fecac1 NFC: nfcmrvl: fix gpio-handling regression ce58a3655121 net/smc: do not schedule tx_work in SMC_CLOSED state 51d240a144a5 net: sched: use temporary variable for actions indexes cb20f74135df net sched: update vlan action for batched events operations d82dc254b967 net: sched: Fix a possible null-pointer dereference in dequeue_func() 44b96a38c2b5 net: qualcomm: rmnet: Fix incorrect UL checksum offload logic c8b05980c4bf net: phylink: Fix flow control for fixed-link 4dddd08b571d net/mlx5: Use reversed order when unregister devices 858f82c63667 net/mlx5e: always initialize frag->last_in_page edb7ad69c439 net: fix ifindex collision during namespace removal a19d4e34f092 net: bridge: mcast: don't delete permanent entries when fast leave is enabled 639239be11ad net: bridge: delete local fdb on device init failure b3645a487373 mvpp2: refactor MTU change code ffab47bf69df mvpp2: fix panic on module removal 3c46905fb182 mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() f186fb5ccf69 ipip: validate header length in ipip_tunnel_xmit 1bb2dd37cb87 ip6_tunnel: fix possible use-after-free on xmit fdcefa46c5c2 ip6_gre: reload ipv6h in prepare_ip6gre_xmit_ipv6 c4c8899376c2 ife: error out when nla attributes are empty 774358df88f7 bnx2x: Disable multi-cos feature. cb4626784f39 atm: iphase: Fix Spectre v1 vulnerability 8440cdc77577 IB: directly cast the sockaddr union to aockaddr 608cfdfa9eb7 HID: Add quirk for HP X1200 PIXART OEM mouse e830c2c3c174 HID: wacom: fix bit shift for Cintiq Companion 2 2364ed0d8ed1 libnvdimm/bus: Fix wait_nvdimm_bus_probe_idle() ABBA deadlock 7f000e7b4490 libnvdimm/bus: Prepare the nd_ioctl() path to be re-entrant 3248536919c1 libnvdimm/region: Register badblocks before namespaces d16bbdbbcb50 libnvdimm/bus: Prevent duplicate device_unregister() calls c23106d4276d drivers/base: Introduce kill_device() 7c43f84efd6d driver core: Establish order of operations for device_add and device_del via bitflag a152a7b411a5 gcc-9: don't warn about uninitialized variable 93d6f0841eef scsi: fcoe: Embed fc_rport_priv in fcoe_rport structure cc4c818b2219 Linux 4.19.65 7634b9cd27e8 Documentation: Add swapgs description to the Spectre v1 documentation b88241aef6f1 x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS 931b6bfe8af1 x86/entry/64: Use JMP instead of JMPQ 23e7a7b3a75f x86/speculation: Enable Spectre v1 swapgs mitigations befb822c062b x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations b5dd7f61fce4 x86/cpufeatures: Combine word 11 and 12 into a new scattered features word 16ad0b63f382 x86/cpufeatures: Carve out CQM features retrieval 9e034c61951a scsi: mpt3sas: Use 63-bit DMA addressing on SAS35 HBA 3732a473be54 x86/vdso: Prevent segfaults due to hoisted vclock reads 8320768d26aa gcc-9: properly declare the {pv,hv}clock_page storage 354887ae3168 objtool: Support GCC 9 cold subfunction naming scheme 89f3896b658b ARC: enable uboot support unconditionally 8dd376273fb4 eeprom: at24: make spd world-readable again a7340d31abac drm/i915/gvt: fix incorrect cache entry for guest page mapping a1c020ce2669 IB/hfi1: Check for error on call to alloc_rsm_map_table e9cd4962a85b IB/mlx5: Fix RSS Toeplitz setup to be aligned with the HW specification 924308d2a6ea IB/mlx5: Fix clean_mr() to work in the expected order 7e5ce9f3943c IB/mlx5: Move MRs to a kernel PD when freeing them to the MR cache 3cfa1087a172 IB/mlx5: Use direct mkey destroy command upon UMR unreg failure 41be1928053a IB/mlx5: Fix unreg_umr to ignore the mkey state 04fdca1f2f65 xen/swiotlb: fix condition for calling xen_destroy_contiguous_region() eb828241b491 nbd: replace kill_bdev() with __invalidate_device() again 8dfef0f442c7 arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG} 2bddc985656a arm64: compat: Allow single-byte watchpoints on all addresses c385cda0e70a drivers/perf: arm_pmu: Fix failure path in PM notifier 5f80ac50b98c parisc: Fix build of compressed kernel even with debug enabled 001f93d95d6c cgroup: kselftest: relax fs_spec checks 6cb9e0d9ad3e s390/dasd: fix endless loop after read unit address configuration beb0cc781b8e mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker 72651bbdf3d5 ALSA: hda: Fix 1-minute detection delay when i915 module is not available 46650ac2e1d8 selinux: fix memory leak in policydb_init() e7bb4c81b3c7 mtd: rawnand: micron: handle on-die "ECC-off" devices correctly fafaeae4d356 IB/hfi1: Fix Spectre v1 vulnerability fdb0fb56addb gpiolib: fix incorrect IRQ requesting of an active-low lineevent 7e3efb655012 mmc: meson-mx-sdio: Fix misuse of GENMASK macro 29841b5c6ab1 mmc: dw_mmc: Fix occasional hang after tuning on eMMC 50d700408a00 Btrfs: fix race leading to fs corruption after transaction abort 009d7a4eb329 Btrfs: fix incremental send failure after deduplication 4c5a442561e8 kbuild: initialize CLANG_FLAGS correctly in the top Makefile 3736612d2582 kconfig: Clear "written" flag to avoid data loss 4c6500b5328f drm/nouveau: fix memory leak in nouveau_conn_reset() 84ce045222e9 x86, boot: Remove multiple copy of static function sanitize_boot_params() 740e0167a382 x86/paravirt: Fix callee-saved function ELF sizes ba5c072fbf8b x86/kvm: Don't call kvm_spurious_fault() from .fixup 11cb9f8700c9 xen/pv: Fix a boot up hang revealed by int3 self test d3e36788d9be mlxsw: spectrum_dcb: Configure DSCP map as the last rule is removed 48c5c4f0a47f ipc/mqueue.c: only perform resource calculation if user valid f87314225294 drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings 35ee8b844845 uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers dea2ee496a85 coda: fix build using bare-metal toolchain cf3ddc00a47d coda: add error handling for fget 93b83005ea87 lib/test_string.c: avoid masking memset16/32/64 failures 8e087a2abaf8 lib/test_overflow.c: avoid tainting the kernel and fix wrap size 439c79ed7718 mm/cma.c: fail if fixed declaration can't be honored 1b84e67496d3 x86: math-emu: Hide clang warnings for 16-bit overflow 242666b2b7e2 x86/apic: Silence -Wtype-limits compiler warnings ade866ad5aed be2net: Signal that the device cannot transmit during reconfiguration c0cca0e97ce4 ACPI: fix false-positive -Wuninitialized warning 80f58147da0f x86: kvm: avoid constant-conversion warning d60e8c0cbccb perf version: Fix segfault due to missing OPT_END() abfe761a5358 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized d5568763dd1d ACPI: blacklist: fix clang warning for unused DMI table c47e25526071 ceph: return -ERANGE if virtual xattr value didn't fit in buffer b39c377ea08f ceph: fix improper use of smp_mb__before_atomic() d29fbf677963 cifs: Fix a race condition with cifs_echo_request f96c70fa810d btrfs: qgroup: Don't hold qgroup_ioctl_lock in btrfs_qgroup_inherit() d9245dabfce1 btrfs: fix minimum number of chunk errors for DUP e7fcc587e076 clk: sprd: Add check for return value of sprd_clk_regmap_init() a093208b4c73 fs/adfs: super: fix use-after-free bug 85d854b42113 clk: tegra210: fix PLLU and PLLU_OUT1 cf0fcc7fe200 dmaengine: rcar-dmac: Reject zero-length slave DMA requests a3524486535a MIPS: lantiq: Fix bitfield masking cdee3f53510a firmware/psci: psci_checker: Park kthreads before stopping them 09ec6c6783ff kernel/module.c: Only return -EEXIST for modules that have finished loading fd53e45a11e9 arm64: dts: rockchip: fix isp iommu clocks and power domain d8388cbd4327 dmaengine: tegra-apb: Error out if DMA_PREP_INTERRUPT flag is unset f486088d38ec ftrace: Enable trampoline when rec count returns back to one ea26b427cb91 ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend 22befe671728 ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work again 8c5a33d34be6 ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200 3c1d1bad8a57 ARM: riscpc: fix DMA b3060a1a313f Linux 4.19.64 4736bb277744 ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL 475f7781a804 scsi: core: Avoid that a kernel warning appears during system resume c58a6507363b block, scsi: Change the preempt-only flag into a counter 9b17512d9165 ceph: hold i_ceph_lock when removing caps for freeing inode b6c3b6a2c662 Fix allyesconfig output. 135e7737e21f drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl 54695343b491 /proc//cmdline: add back the setproctitle() special case 54ffaa53e785 /proc//cmdline: remove all the special cases a5a3915f17ab sched/fair: Use RCU accessors consistently for ->numa_group 48046e092ad5 sched/fair: Don't free p->numa_faults with concurrent readers 02cdc166128c vhost: scsi: add weight support 239910101c4e vhost: vsock: add weight support 3af3b843aee4 vhost_net: fix possible infinite loop ad5fc8953d61 vhost: introduce vhost_exceeds_weight() 56966212e23f Bluetooth: hci_uart: check for missing tty operations 3a0c22cbc5d0 iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA 4fd0eb60bad1 iommu/vt-d: Don't queue_iova() if there is no flush queue b3836af8560e media: radio-raremono: change devm_k*alloc to k*alloc afb5340f9438 NFS: Cleanup if nfs_match_client is interrupted 8edcabb2c2e9 media: pvrusb2: use a different format for warnings 8b44cc225e60 media: cpia2_usb: first wake up, then free in disconnect 693019ee7d98 ath10k: Change the warning message string 3cf6a0707088 media: au0828: fix null dereference in error path f13ee5ae0b2f ISDN: hfcsusb: checking idx of ep configuration 22068d49d09d binder: fix possible UAF when freeing buffer ba2c247a4515 arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ b544a6855dfb usb: dwc2: Fix disable all EP's on disconnect ec58bfa2d412 usb: dwc2: Disable all EP's on disconnect 9e441c7844a6 NFSv4: Fix lookup revalidate of regular files 24acd93f5995 NFS: Refactor nfs_lookup_revalidate() 01eea1cbba9d NFS: Fix dentry revalidation on NFSv4 lookup 8a474bc4e613 vsock: correct removal of socket from the list 9d3586bcdae3 hv_sock: Add support for delayed close 9a9de33a9dfa Linux 4.19.63 408af82309a7 access: avoid the RCU grace period for the temporary subjective credentials 1a547d24ec8a libnvdimm/bus: Stop holding nvdimm_bus_list_mutex over __nd_ioctl() b993a66d8ddc powerpc/tm: Fix oops on sigreturn on systems without TM b9310c56fcfb powerpc/xive: Fix loop exit-condition in xive_find_target_in_mask() c219444254cf ALSA: hda - Add a conexant codec entry to let mute led work 491483ed70f1 ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1 602744097b2e ALSA: ac97: Fix double free of ac97_codec_device 9845fb5a3f90 hpet: Fix division by zero in hpet_time_div() e4c91583b39c mei: me: add mule creek canyon (EHL) device ids 3d0a6926e610 fpga-manager: altera-ps-spi: Fix build error e907b1314481 binder: prevent transactions to context manager from its own process. 7d20e3ba7072 x86/speculation/mds: Apply more accurate check on hypervisor platform 5e87e8b4dc0c x86/sysfb_efi: Add quirks for some devices with swapped width and height e3dc9ea5464e btrfs: inode: Don't compress if NODATASUM or NODATACOW set 1f37bec82f41 usb: pci-quirks: Correct AMD PLL quirk detection 41d3dbb931c0 usb: wusbcore: fix unbalanced get/put cluster_id 148959cc64e1 locking/lockdep: Hide unused 'class' variable b07687243d4a mm: use down_read_killable for locking mmap_sem in access_remote_vm 4acb04ef5e42 locking/lockdep: Fix lock used or unused stats error af0883f9dcf6 proc: use down_read_killable mmap_sem for /proc/pid/maps 0d72bb853afc cxgb4: reduce kernel stack usage in cudbg_collect_mem_region() 6ecdcbcd3091 proc: use down_read_killable mmap_sem for /proc/pid/map_files 3d617da8a956 proc: use down_read_killable mmap_sem for /proc/pid/clear_refs 42beb7b3d446 proc: use down_read_killable mmap_sem for /proc/pid/pagemap 1b3042d0d32b proc: use down_read_killable mmap_sem for /proc/pid/smaps_rollup a8c568fc4832 mm/mmu_notifier: use hlist_add_head_rcu() 3062448e3ee2 memcg, fsnotify: no oom-kill for remote memcg charging 041b127df733 mm/gup.c: remove some BUG_ONs from get_gate_page() fa099d6ddf68 mm/gup.c: mark undo_dev_pagemap as __maybe_unused 8be4a30e2d34 9p: pass the correct prototype to read_cache_page 071f2135cfec mm/kmemleak.c: fix check for softirq context 7bd5902a1e18 sh: prevent warnings when using iounmap af50d6a1c245 block/bio-integrity: fix a memory leak bug 7f775a67abe4 powerpc/eeh: Handle hugepages in ioremap space e7a41b276974 dlm: check if workqueues are NULL before flushing/destroying 5d59e28c3d1b mailbox: handle failed named mailbox channel request 2140a6b03a61 f2fs: avoid out-of-range memory access 8a1a3d383923 block: init flush rq ref count to 1 4b9dc73a0d4a powerpc/boot: add {get, put}_unaligned_be32 to xz_config.h 549f726fb094 PCI: dwc: pci-dra7xx: Fix compilation when !CONFIG_GPIOLIB 367cc371a8e3 RDMA/rxe: Fill in wc byte_len with IB_WC_RECV_RDMA_WITH_IMM 4fe7ea29e4a6 perf hists browser: Fix potential NULL pointer dereference found by the smatch tool 915945f3bdc2 perf annotate: Fix dereferencing freed memory found by the smatch tool b305dcff1518 perf session: Fix potential NULL pointer dereference found by the smatch tool 19cf571c64b7 perf top: Fix potential NULL pointer dereference detected by the smatch tool 995527db41f6 perf stat: Fix use-after-freed pointer detected by the smatch tool 3b8c4eae5541 perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning dd0a0c72a10f PCI: mobiveil: Use the 1st inbound window for MEM inbound transactions 270972df68fb PCI: mobiveil: Initialize Primary/Secondary/Subordinate bus numbers 9eb4f2886db3 kallsyms: exclude kasan local symbols on s390 4613f46ef472 PCI: mobiveil: Fix the Class Code field 51308ec525cc PCI: mobiveil: Fix PCI base address in MEM/IO outbound windows 05959ed85e34 arm64: assembler: Switch ESB-instruction with a vanilla nop if !ARM64_HAS_RAS 007b01a27d4d IB/ipoib: Add child to parent list only if device initialized d48720bafd90 powerpc/mm: Handle page table allocation failures f14537bb81d1 IB/mlx5: Fixed reporting counters on 2nd port for Dual port RoCE d03aeb8d6b98 serial: sh-sci: Fix TX DMA buffer flushing and workqueue races 48c73b8ee5c9 serial: sh-sci: Terminate TX DMA during buffer flushing ca730bf0cd67 RDMA/i40iw: Set queue pair state when being queried 52373ab6a6c7 powerpc/4xx/uic: clear pending interrupt after irq type/pol change 74520144700d um: Silence lockdep complaint about mmap_sem 30edc7c1fed5 mm/swap: fix release_pages() when releasing devmap pages b4e77006d5a7 mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk 9b1691c3f660 mfd: arizona: Fix undefined behavior d9c74176c275 mfd: core: Set fwnode for created devices 7b24a4a363a9 mfd: madera: Add missing of table registration e00cf1dac30c recordmcount: Fix spurious mcount entries on powerpc 9fac39480e39 powerpc/xmon: Fix disabling tracing while in xmon a80f67d5560c powerpc/cacheflush: fix variable set but not used b150423e0d5e iio: iio-utils: Fix possible incorrect mask calculation fc9c15c4e3ff PCI: xilinx-nwl: Fix Multi MSI data programming e3e2bb12c8a7 genksyms: Teach parser about 128-bit built-in types 27f2335e1440 kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS 1fa94381fdeb i2c: stm32f7: fix the get_irq error cases f930727faef2 PCI: sysfs: Ignore lockdep for remove attribute 9d45fbee76af serial: mctrl_gpio: Check if GPIO property exisits before requesting it e7f206f42fb6 drm/msm: Depopulate platform on probe failure 216462fa884f powerpc/pci/of: Fix OF flags parsing for 64bit BARs 5d3ad905af43 mmc: sdhci: sdhci-pci-o2micro: Check if controller supports 8-bit width bf7cf9fb02db usb: gadget: Zero ffs_io_data ac380eb479de tty: serial_core: Set port active bit in uart_port_activate 785e11c06db3 serial: imx: fix locking in set_termios() 741f8b39b6d4 drm/rockchip: Properly adjust to a true clock in adjusted_mode fd0d171c7064 powerpc/pseries/mobility: prevent cpu hotplug during DT update 6a7047471073 drm/amd/display: fix compilation error 709ca46f1d46 phy: renesas: rcar-gen2: Fix memory leak at error paths 725c7b781150 drm/virtio: Add memory barriers for capset cache. 11b4e9f3695c drm/amd/display: Always allocate initial connector state state 1a2425b597fa serial: 8250: Fix TX interrupt handling condition a0e7d6b7fa55 tty: serial: msm_serial: avoid system lockup condition e40f5a873fc7 tty/serial: digicolor: Fix digicolor-usart already registered warning 5c0e54839d48 memstick: Fix error cleanup path of memstick_init 0a50a272389f drm/crc-debugfs: Also sprinkle irqrestore over early exits 26a66454541c drm/crc-debugfs: User irqsafe spinlock in drm_crtc_add_crc_entry 4d14323a2eb5 gpu: host1x: Increase maximum DMA segment size f9bfd6bd8223 drm/bridge: sii902x: pixel clock unit is 10kHz instead of 1kHz 7af9abd7d6bd drm/bridge: tc358767: read display_props in get_modes() 49c7230d8f10 PCI: Return error if cannot probe VF 2a18d76592e0 drm/edid: Fix a missing-check bug in drm_load_edid_firmware() 210dfe630911 drm/amdkfd: Fix sdma queue map issue db64bc139440 drm/amdkfd: Fix a potential memory leak 6b1d2871fe36 drm/amd/display: Disable ABM before destroy ABM struct c242a531bb06 drm/amdgpu/sriov: Need to initialize the HDP_NONSURFACE_BAStE 147137f86b5b drm/amd/display: Fill prescale_params->scale for RGB565 08b0bcc8076b tty: serial: cpm_uart - fix init when SMC is relocated c901780d9294 pinctrl: rockchip: fix leaked of_node references a9dfb6e43677 tty: max310x: Fix invalid baudrate divisors calculator b0084c1b5058 usb: core: hub: Disable hub-initiated U1/U2 19755a124f4c staging: vt6656: use meaningful error code during buffer allocation b59f7650a507 iio: adc: stm32-dfsdm: missing error case during probe 302e4cdca1f4 iio: adc: stm32-dfsdm: manage the get_irq error case 586946ce83e4 drm/panel: simple: Fix panel_simple_dsi_probe 49fb03de361d hvsock: fix epollout hang from race condition 64f4694072aa Linux 4.19.62 60e9babfda94 net: sched: verify that q!=NULL before setting q->flags c1d98b766ebe mm: vmscan: scan anonymous pages on file refaults 7560e33369ed KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested 967bc679c596 KVM: nVMX: do not use dangling shadow VMCS after guest reset 3a17ca864baf ext4: allow directory holes caa4e08253eb ext4: use jbd2_inode dirty range scoping af3812b65c37 jbd2: introduce jbd2_inode dirty range scoping 4becd6c11e9a mm: add filemap_fdatawait_range_keep_errors() c9ea4620a37f ext4: enforce the immutable flag on open files 29171e82348c ext4: don't allow any modifications to an immutable file 4a5cc64d8a8a perf/core: Fix race between close() and fork() 75100ec5f079 perf/core: Fix exclusive events' grouping 0e6ef184315d MIPS: lb60: Fix pin mappings dd5994ab1f00 gpio: davinci: silence error prints in case of EPROBE_DEFER c947cf3e9583 dma-buf: Discard old fence_excl on retrying get_fences_rcu for realloc 95ee55cab118 dma-buf: balance refcount inbalance b72fb8dec183 net: bridge: stp: don't cache eth dest pointer before skb pull 78701843ecc4 net: bridge: don't cache ether dest pointer on input 41a8df71809e net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query caf4488fc06e net: bridge: mcast: fix stale nsrcs pointer in igmp3/mld2 report handling bc9a2f36a7d6 sctp: not bind the socket in sctp_connect fde351aeff4a net/tls: make sure offload also gets the keys wiped d9571a9f5ec1 net_sched: unset TCQ_F_CAN_BYPASS when adding filters 69cd58454615 netrom: hold sock when setting skb->destructor dc59a2abd33e netrom: fix a memory leak in nr_rx_frame() 0c5cb5a12623 macsec: fix checksumming after decryption 21252f49cddf macsec: fix use-after-free of skb during RX a8ba53da071e net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn a2aa162a6331 vrf: make sure skb->data contains ip header to make routing 1b200acde418 tcp: Reset bytes_acked and bytes_received when disconnecting c60f57dfe995 tcp: fix tcp_set_congestion_control() use from bpf hook 6323c238bb43 tcp: be more careful in tcp_fragment() b640ade07295 sky2: Disable MSI on ASUS P6T d9ee5afd9165 sctp: fix error handling on stream scheduler initialization bfa7913575b7 rxrpc: Fix send on a connected, but unbound socket 3e4e6b71ece0 r8169: fix issue with confused RX unit after PHY power-down on RTL8411b 97739e5c9e73 nfc: fix potential illegal memory access f47f68cc9d33 net: stmmac: Re-work the queue selection for TSO packets 201d7d62a82a net: phy: sfp: hwmon: Fix scaling of RX power c60bce64615d net: openvswitch: fix csum updates for MPLS actions 257441a07201 net: neigh: fix multiple neigh timer scheduling 832d0ea751a8 net: make skb_dst_force return true when dst is refcounted 6ab30a4cc5c6 net: dsa: mv88e6xxx: wait after reset deactivation 5832ef4afd90 net: bcmgenet: use promisc for unsupported filters c0f4a6447977 ipv6: Unlink sibling route in case of failure 0bd84505f16f ipv6: rt6_check should return NULL if 'from' is NULL 47ce442783d7 ipv4: don't set IPv6 only flags to IPv4 addresses aee5dd00341b igmp: fix memory leak in igmpv3_del_delrec() 9770fe1b202f hv_netvsc: Fix extra rcu_read_unlock in netvsc_recv_callback() d7cdac6dc418 caif-hsi: fix possible deadlock in cfhsi_exit_module() 8fb37be12046 bnx2x: Prevent load reordering in tx completion processing 7250956f6eaf Linux 4.19.61 025eb12bb4b0 dm bufio: fix deadlock with loop device 404f59e265ac dt-bindings: allow up to four clocks for orion-mdio 03e6a668ea1f net: mvmdio: allow up to four clocks to be specified for orion-mdio dd87cc633ba5 blkcg: update blkcg_print_stat() to handle larger outputs 73efdc5d7d3b blk-iolatency: clear use_delay when io.latency is set to zero 1ab644bd02ab blk-throttle: fix zero wait time for iops throttled group 91da712ff592 usb: Handle USB3 remote wakeup for LPM enabled devices correctly 152ddf9f0458 Bluetooth: Add SMP workaround Microsoft Surface Precision Mouse bug 98318cd31b95 intel_th: msu: Fix single mode with disabled IOMMU d6328d7c1a71 mtd: spinand: read returns badly if the last page has bitflips 94f1db42a968 mtd: rawnand: mtk: Correct low level time calculation of r/w cycle 30c6b34759f6 eCryptfs: fix a couple type promotion bugs 92e23f5fc049 mmc: sdhci-msm: fix mutex while in spinlock 01982f7bcc9d powerpc/pseries: Fix oops in hotplug memory notifier e725502b8548 powerpc/powernv/npu: Fix reference leak 1e3b61cbc30d powerpc/watchpoint: Restore NV GPRs while returning from exception 237ac0d73b55 powerpc/32s: fix suspend/resume when IBATs 4-7 are used 7961981718d6 parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1 a6a0daa775e8 parisc: Ensure userspace privilege for ptraced processes in regset functions ef5c2e165ab0 crypto: caam - limit output IV to CBC to work around CTR mode DMA issue 376b80276d84 gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM ef30c0739439 xfs: abort unaligned nowait directio early 669c867972c0 xfs: serialize unaligned dio writes against all other dio writes d61d885b17b0 xfs: fix reporting supported extra file attributes for statx() f614ef7a34b0 xfs: reserve blocks for ifree transaction during log recovery 424543a53ae0 xfs: don't ever put nlink > 0 inodes on the unlinked list 3a895cc066c0 xfs: rename m_inotbt_nores to m_finobt_nores 2ab62234e823 xfs: don't overflow xattr listent buffer 1dc8b13cc66d xfs: flush removing page cache in xfs_reflink_remap_prep 788920d12b95 xfs: fix pagecache truncation prior to reflink 41f64437f030 include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures afa3e571cde3 coda: pass the host file in vma->vm_file on mmap 2c0222b48e77 libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields 656d06dab4d6 HID: wacom: correct touch resolution x/y typo 1c871b4006b2 HID: wacom: generic: Correct pad syncing 46f71a15abe7 HID: wacom: generic: only switch the mode on devices with LEDs cb4c2b94f629 IB/mlx5: Report correctly tag matching rendezvous capability 4bd953241d81 Btrfs: add missing inode version, ctime and mtime updates when punching hole fffedf5cf67e Btrfs: fix fsync not persisting dentry deletions due to inode evictions 110850fffeb0 Btrfs: fix data loss after inode eviction, renaming it, and fsync it 6b71c62ea9da PCI: qcom: Ensure that PERST is asserted for at least 100 ms 529e71cae929 PCI: Do not poll for PME if the device is in D3cold 4d8504004c86 PCI: hv: Fix a use-after-free bug in hv_eject_device_work() f0ff76a42ef5 intel_th: pci: Add Ice Lake NNPI support 66a13b5e4e9c drm/edid: parse CEA blocks embedded in DisplayID 9854e06842bc perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs 82c46f7b0918 perf/x86/amd/uncore: Do not set 'ThreadMask' and 'SliceMask' for non-L3 PMCs a847a5225432 perf/x86/intel: Fix spurious NMI on fixed counter 0d4c0bb70665 x86/boot: Fix memory leak in default_get_smp_config() b52807e607f1 9p/virtio: Add cleanup path in p9_virtio_init 1253882d64d0 9p/xen: Add cleanup path in p9_trans_xen_init 007e5aaf287c xen/events: fix binding user event channels to cpus e380170b3b3a dm zoned: fix zone state management race 1e4247d7958b padata: use smp_mb in padata_reorder to avoid orphaned padata jobs 0489d808a5f2 drm/nouveau/i2c: Enable i2c pads & busses during preinit c77cbc873586 kconfig: fix missing choice values in auto.conf 2c7b50c7b1d0 fs/proc/proc_sysctl.c: fix the default values of i_uid/i_gid on /proc/sys inodes. ba271659ad42 arm64: tegra: Fix AGIC register range ba27a25df6df KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed 87bae91a0fe9 media: videobuf2-dma-sg: Prevent size from overflowing cb2e2b0ae554 media: videobuf2-core: Prevent size alignment wrapping buffer size to 0 deb78bd24e0c media: coda: Remove unbalanced and unneeded mutex unlock fc0232e24541 media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom() a4c4c06f1755 ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine 8ba78e4d564e ALSA: hda/realtek - Fixed Headphone Mic can't record on Dell platform c92212a81617 ALSA: seq: Break too long mutex context in the write loop eb6c84e4b4f2 raid5-cache: Need to do start() part job after adding journal device 3f42c0000b23 ASoC: dapm: Adapt for debugfs API change 677b2aa3be5c lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE 0b174bac4e43 pnfs: Fix a problem where we gratuitously start doing I/O through the MDS f64ff5914f00 pNFS: Fix a typo in pnfs_update_layout 603e7497bf27 pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error 5347e61954fc NFSv4: Handle the special Linux file open access mode 6825ff011c7c iwlwifi: fix RF-Kill interrupt while FW load for gen2 devices a32e2ceca0ef iwlwifi: don't WARN when calling iwl_get_shared_mem_conf with RF-Kill d9ce0788da91 iwlwifi: pcie: fix ALIVE interrupt handling for gen2 devices w/o MSI-X 04c52c105a38 iwlwifi: pcie: don't service an interrupt that was masked 7ebddd5fe217 arm64: tegra: Update Jetson TX1 GPU regulator timings 042451b921b1 regulator: s2mps11: Fix buck7 and buck8 wrong voltages 8da63aa46e26 Input: alps - fix a mismatch between a condition check and its comment 81368a9a98d9 Input: synaptics - whitelist Lenovo T580 SMBus intertouch cfb9250619c8 Input: alps - don't handle ALPS cs19 trackpoint-only device d657077eda7b Input: gtco - bounds check collection indent level f11ba9df8eed bcache: destroy dc->writeback_write_wq if failed to create dc->writeback_thread 2ab14861d2eb bcache: fix mistaken sysfs entry for io_error counter 3c466df8fc59 bcache: ignore read-ahead request failure on backing device 4fc48cd21a31 bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free" ab966241d59a bcache: Revert "bcache: fix high CPU occupancy during journal" 58169c189bd6 Revert "bcache: set CACHE_SET_IO_DISABLE in bch_cached_dev_error()" c3b7d27f3746 crypto: crypto4xx - fix a potential double free in ppc4xx_trng_probe a9fd1795fee6 crypto: ccp/gcm - use const time tag comparison. 561c4424f1e3 crypto: ccp - memset structure fields to zero before reuse 13805a5df489 crypto: crypto4xx - block ciphers should only accept complete blocks 17e63172d536 crypto: crypto4xx - fix blocksize for cfb and ofb 4598094d24c7 crypto: crypto4xx - fix AES CTR blocksize value 1c9b0a766513 crypto: chacha20poly1305 - fix atomic sleep when using async algorithm eb99c084da28 crypto: arm64/sha2-ce - correct digest for empty data in finup 4230e09e61e6 crypto: arm64/sha1-ce - correct digest for empty data in finup 52f07c1ac70e crypto: ccp - Validate the the error value used to index error messages bed97f646997 crypto: ghash - fix unaligned memory access in ghash_setkey() ce7ec07abaf7 scsi: mac_scsi: Fix pseudo DMA implementation, take 2 de769c762626 scsi: mac_scsi: Increase PIO/PDMA transfer length threshold 3e9534fa5046 scsi: megaraid_sas: Fix calculation of target ID 1334a3e2d6d0 scsi: core: Fix race on creating sense cache 58f59f6072ab Revert "scsi: ncr5380: Increase register polling limit" 7cfded7a705c scsi: NCR5380: Always re-enable reselection interrupt d91baba81a6e scsi: NCR5380: Reduce goto statements in NCR5380_select() e73db096691e xen: let alloc_xenballooned_pages() fail if not enough memory free ff54c44f1038 floppy: fix out-of-bounds read in copy_buffer a9444d9d0f6f floppy: fix invalid pointer dereference in drive_name 5b565f3276f3 floppy: fix out-of-bounds read in next_valid_format 6e34fd07484a floppy: fix div-by-zero in setup_format_params 7c16c5eae41a iavf: fix dereference of null rx_buffer pointer e9896b29d010 net: mvmdio: defer probe of orion-mdio if a clock is not ready 5f6c5f5ae25e gtp: fix use-after-free in gtp_newlink() 141222216438 gtp: fix use-after-free in gtp_encap_destroy() 0a5eca2c949c gtp: fix Illegal context switch in RCU read-side critical section. e117a04133c6 gtp: fix suspicious RCU usage 202de90df2b7 Bluetooth: validate BLE connection interval updates ca33af18b5fc gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable() 0fdb922d0ef0 Bluetooth: Check state in l2cap_disconnect_rsp 3b57b7a3a82a perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64 c814f618b799 Bluetooth: 6lowpan: search for destination address in all peers c82c4910e9e6 Bluetooth: Add new 13d3:3501 QCA_ROME device 1cbce19bd697 Bluetooth: Add new 13d3:3491 QCA_ROME device 578658df21d5 Bluetooth: hci_bcsp: Fix memory leak in rx_skb 9d47bd217539 tools: bpftool: Fix json dump crash on powerpc 2ad04d31bb3e gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants 157d1c7a1a00 bonding: validate ip header before check IPPROTO_IGMP 88f751b066f2 selftests: bpf: fix inlines in test_lwt_seg6local ef5b204336b3 bpf, libbpf, smatch: Fix potential NULL pointer dereference 0f2f2cebe64d rxrpc: Fix oops in tracepoint ca37b9a74689 net: usb: asix: init MAC address buffers 51216937c319 bnx2x: Prevent ptp_task to be rescheduled indefinitely e358d2ab42f8 perf stat: Fix group lookup for metric group a64e018be77a perf stat: Make metric event lookup more robust 7343178ccf7d bpf: fix uapi bpf_prog_info fields alignment af3790a46a55 iwlwifi: mvm: Drop large non sta frames 036184af23e0 igb: clear out skb->tstamp after reading the txtime 0024b12b776c net: mvpp2: prs: Don't override the sign bit in SRAM parser shift 05592b9b7f25 ath10k: destroy sdio workqueue while remove sdio module 26d86b29e806 net: hns3: add some error checking in hclge_tm module ddfdbcccd71a net: hns3: fix a -Wformat-nonliteral compile warning 95d084809495 bcache: fix potential deadlock in cached_def_free() 4b7758e9c4ed bcache: check c->gc_thread by IS_ERR_OR_NULL in cache_set_flush() 81b88c05bc45 bcache: acquire bch_register_lock later in cached_dev_free() d81080a0bcf8 bcache: check CACHE_SET_IO_DISABLE bit in bch_journal() 57cfb755c356 bcache: check CACHE_SET_IO_DISABLE in allocator code e78d1d234469 EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec e54cc89e6f0a wil6210: drop old event after wmi_call timeout 0388597d0627 crypto: asymmetric_keys - select CRYPTO_HASH where needed 1dea395c9e12 crypto: serpent - mark __serpent_setkey_sbox noinline b346070c72cd ixgbe: Check DDM existence in transceiver before access 0340c621eca8 rslib: Fix handling of of caller provided syndrome 8ba93c59441a rslib: Fix decoding of shortened codes dad0b17e4a4e xsk: Properly terminate assignment in xskq_produce_flush_desc e69fac59c493 clocksource/drivers/exynos_mct: Increase priority over ARM arch timer 12e20eca894b libata: don't request sense data on !ZAC ATA devices 6e6bc34f8570 ASoC: Intel: hdac_hdmi: Set ops to NULL on remove 1182ff224847 perf tools: Increase MAX_NR_CPUS and MAX_CACHES 7201cc227d4a ath10k: fix PCIE device wake up failed 8a808fadc9f7 ath10k: add missing error handling fe2ceeb4cffc ipvs: fix tinfo memory leak in start_sync_thread 20de38d282b3 mt7601u: fix possible memory leak when the device is disconnected 033577880135 x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c 3f7952b275c8 mt7601u: do not schedule rx_tasklet when the device has been disconnected 6f6e126e1995 rtlwifi: rtl8192cu: fix error handle when usb probe failed 41864adfee2e net: stmmac: sun8i: force select external PHY when no internal one bce037abc29f media: hdpvr: fix locking and a missing msleep 43b9fdc48377 media: vimc: cap: check v4l2_fill_pixfmt return value d562537dbf0d media: coda: increment sequence offset for the last returned frame 3697c12c4425 media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP 6fd3e9f65db9 media: coda: fix mpeg2 sequence number handling c647c00f28af acpi/arm64: ignore 5.1 FADTs that are reported as 5.0 b9f547b7bdd9 timer_list: Guard procfs specific code d86c0b73f75b ntp: Limit TAI-UTC offset 8d8f0b9009d0 media: i2c: fix warning same module names 6439110fbeee media: s5p-mfc: Make additional clocks optional 57de3c78f0b7 ipvs: defer hook registration to avoid leaks 06a3cd416224 ipsec: select crypto ciphers for xfrm_algo 723ba7938492 arm64: Do not enable IRQs for ct_user_exit 010bfbc93424 lightnvm: pblk: fix freeing of merged pages 762bba1b7ee7 nvme-pci: set the errno on ctrl state change error c876a66553d7 nvme-pci: properly report state change failure in nvme_reset_work f0c83dd15ee1 nvme: fix possible io failures when removing multipathed ns 10cc3a65a55b EDAC/sysfs: Fix memory leak when creating a csrow object f6502ce4f050 ACPICA: Clear status of GPEs on first direct enable 3ae98dc2db1e blk-iolatency: only account submitted bios a952f7c384aa x86/cacheinfo: Fix a -Wtype-limits warning 3252b29ea41b ipoib: correcly show a VF hardware address 0e2af9b06c00 vhost_net: disable zerocopy by default 4c57957ed6c8 perf evsel: Make perf_evsel__name() accept a NULL argument 9e0bcb59b6c0 x86/atomic: Fix smp_mb__{before,after}_atomic() dd0260fd1e3a perf/x86/intel/uncore: Handle invalid event coding for free-running counter 7fc96cd2b0de sched/fair: Fix "runnable_avg_yN_inv" not used warnings d8b7db6c5004 sched/core: Add __sched tag for io_schedule() 930655b01367 xfrm: fix sa selector validation b7d66bbc8ad3 blkcg, writeback: dead memcgs shouldn't contribute to writeback ownership arbitration c8f75e753784 block: null_blk: fix race condition for null_del_dev 1a3706d8f800 net: hns3: fix for skb leak when doing selftest 6a47a42f51cf qed: iWARP - Fix tc for MPA ll2 connection 670fb965da03 x86/cpufeatures: Add FDP_EXCPTN_ONLY and ZERO_FCS_FDS 366ae49ed78c rcu: Force inlining of rcu_read_lock() 1fb3ce14f28d ASoC: meson: axg-tdm: fix sample clock inversion 32df4043aed4 x86/cpu: Add Ice Lake NNPI to Intel family 914026d58100 selinux: fix empty write to keycreate file 10e3788e6575 media: s5p-mfc: fix reading min scratch buffer size on MFC v6/v7 7c10f8941b95 bpf: silence warning messages in core b01bf44c363d regmap: fix bulk writes on paged registers 544cd592ca72 gpio: omap: ensure irq is enabled before wakeup ddeef7a00050 gpio: omap: fix lack of irqstatus_raw0 for OMAP4 79644b600850 iommu: Fix a leak in iommu_insert_resv_region f2a4624be8f3 media: fdp1: Support M3N and E3 platforms 63e53991d791 media: uvcvideo: Fix access to uninitialized fields on probe error c844f4da9b92 irqchip/meson-gpio: Add support for Meson-G12A SoC eac8b39d089a perf report: Fix OOM error in TUI mode on s390 be32a9dc3f62 perf test 6: Fix missing kvm module load for s390 3662d8bca087 perf cs-etm: Properly set the value of 'old' and 'head' in snapshot mode ac510285d40b ipset: Fix memory accounting for hash types on resize c7bf2df45044 net: sfp: add mutex to prevent concurrent state checks fa4059c5497e RAS/CEC: Fix pfn insertion 99dcd701465f s390/qdio: handle PENDING state for QEBSM devices a76f32cbd38c net: axienet: Fix race condition causing TX hang 9d643358386d net: fec: Do not use netdev messages too early 403c43921479 crypto: inside-secure - do not rely on the hardware last bit for result descriptors 50331c64f3dd net: stmmac: modify default value of tx-frames 1a0a837afc41 net: stmmac: dwmac4: fix flow control issue 713737cac327 perf jvmti: Address gcc string overflow warning for strncpy() fb83987cbe6b arm64: mm: make CONFIG_ZONE_DMA32 configurable c360eb592938 cpupower : frequency-set -r option misses the last cpu in related cpu list cac3032062e5 net: hns3: set ops to null when unregister ad_dev 35407917b0bc media: wl128x: Fix some error handling in fm_v4l2_init_video_device() 2fbde2746597 locking/lockdep: Fix merging of hlocks with non-zero references 909034b8ac64 batman-adv: Fix duplicated OGMs on NETDEV_UP aa2ad8b6fb2f tua6100: Avoid build warnings. 9072450736d0 crypto: talitos - Align SEC1 accesses to 32 bits boundaries. 9d25aedef08f crypto: talitos - properly handle split ICV. fc25cfb03ea2 net: phy: Check against net_device being NULL ef10d46d04a5 media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails. e36f25627362 media: saa7164: fix remove_proc_entry warning ea904c9f6a33 media: mc-device.c: don't memset __user pointer contents a6dd4862b98f perf annotate TUI browser: Do not use member from variable within its own initialization 71b029a5d908 fscrypt: clean up some BUG_ON()s in block encryption/decryption 2c6acf7478aa xfrm: Fix xfrm sel prefix length validation 0544b64ceb64 af_key: fix leaks in key_pol_get_resp and dump_sp. b397462a010d signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig 1c8e736115cd qed: Set the doorbell address correctly df6680de7a20 net: stmmac: dwmac4/5: Clear unused address entries d3969670cb5a net: stmmac: dwmac1000: Clear unused address entries 810441651a8a media: media_device_enum_links32: clean a reserved field 6fb470ace862 media: vpss: fix a potential NULL pointer dereference 70da38e80509 media: marvell-ccic: fix DMA s/g desc number calculation add712b63185 media: ov7740: avoid invalid framesize setting b0e199e13495 crypto: talitos - fix skcipher failure due to wrong output IV 6452712f95e3 media: spi: IR LED: add missing of table registration 94f2b518a788 media: dvb: usb: fix use after free in dvb_usb_device_exit 8f855c09e2af batman-adv: fix for leaked TVLV handler. 83d133c96aad regmap: debugfs: Fix memory leak in regmap_debugfs_init 2b5b12c0c1b7 ath: DFS JP domain W56 fixed pulse type 3 RADAR detection da153c0c5746 wil6210: fix spurious interrupts in 3-msi a4bf4fecff16 ath10k: add peer id check in ath10k_peer_find_by_id 83c911f4bd68 ath6kl: add some bounds checking 42dcbf20e182 ath9k: Check for errors when reading SREV register 7e19e658e535 ath10k: Do not send probe response template for mesh 009edc622bba wil6210: fix potential out-of-bounds read 09593c25b975 dmaengine: imx-sdma: fix use-after-free on probe error path 06e15cf5aead scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported 37cb02da44dc arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly 73ebefc814ef MIPS: fix build on non-linux hosts 7202df6be6ec MIPS: ath79: fix ar933x uart parity mode be9b6782a9eb Linux 4.19.60 d173ce091c1a x86/entry/32: Fix ENDPROC of common_spurious 466bdfc6c4d6 drm/udl: move to embedding drm device inside udl device. af48f7d79fae drm/udl: Replace drm_dev_unref with drm_dev_put cfd99eccede5 drm/udl: introduce a macro to convert dev to udl. 8f14cf159e9f regmap-irq: do not write mask register if mask_base is zero 820b010743ee crypto/NX: Set receive window credits to max number of CRBs in RxFIFO b24c6403633d crypto: talitos - fix hash on SEC1. ff1ce8ef1f88 crypto: talitos - move struct talitos_edesc into talitos.h b578b87bcab6 s390/qdio: don't touch the dsci in tiqdio_add_input_queues() b1d52630b12a s390/qdio: (re-)initialize tiqdio list entries 02eb533e940a s390: fix stfle zero padding 9db915738e40 ARC: hide unused function unw_hdr_alloc fc6975ee932b x86/irq: Seperate unused system vectors from spurious entry again 9494cd392885 x86/irq: Handle spurious interrupt after shutdown gracefully 7897f5a443fb x86/ioapic: Implement irq_get_irqchip_state() callback 6074f6043c49 genirq: Add optional hardware synchronization for shutdown 3f10ccc29780 genirq: Fix misleading synchronize_irq() documentation 578db1aa595b genirq: Delay deactivation in free_irq() 2656ee5a5ad5 linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL 9c875e8556d4 pinctrl: mediatek: Update cur_mask in mask/mask ops f6e01328cb0e cpu/hotplug: Fix out-of-bounds read when setting fail state fa99487a43cf pinctrl: mediatek: Ignore interrupts that are wake only during resume cd2646e57ec5 HID: multitouch: Add pointstick support for ALPS Touchpad 9ea3b131441e HID: chicony: add another quirk for PixArt mouse 94968c37b6d3 x86/boot/64: Add missing fixup_pointer() for next_early_pgt access 729d25f43b64 x86/boot/64: Fix crash if kernel image crosses page table boundary 136847140cc8 dm verity: use message limit for data block corruption message 042be78692ae dm table: don't copy from a NULL pointer in realloc_argv() 0fc080bc9a72 pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order 00640eb0eafa ARM: dts: imx6ul: fix PWM[1-4] interrupts a8cc2a2c2841 sis900: fix TX completion 3232bccddeba ppp: mppe: Add softdep to arc4 5ec7753c7c9e be2net: fix link failure after ethtool offline test 2a6ee36917f0 x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz fdfff855cd36 afs: Fix uninitialised spinlock afs_volume::cb_break_lock d47f06ab0c0e ARM: omap2: remove incorrect __init annotation 5d3c45538151 ARM: dts: gemini Fix up DNS-313 compatible string afda29dc5ac6 perf/core: Fix perf_sample_regs_user() mm check 627fdcc9b718 efi/bgrt: Drop BGRT status field reserved bits check cf4deb2d4de6 clk: ti: clkctrl: Fix returning uninitialized data ff232a47567f irqchip/gic-v3-its: Fix command queue pointer comparison bug 244db54441a1 firmware: improve LSM/IMA security behaviour 079d7f16a973 drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT 68048dce650e nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header 86859ef10d25 Input: synaptics - enable SMBUS on T480 thinkpad trackpad 438a3dc6f2c3 e1000e: start network tx queue only when link is up 8020568b404b Revert "e1000e: fix cyclic resets at link up with active tx" 3bd837bfe431 Linux 4.19.59 70bae382b3dc staging: rtl8712: reduce stack usage, again b46475ecd930 staging: bcm2835-camera: Handle empty EOS buffers whilst streaming 0ee144effcc3 staging: bcm2835-camera: Remove check of the number of buffers supplied fcbc6ddcd624 staging: bcm2835-camera: Ensure all buffers are returned on disable 4502c43d7f3b staging: bcm2835-camera: Replace spinlock protecting context_map with mutex 22a20b9f6d9f staging: fsl-dpaa2/ethsw: fix memory leak of switchdev_work cc396afa1959 MIPS: Remove superfluous check for __linux__ d202b5adccfb VMCI: Fix integer overflow in VMCI handle arrays 486c32325caa carl9170: fix misuse of device driver API 524ad00e80b7 binder: fix memory leak in error path 294b893a41cd lkdtm: support llvm-objcopy 5c90a2ecd08a HID: Add another Primax PIXART OEM mouse quirk c04c751bef87 staging: comedi: amplc_pci230: fix null pointer deref on interrupt 4e49c6c91c18 staging: comedi: dt282x: fix a null pointer deref on interrupt 8419fd562a09 drivers/usb/typec/tps6598x.c: fix 4CC cmd write 63b3028cd590 drivers/usb/typec/tps6598x.c: fix portinfo width 57e16e0d8c68 usb: renesas_usbhs: add a workaround for a race condition of workqueue aa9a8038ea8b usb: dwc2: use a longer AHB idle timeout in dwc2_core_reset() cac4a04202fb usb: gadget: ether: Fix race between gether_disconnect and rx_submit 449a8d08a4bc p54usb: Fix race between disconnect and firmware loading 135d9ba3b285 Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled" 0891268f36a2 USB: serial: option: add support for GosunCn ME3630 RNDIS mode 0a1c811bf033 USB: serial: ftdi_sio: add ID for isodebug v1 bb902b6c87ff mwifiex: Don't abort on small, spec-compliant vendor IEs ffbbd626e1ce mwifiex: Abort at too short BSS descriptor element a2a24b57c27a Documentation/admin: Remove the vsyscall=native documentation 8a815007f5fe Documentation: Add section about CPU vulnerabilities for Spectre bd9604022eb3 x86/tls: Fix possible spectre-v1 in do_get_thread_area() 68ff28291a4f x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg() d8e26651ce8d perf pmu: Fix uncore PMU alias list for ARM64 018524b75852 block, bfq: NULL out the bic when it's no longer valid ff75e5f41e88 ALSA: hda/realtek - Headphone Mic can't record after S3 87c3262b00d8 ALSA: usb-audio: Fix parse of UAC2 Extension Units ef374f5a2731 media: stv0297: fix frequency range limit 5db079eb0acd udf: Fix incorrect final NOT_ALLOCATED (hole) extent length 0fc3e9b9b603 fscrypt: don't set policy for a dead directory e9f76b954336 net :sunrpc :clnt :Fix xps refcount imbalance on the error path 810cfc3d9d2e NFS4: Only set creation opendata if O_CREAT 7075654ce7d0 net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge() 606561e16186 quota: fix a problem about transfer quota 5ad566af08c1 scsi: qedi: Check targetname while finding boot target information 37232abb6ea3 net: lio_core: fix potential sign-extension overflow on large shift 740b2ac49518 ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL a02ac12d2d48 drm: return -EFAULT if copy_to_user() fails 4c938a635fc3 bnx2x: Check if transceiver implements DDM before access 270ae00a0346 md: fix for divide error in status_resync 5533d9ed4112 mmc: core: complete HS400 before checking status 2da80536f629 qmi_wwan: extend permitted QMAP mux_id value range dc84e98393f7 qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode dbc6a83cf2bc qmi_wwan: add support for QMAP padding in the RX path 292ba5b1faf4 bpf, x64: fix stack layout of JITed bpf code 4c2ce7addda8 bpf, devmap: Add missing RCU read lock on flush ab44f8bcf2e5 bpf, devmap: Add missing bulk queue free 8d09e862103b bpf, devmap: Fix premature entry free on destroying map ba0afe520ee9 mac80211: do not start any work during reconfigure flow de8cf2c0bc64 mac80211: only warn once on chanctx_conf being NULL 9c2dd6d47131 ARM: davinci: da8xx: specify dma_coherent_mask for lcdc 3bbcc8b9ad37 ARM: davinci: da850-evm: call regulator_has_full_constraints() 443250665388 mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed 512bbb114b99 KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy 41420ac584d7 Input: imx_keypad - make sure keyboard can always wake up system b71f312e9bf7 riscv: Fix udelay in RV32. 122c6a71c08d drm/vmwgfx: fix a warning due to missing dma_parms d3861d4ca94c drm/vmwgfx: Honor the sg list segment size limitation c0b12abd1828 s390/boot: disable address-of-packed-member warning e71daed5176f ARM: dts: am335x phytec boards: Fix cd-gpios active level 822c2ee81c63 ibmvnic: Fix unchecked return codes of memory allocations 0f06004d16be ibmvnic: Refresh device multicast list after reset e65dd528bb8e ibmvnic: Do not close unopened driver during reset 374180b11b29 net: phy: rename Asix Electronics PHY driver 473a75c7fab5 can: af_can: Fix error path of can_init() 486954277fc1 can: m_can: implement errata "Needless activation of MRAF irq" 270149f78b9c can: mcp251x: add support for mcp25625 33672c74b484 dt-bindings: can: mcp251x: add mcp25625 support 07c96e8e8021 soundwire: intel: set dai min and max channels correctly c7e427e28a3a mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies() 8e115a079940 iwlwifi: Fix double-free problems in iwl_req_fw_callback() d4c0f752c1d2 mwifiex: Fix possible buffer overflows at parsing bss descriptor b8588a0981b7 mac80211: free peer keys before vif down in mesh acc42e5c2322 mac80211: mesh: fix RCU warning e3868c1a462f staging:iio:ad7150: fix threshold mode config bit 6b1ce3971e05 soundwire: stream: fix out of boundary access on port properties 6be857082611 bpf: sockmap, fix use after free from sleep in psock backlog workqueue bc84982f977d mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he() 3c24a931e972 samples, bpf: suppress compiler warning e7779115bbd9 samples, bpf: fix to change the buffer size for read() fe01e93c3fd1 Input: elantech - enable middle button support on 2 ThinkPads 2883fc1ece69 soc: bcm: brcmstb: biuctrl: Register writes require a barrier 2f1c962a7416 soc: brcmstb: Fix error path for unsupported CPUs e8250f730410 crypto: talitos - rename alternative AEAD algos. 7a6bfa08b938 Linux 4.19.58 f37de75cb8eb dmaengine: imx-sdma: remove BD_INTR for channel0 018c968de710 dmaengine: qcom: bam_dma: Fix completed descriptors count 870de1499505 MIPS: have "plain" make calls build dtbs for selected platforms 8957895b35de MIPS: Add missing EHB in mtc0 -> mfc0 sequence. 2b8f8a80ca8b MIPS: Fix bounds check virt_addr_valid 80b25628ff26 svcrdma: Ignore source port when computing DRC hash 8129a10ce78f nfsd: Fix overflow causing non-working mounts on 1 TB machines f25c06955f8d KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC f6472f50fbfc KVM: x86: degrade WARN to pr_warn_ratelimited ac0024baf073 netfilter: ipv6: nf_defrag: accept duplicate fragments again 54e8cf41b20b bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K e6c288f7307e net: hns: fix unsigned comparison to less than zero 4f24801ef50b sc16is7xx: move label 'err_spi' to correct section 318244f3641a netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments a8891c5e2251 ip6: fix skb leak in ip6frag_expire_frag_queue() 382bc84da904 rds: Fix warning. 7e6af1fa80b8 ALSA: hda: Initialize power_state field properly c8c88293bf72 net: hns: Fixes the missing put_device in positive leg for roce reset 6bf9677300f3 x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting b91ec6ae14da selftests: fib_rule_tests: Fix icmp proto with ipv6 e2851c3ee0be scsi: tcmu: fix use after free 04096b3beace mac80211: mesh: fix missing unlock on error in table_path_del() e2379b044d67 f2fs: don't access node/meta inode mapping after iput e9fde78c3a4f drm/fb-helper: generic: Don't take module ref for fbcon 7821bcce20aa media: s5p-mfc: fix incorrect bus assignment in virtual child device 3ddc2a100706 net/smc: move unhash before release of clcsock cd54dc4cd37d mlxsw: spectrum: Handle VLAN device unlinking a8a296abee36 tty: rocket: fix incorrect forward declaration of 'rp_init()' fb814f215013 btrfs: Ensure replaced device doesn't have pending chunk allocation 27ce6c2675f6 mm/vmscan.c: prevent useless kswapd loops c854d9b6ef8d ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code() 2e716c3b562d drm/imx: only send event on crtc disable if kept disabled 8ec242fd431b drm/imx: notify drm core before sending event during crtc disable d2d061351d64 drm/etnaviv: add missing failure path to destroy suballoc ec5d99e18d30 drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE ec6d8c9e6687 drm/amd/powerplay: use hardware fan control if no powerplay fan table b6d56f4f6a49 arm64: kaslr: keep modules inside module region when KASAN is enabled 7cab3dfa6d74 ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node c8790d7f76be tracing/snapshot: Resize spare buffer if size changed 052b31810085 fs/userfaultfd.c: disable irqs for fault_pending and event locks ea38007107d6 lib/mpi: Fix karactx leak in mpi_powm 7df1e2f59bde ALSA: hda/realtek - Change front mic location for Lenovo M710q 899377c50e60 ALSA: hda/realtek: Add quirks for several Clevo notebook barebones d9b6936b134e ALSA: usb-audio: fix sign unintended sign extension on left shifts 7f52af5e9baa ALSA: line6: Fix write on zero-sized buffer 3663bf2baa97 ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages 9d2ac58c1ef9 ALSA: seq: fix incorrect order of dest_client/dest_ports arguments ae3fa28f0938 crypto: cryptd - Fix skcipher instance memory leak 015c20532ace crypto: user - prevent operating on larval algorithms 54435b7fff7b ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME 600d3712ae12 drm/i915/dmc: protect against reading random memory 2b39351e3844 ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper() 938044171949 module: Fix livepatch/ftrace module text permissions race 220adcc0e0ca tracing: avoid build warning with HAVE_NOP_MCOUNT 79fccb9815db mm/mlock.c: change count_mm_mlocked_page_nr return type 4fce0a79e985 scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE b7747ecb82be cpuset: restore sanity to cpuset_cpus_allowed_fallback() e33aeb9a7c0a i2c: pca-platform: Fix GPIO lookup code 7cf431edfb71 platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow c241f3fbfa1a platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration f853112772b0 platform/x86: intel-vbtn: Report switch events when event wakes device 2ac96173bee0 platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi 027e043f9c78 drm: panel-orientation-quirks: Add quirk for GPD MicroPC 2446563dd6d7 drm: panel-orientation-quirks: Add quirk for GPD pocket2 8be5629b9622 scsi: hpsa: correct ioaccel2 chaining c1bef204c70a SoC: rt274: Fix internal jack assignment in set_jack callback 1023af0c069d ALSA: hdac: fix memory release for SST and SOF drivers 26a6acde2a42 usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC 9be058f5dd70 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i] 5284327f4e17 x86/CPU: Add more Icelake model numbers 74929087384f ASoC: sun4i-i2s: Add offset to RX channel select 32475634e8a8 ASoC: sun4i-i2s: Fix sun8i tx channel offset mask 7b7486398a32 ASoC: max98090: remove 24-bit format support if RJ is 0 3b60f98ef496 drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable() 34e5e1c4874f drm/mediatek: clear num_pipes when unbind driver a8a86e9a5533 drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver 79e095d234bb drm/mediatek: unbind components in mtk_drm_unbind() 319f4699bcaa drm/mediatek: fix unbind functions dbd94f4938c6 spi: bitbang: Fix NULL pointer dereference in spi_unregister_master 3f8d3c9506a5 ASoC: ak4458: rstn_control - return a non-zero on error only 3c3dd68c48e8 ASoC: soc-pcm: BE dai needs prepare when pause release after resume 4c31b4b4ba65 ASoC: ak4458: add return value for ak4458_probe 0c19bcdb0db9 ASoC : cs4265 : readable register too low c549680ed59b netfilter: nft_flow_offload: IPCB is only valid for ipv4 family 041c181e6ba0 netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment 48f611ecea0e netfilter: nft_flow_offload: set liberal tracking mode for tcp 3b2734bc839d netfilter: nf_flow_table: ignore DF bit setting 869eec894663 md/raid0: Do not bypass blocking queue entered for raid0 bios c9d8d3e9d7a0 block: Fix a NULL pointer dereference in generic_make_request() 5dd6139a0aa2 Bluetooth: Fix faulty expression for minimum encryption key size check Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 885eeb589ed3150a17a8ac62c44632cb02171478) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index da87d47..c55ef50 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index cadf1a7..f4f411d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 5edb97f..fb50586 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ca3cb923f8d7962c6d47a8d29923e52da1818854" -SRCREV_machine_qemuarm64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips ?= "f624314048dfac57e47ac91d89ca3dc8395ca47a" -SRCREV_machine_qemuppc ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" +SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" +SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:30 +0000 Subject: [oe-commits] [openembedded-core] 09/14: timezone: update to 2019b In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.880422328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 1d1dcea1d2de02cb49950235586adbe4593f0eb7 Author: Armin Kuster AuthorDate: Sun Jul 14 09:53:45 2019 -0700 timezone: update to 2019b Briefly: Brazil no longer observes DST. 'zic -b slim' outputs smaller TZif files; please try it out. Palestine's 2019 spring-forward transition was on 03-29, not 03-30. Changes to future timestamps Brazil has canceled DST and will stay on standard time indefinitely. (Thanks to Steffen Thorsen, Marcus Diniz, and Daniel Soares de Oliveira.) Predictions for Morocco now go through 2087 instead of 2037, to work around a problem on newlib when using TZif files output by zic 2019a or earlier. (Problem reported by David Gauchard.) Changes to past and future timestamps Palestine's 2019 spring transition was 03-29 at 00:00, not 03-30 at 01:00. (Thanks to Sharef Mustafa and Even Scharning.) Guess future transitions to be March's last Friday at 00:00. Changes to past timestamps Hong Kong's 1941-06-15 spring-forward transition was at 03:00, not 03:30. Its 1945 transition from JST to HKT was on 11-18 at 02:00, not 09-15 at 00:00. In 1946 its spring-forward transition was on 04-21 at 00:00, not the previous day at 03:30. From 1946 through 1952 its fall-back transitions occurred at 04:30, not at 03:30. In 1947 its fall-back transition was on 11-30, not 12-30. (Thanks to P Chan.) Changes to past time zone abbreviations Italy's 1866 transition to Rome Mean Time was on December 12, not September 22. This affects only the time zone abbreviation for Europe/Rome between those dates. (Thanks to Stephen Trainor and Luigi Rosa.) Changes affecting metadata only Add info about the Crimea situation in zone1970.tab and zone.tab. (Problem reported by Serhii Demediuk.) Changes to code zic's new -b option supports a way to control data bloat and to test for year-2038 bugs in software that reads TZif files. 'zic -b fat' and 'zic -b slim' generate larger and smaller output; for example, changing from fat to slim shrinks the Europe/London file from 3648 to 1599 bytes, saving about 56%. Fat and slim files represent the same set of timestamps and use the same TZif format as documented in tzfile(5) and in Internet RFC 8536. Fat format attempts to work around bugs or incompatibilities in older software, notably software that mishandles 64-bit TZif data or uses obsolete TZ strings like "EET-2EEST" that lack DST rules. Slim format is more efficient and does not work around 64-bit bugs or obsolete TZ strings. Currently zic defaults to fat format unless you compile with -DZIC_BLOAT_DEFAULT=\"slim\"; this out-of-the-box default is intended to change in future releases as the buggy software often mishandles timestamps anyway. zic no longer treats a set of rules ending in 2037 specially. Previously, zic assumed that such a ruleset meant that future timestamps could not be predicted, and therefore omitted a POSIX-like TZ string in the TZif output. The old behavior is no longer needed for current tzdata, and caused problems with newlib when used with older tzdata (reported by David Gauchard). zic no longer generates some artifact transitions. For example, Europe/London no longer has a no-op transition in January 1996. Changes to build procedure tzdata.zi now assumes zic 2017c or later. This shrinks tzdata.zi by a percent or so. Changes to documentation and commentary The Makefile now documents the POSIXRULES macro as being obsolete, and similarly, zic's -p POSIXRULES option is now documented as being obsolete. Although the POSIXRULES feature still exists and works as before, in practice it is rarely used for its intended purpose, and it does not work either in the default reference implementation (for timestamps after 2037) or in common implementations such as GNU/Linux (for contemporary timestamps). Since POSIXRULES was designed primarily as a temporary transition facility for System V platforms that died off decades ago, it is being decommissioned rather than institutionalized. New info on Bonin Islands and Marcus (thanks to Wakaba and Phake Nick). Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit bbbb985808e5c301cdb7fdb1ff677706e99b4785) Signed-off-by: Armin Kuster --- meta/recipes-extended/timezone/timezone.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 1ade007..ce16524 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2019a" +PV = "2019b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -12,7 +12,7 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "27585a20bc5401324f42c8deb6e4677f" -SRC_URI[tzcode.sha256sum] = "8739f162bc30cdfb482435697f969253abea49595541a0afd5f443fbae433ff5" -SRC_URI[tzdata.md5sum] = "288f7b1e43018c633da108f13b27cf91" -SRC_URI[tzdata.sha256sum] = "90366ddf4aa03e37a16cd49255af77f801822310b213f195e2206ead48c59772" +SRC_URI[tzcode.md5sum] = "91e0978d947496fd6aaf46d351f9c41d" +SRC_URI[tzcode.sha256sum] = "2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d" +SRC_URI[tzdata.md5sum] = "b26b5d7d844cb96c73ed2fb6d588daaf" +SRC_URI[tzdata.sha256sum] = "05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:31 +0000 Subject: [oe-commits] [openembedded-core] 10/14: timezone:upgrade 2019b -> 2019c In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.909D52328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 0d58f5a01c7d49765d66a7e2d73eef0adb868eac Author: Zang Ruochen AuthorDate: Thu Sep 12 14:52:21 2019 +0800 timezone:upgrade 2019b -> 2019c -tzdata : upgrade from 2019b to 2019c. -tzcode-native : upgrade from 2019b to 2019c. -tzdata.bb and tzcode-native.bb require timezone.inc. Signed-off-by: Zang Ruochen Signed-off-by: Ross Burton (cherry picked from commit c5a382429d18642d35d40a4df6a58b971c724603) Signed-off-by: Armin Kuster --- meta/recipes-extended/timezone/timezone.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index ce16524..f6bab1a 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2019b" +PV = "2019c" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -12,7 +12,7 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "91e0978d947496fd6aaf46d351f9c41d" -SRC_URI[tzcode.sha256sum] = "2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d" -SRC_URI[tzdata.md5sum] = "b26b5d7d844cb96c73ed2fb6d588daaf" -SRC_URI[tzdata.sha256sum] = "05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64" +SRC_URI[tzcode.md5sum] = "195a17454c5db05cab96595380650391" +SRC_URI[tzcode.sha256sum] = "f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4" +SRC_URI[tzdata.md5sum] = "f6987e6dfdb2eb83a1b5076a50b80894" +SRC_URI[tzdata.sha256sum] = "79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:27 +0000 Subject: [oe-commits] [openembedded-core] 06/14: linux-yocto/4.19: update to v4.19.84 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.664A42328C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 69844300d3c547739cb1c3404c7b5ff74ed67d86 Author: Bruce Ashfield AuthorDate: Sun Nov 17 23:15:44 2019 -0500 linux-yocto/4.19: update to v4.19.84 Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: c555efaf1402 Linux 4.19.84 46a4a014c48e kvm: x86: mmu: Recovery of shattered NX large pages 6082f2e28887 kvm: Add helper function for creating VM worker threads 5219505fcbb6 kvm: mmu: ITLB_MULTIHIT mitigation db77548b1652 KVM: vmx, svm: always run with EFER.NXE=1 when shadow paging is active 37dfbc8ba763 KVM: x86: add tracepoints around __direct_map and FNAME(fetch) 9ef1fae24d58 KVM: x86: change kvm_mmu_page_get_gfn BUG_ON to WARN_ON b182093d1c70 KVM: x86: remove now unneeded hugepage gfn adjustment e79234ce5765 KVM: x86: make FNAME(fetch) and __direct_map more similar 8aaac3068623 kvm: mmu: Do not release the page inside mmu_set_spte() 30d8d8d6cd92 kvm: Convert kvm_lock to a mutex a991063ce576 kvm: x86, powerpc: do not allow clearing largepages debugfs entry 580c79e7e3e5 Documentation: Add ITLB_MULTIHIT documentation db5ae6596ae2 cpu/speculation: Uninline and export CPU mitigations helpers 955607466ace x86/cpu: Add Tremont to the cpu vulnerability whitelist f9aa6b73a407 x86/bugs: Add ITLB_MULTIHIT bug infrastructure 415bb221a070 x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs 4ad7466ddf2d x86/tsx: Add config options to set tsx=on|off|auto e3bf6b3ff55a x86/speculation/taa: Add documentation for TSX Async Abort 2402432d5557 x86/tsx: Add "auto" option to the tsx= cmdline parameter a0808f06dfa1 kvm/x86: Export MDS_NO=0 to guests when TSX is enabled 15dfa5d706df x86/speculation/taa: Add sysfs reporting for TSX Async Abort 6c58ea8525bf x86/speculation/taa: Add mitigation for TSX Async Abort b8eb348ae408 x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default 37cf9ef900cc x86/cpu: Add a helper function x86_read_arch_cap_msr() 4002d16a2ae1 x86/msr: Add the IA32_TSX_CTRL MSR dbf38b17a892 KVM: x86: use Intel speculation bugs and features as derived in generic x86 code fee619bb8136 drm/i915/cmdparser: Fix jump whitelist clearing 255ed51599de drm/i915/gen8+: Add RC6 CTX corruption WA 011b7173cbdb drm/i915: Lower RM timeout to avoid DSI hard hangs a7bda639a17f drm/i915/cmdparser: Ignore Length operands during command matching 6e53c71a6913 drm/i915/cmdparser: Add support for backward jumps f27bc2b5950d drm/i915/cmdparser: Use explicit goto for error paths cdd77c6b4be4 drm/i915: Add gen9 BCS cmdparsing fea688c5dd81 drm/i915: Allow parsing of unsized batches 7ce726b61c57 drm/i915: Support ro ppgtt mapped cmdparser shadow buffers fc3510fe6f6b drm/i915: Add support for mandatory cmdparsing fba4207cf15e drm/i915: Remove Master tables from cmdparser f1ff77080fa1 drm/i915: Disable Secure Batches for gen6+ b4b1abdc6b18 drm/i915: Rename gen7 cmdparser tables e238e05ec2dc vsock/virtio: fix sock refcnt holding during the shutdown 2e7e3f16901d iio: imu: mpu6050: Fix FIFO layout for ICM20602 99ea48af7bd9 net: prevent load/store tearing on sk->sk_stamp d32629dcd1e5 netfilter: ipset: Copy the right MAC address in hash:ip,mac IPv6 sets 5833560d54fd usbip: Fix free of unallocated memory in vhci tx 6890b4bc3d2b cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead d3b3c0a14615 mm/filemap.c: don't initiate writeback if mapping has no dirty pages 285eb6af4351 iio: imu: inv_mpu6050: fix no data on MPU6050 d888a80727ab iio: imu: mpu6050: Add support for the ICM 20602 IMU 522128128dec blkcg: make blkcg_print_stat() print stats only for online blkgs 30b969392cf2 pinctrl: cherryview: Fix irq_valid_mask calculation ca79bb7e1168 ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() 2c655a111968 pinctrl: intel: Avoid potential glitches if pin is in GPIO mode 713adf6dd327 e1000: fix memory leaks 4a05571772cc igb: Fix constant media auto sense switching when no cable is connected 1baab8352d80 net: ethernet: arc: add the missed clk_disable_unprepare 24523745ed41 NFSv4: Don't allow a cached open with a revoked delegation 440a748ed6df usb: dwc3: gadget: fix race when disabling ep with cancelled xfers e66f52eb3f29 hv_netvsc: Fix error handling in netvsc_attach() 99d5f18cebbf drm/amd/display: Passive DP->HDMI dongle detection fix e5edbf9c45ce drm/amdgpu: If amdgpu_ib_schedule fails return back the error. b651ddc15e7a iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41 214e4f0ecdd1 net: mscc: ocelot: refuse to overwrite the port's native vlan 5aedcc8aa8be net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up 3b956e63e2f3 net: hisilicon: Fix "Trying to free already-free IRQ" f09b99c883e8 fjes: Handle workqueue allocation failure 6376736d016f nvme-multipath: fix possible io hang after ctrl reconnect 1372527e6876 scsi: qla2xxx: stop timer in shutdown path f2bab3ed456c RDMA/hns: Prevent memory leaks of eq->buf_list 55ca08347487 RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case e36be7959326 usbip: tools: Fix read_usb_vudc_device() error path handling cd9561a53d26 USB: ldusb: use unsigned size format specifiers c753113ae714 USB: Skip endpoints with 0 maxpacket length ef38f4d123d0 perf/x86/uncore: Fix event group support f14751658a01 perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) 5b99e97b275a perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity 45944c4a7743 usb: dwc3: remove the call trace of USBx_GFLADJ dff38149cec4 usb: gadget: configfs: fix concurrent issue between composite APIs 10eb9abd21ba usb: dwc3: pci: prevent memory leak in dwc3_pci_probe c73ccf65e169 usb: gadget: composite: Fix possible double free memory bug 26d31e1c3ab2 usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. 88912019b49c usb: fsl: Check memory resource before releasing it 3a2675a2d97a macsec: fix refcnt leak in module exit routine 0d0ca85ad424 bonding: fix unexpected IFF_BONDING bit unset 50e31318b525 ipvs: move old_secure_tcp into struct netns_ipvs 102f4078fbdd ipvs: don't ignore errors in case refcounting ip_vs module fails 81de0b500baa netfilter: nf_flow_table: set timeout before insertion into hashes d45fc2ed472b scsi: qla2xxx: Initialized mailbox to prevent driver load failure b6612a3dbad8 scsi: lpfc: Honor module parameter lpfc_use_adisc 4e80e5614770 net: openvswitch: free vport unless register_netdevice() succeeds 027253315d70 RDMA/uverbs: Prevent potential underflow d582769add68 scsi: qla2xxx: fixup incorrect usage of host_byte 42de3a902443 net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq 7dfdcd9407f3 net/mlx5e: TX, Fix consumer index of error cqe dump 48dd71289ca3 RDMA/qedr: Fix reported firmware version 6208c2bfe224 iw_cxgb4: fix ECN check on the passive accept 89aa9e2626f4 RDMA/mlx5: Clear old rate limit when closing QP d6706b2ec108 HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() 113a154ef2f2 dmaengine: sprd: Fix the possible memory leak issue 6040f96d5147 dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config 78e7e0248eb8 HID: google: add magnemite/masterball USB ids 8181146cd7de PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 e2dd254bde5c usbip: Implement SG support to vhci-hcd and stub driver f865ae473c16 usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path e9c0fc4a7ccd sched/fair: Fix -Wunused-but-set-variable warnings 502bd151448c sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices 4ebee4875eab ALSA: usb-audio: Fix copy&paste error in the validator e0051889243d ALSA: usb-audio: remove some dead code 4f6c52002699 ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk() 3a0cdf210b94 ALSA: usb-audio: Clean up check_input_term() 9feeaa50e5b4 ALSA: usb-audio: Remove superfluous bLength checks f0e164f66e75 ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects dae4d839e549 ALSA: usb-audio: Simplify parse_audio_unit() 17821e2fb167 ALSA: usb-audio: More validations of descriptor units 5e36cf8edb58 configfs: fix a deadlock in configfs_symlink() 0dfc45be875a configfs: provide exclusion between IO and removals 25c118d8d158 configfs: new object reprsenting tree fragments 65524d647e9d configfs_register_group() shouldn't be (and isn't) called in rmdirable parts 2bd63490c1dd configfs: stash the data we need into configfs_buffer at open time a7be2debb769 can: peak_usb: fix slab info leak ce9b94da0e04 can: mcba_usb: fix use-after-free on disconnect 5a9e37f2029f can: dev: add missing of_node_put() after calling of_get_child_by_name() 9289226f6982 can: gs_usb: gs_can_open(): prevent memory leak 9f5c59428843 can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak ef502d5a84d6 can: peak_usb: fix a potential out-of-sync while decoding packets 7ae08111ca70 can: c_can: c_can_poll(): only read status register after status IRQ 0327c7818da2 can: flexcan: disable completely the ECC mechanism 46265660e5ba can: usb_8dev: fix use-after-free on disconnect d8a76e300e37 SMB3: Fix persistent handles reconnect caddaf43b024 x86/apic/32: Avoid bogus LDR warnings dc1a91dc4917 intel_th: pci: Add Jasper Lake PCH support f9d3aea1dca2 intel_th: pci: Add Comet Lake PCH support 64997ee49c8c netfilter: ipset: Fix an error code in ip_set_sockfn_get() 1b0e60f6a48b netfilter: nf_tables: Align nft_expr private data to 64-bit 2dae80b5b666 ARM: sunxi: Fix CPU powerdown on A83T 20b9e094dcd3 iio: srf04: fix wrong limitation in distance measuring bee45b44b13e iio: imu: adis16480: make sure provided frequency is positive a428996147e2 iio: adc: stm32-adc: fix stopping dma 78a1d6cdd302 ceph: add missing check in d_revalidate snapdir handling 6f9657793a6e ceph: fix use-after-free in __ceph_remove_cap() 3840610d60b2 arm64: Do not mask out PTE_RDONLY in pte_same() 56f270a1d72c soundwire: bus: set initial value to port_status 9a06efc745c3 soundwire: depend on ACPI a81a4637456b HID: wacom: generic: Treat serial number and related fields as unsigned e3fdd0c1a3d0 drm/radeon: fix si_enable_smc_cac() failed issue f39fbd05f921 perf tools: Fix time sorting 66d53cd683a8 tools: gpio: Use !building_out_of_srctree to determine srctree 8e358a027611 dump_stack: avoid the livelock of the dump_lock 6c944fc51f0a mm, vmstat: hide /proc/pagetypeinfo from normal users 2686f71fdcc5 mm: thp: handle page cache THP correctly in PageTransCompoundMap 7dfa51beacac mm, meminit: recalculate pcpu batch and high limits after init completes 8e6bf4bc3a88 mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges 6ecc16351a84 ALSA: hda/ca0132 - Fix possible workqueue stall 6921b1609912 ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series b85472244b70 ALSA: timer: Fix incorrectly assigned timer instance 107451b87ea5 net: hns: Fix the stray netpoll locks causing deadlock in NAPI path 26e398dcb3f1 ipv6: fixes rt6_probe() and fib6_nh->last_probe init 05b761423d67 net: mscc: ocelot: fix NULL pointer on LAG slave removal 1cfc967ef584 net: mscc: ocelot: don't handle netdev events for other netdevs a6fdbaeef1f2 qede: fix NULL pointer deref in __qede_remove() 956b38853517 NFC: st21nfca: fix double free 1143496c9632 nfc: netlink: fix double device reference drop 760a1f7f22ee NFC: fdp: fix incorrect free object 5580091ce7d9 net: usb: qmi_wwan: add support for DW5821e with eSIM support 4fd218071f21 net: qualcomm: rmnet: Fix potential UAF when unregistering b9bda52f8f3e net: fix data-race in neigh_event_send() 2fbfdb2de4a1 net: ethernet: octeon_mgmt: Account for second possible VLAN header 88f8c39912bc ipv4: Fix table id reference in fib_sync_down_addr 0ddabef89067 CDC-NCM: handle incomplete transfer of MTU 27b5f4bf5ba9 bonding: fix state transition issue in link monitoring 7d8dbefc22ff Linux 4.19.83 818c96ac80be usb: gadget: udc: core: Fix segfault if udc_bind_to_driver() for pending driver fails b06f37eaa2b3 arm64: dts: ti: k3-am65-main: Fix gic-its node unit-address 54ee5ccd0251 ASoC: pcm3168a: The codec does not support S32_LE 3ddf2a70cf6d selftests/powerpc: Fix compile error on tlbie_test due to newer gcc e7aaa8dd60c5 selftests/powerpc: Add test case for tlbie vs mtpidr ordering issue ec199b24aa5c powerpc/mm: Fixup tlbie vs mtpidr/mtlpidr ordering issue on POWER9 06e8438eddf8 platform/x86: pmc_atom: Add Siemens SIMATIC IPC227E to critclk_systems DMI table 2d830cf287a5 wireless: Skip directory when generating certificates 558d2bdad5f6 net/flow_dissector: switch to siphash f6ef35998fb0 r8152: add device id for Lenovo ThinkPad USB-C Dock Gen 2 c33f7efec3b3 net: dsa: fix switch tree list 6b5bf3f37f72 net: usb: lan78xx: Connect PHY before registering MAC 07c62fc7bf28 net: bcmgenet: reset 40nm EPHY on energy detect 6d3ccc2a5b19 net: phy: bcm7xxx: define soft_reset for 40nm EPHY 97cc6827f418 net: bcmgenet: don't set phydev->link from MAC 57e286f67554 net: dsa: b53: Do not clear existing mirrored port mask db91be8e27c8 net/mlx5e: Fix ethtool self test: link speed 5eb1967bfde3 r8169: fix wrong PHY ID issue with RTL8168dp 9e7c4fa275cf net/mlx5e: Fix handling of compressed CQEs in case of low NAPI budget 0c3355cc8e19 selftests: fib_tests: add more tests for metric update b166e8838a97 ipv4: fix route update on metric change. cd3bcb44ee3b net: add READ_ONCE() annotation in __skb_wait_for_more_packets() 4f3df7f1eaa7 net: use skb_queue_empty_lockless() in busy poll contexts eaf548feaa17 net: use skb_queue_empty_lockless() in poll() handlers afa1f5e98c11 udp: use skb_queue_empty_lockless() d5ac4232c376 net: add skb_queue_empty_lockless() 83532eb48049 vxlan: check tun_info options_len properly a8a5adbbf779 udp: fix data-race in udp_set_dev_scratch() 12fab1634ab1 selftests: net: reuseport_dualstack: fix uninitalized parameter 321c99155f4b net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol() 9da271c1cdc1 net: usb: lan78xx: Disable interrupts before calling generic_handle_irq() 40400fdd312a netns: fix GFP flags in rtnl_net_notifyid() 1d72dbb4ca2f net/mlx4_core: Dynamically set guaranteed amount of counters per VF f05975d9f393 net: hisilicon: Fix ping latency when deal with high throughput 1d5cb12a2539 net: fix sk_page_frag() recursion from memory reclaim 189982d111c0 net: ethernet: ftgmac100: Fix DMA coherency issue with SW checksum 5536fc891221 net: dsa: bcm_sf2: Fix IMP setup for port different than 8 2c50a36d0b78 net: annotate lockless accesses to sk->sk_napi_id 0cfaf03c5d58 net: annotate accesses to sk->sk_incoming_cpu 07de738901d6 inet: stop leaking jiffies on the wire 163901dc945b erspan: fix the tun_info options_len check for erspan 96df1ec22b97 dccp: do not leak jiffies on the wire f291613ff140 cxgb4: fix panic when attaching to ULD fail 1f032ca298dd nbd: handle racing with error'ed out commands 82b7c99ee141 nbd: protect cmd->status with cmd->lock 80b42f4381c2 cifs: Fix cifsInodeInfo lock_sem deadlock when reconnect occurs a7448991fa3e i2c: stm32f7: remove warning when compiling with W=1 86fd9e339ab4 i2c: stm32f7: fix a race in slave mode with arbitration loss irq d746ce649556 i2c: stm32f7: fix first byte to send in slave mode 18e7fae372a1 irqchip/gic-v3-its: Use the exact ITSList for VMOVP 39637aafa173 MIPS: bmips: mark exception vectors as char arrays fcc3f7c810c3 of: unittest: fix memory leak in unittest_data_add c56b9da70d09 ARM: 8926/1: v7m: remove register save to stack before svc fa18f803d1f7 tracing: Fix "gfp_t" format for synthetic events 63571a1f375e scsi: target: core: Do not overwrite CDB byte 1 1df8da335d40 drm/amdgpu: fix potential VM faults 3cd2b6492cde ARM: davinci: dm365: Fix McBSP dma_slave_map entry e18bf407ea3f perf kmem: Fix memory leak in compact_gfp_flags() 05dd6283b8fc 8250-men-mcb: fix error checking when get_num_ports returns -ENODEV 81809424cad7 perf c2c: Fix memory leak in build_cl_output() 7a79420034e0 ARM: dts: imx7s: Correct GPT's ipg clock source e601e103cfed scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE 3dd0be3eeeb0 scsi: sni_53c710: fix compilation error cf372c60ed13 scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions 3ee6a8bdae81 scsi: qla2xxx: fix a potential NULL pointer dereference 9d27ba401eca ARM: mm: fix alignment handler faults under memory pressure f0eabc9e9acb pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable() 9a5d5ffb3245 ARM: dts: logicpd-torpedo-som: Remove twl_keypad d7e2a8e271aa ASoc: rockchip: i2s: Fix RPM imbalance 513474f59001 ASoC: wm_adsp: Don't generate kcontrols without READ flags bab5c14b5c89 regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could be uninitialized 6ef17b446081 ASoC: rt5682: add NULL handler to set_jack function 772c18df9f3d regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone c4c0e64deb9a arm64: dts: Fix gpio to pinmux mapping 0d3aef1ea7e8 arm64: dts: allwinner: a64: sopine-baseboard: Add PHY regulator delay a3a208ac4608 arm64: dts: allwinner: a64: pine64-plus: Add PHY regulator delay dc24ac36f304 ASoC: wm8994: Do not register inapplicable controls for WM1811 0f037d0a62b0 regulator: of: fix suspend-min/max-voltage parsing b17eae5a0e16 kbuild: add -fcf-protection=none when using retpoline flags 5ee93551c703 Linux 4.19.82 914a7d429da5 Revert "ALSA: hda: Flush interrupts on disabling" 8f5603029223 powerpc/powernv: Fix CPU idle to be called with IRQs disabled 92930e922399 ALSA: usb-audio: Add DSD support for Gustard U16/X26 USB Interface c08182dbf057 ALSA: usb-audio: Update DSD support quirks for Oppo and Rotel d8808d2e79b5 ALSA: usb-audio: DSD auto-detection for Playback Designs 831317430693 ALSA: timer: Fix mutex deadlock at releasing card 145fadf6d99a ALSA: timer: Simplify error path in snd_timer_open() a6c91087f5d5 sch_netem: fix rcu splat in netem_enqueue() 3ecf8529d52a net: usb: sr9800: fix uninitialized local variable 14a703ef2dc4 bonding: fix potential NULL deref in bond_update_slave_arr 24aaf7f4528f NFC: pn533: fix use-after-free and memleaks 8d9c4a9b8677 rxrpc: Fix trace-after-put looking at the put peer record e8e51ce79c15 rxrpc: rxrpc_peer needs to hold a ref on the rxrpc_local record 570ab0dd35f9 rxrpc: Fix call ref leak d634bd01b3a0 llc: fix sk_buff leak in llc_conn_service() 3f3f7409f028 llc: fix sk_buff leak in llc_sap_state_process() 948e8eba656f batman-adv: Avoid free/alloc race when handling OGM buffer 74001646d47c NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid() fd9a708c7bde drm/amdgpu/powerplay/vega10: allow undervolting in p7 3e285a5c1401 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle a0e406be17e5 dmaengine: qcom: bam_dma: Fix resource leak 64efcbc7a5a3 rtlwifi: Fix potential overflow on P2P code a81669161528 arm64: Ensure VM_WRITE|VM_SHARED ptes are clean by default 8dd6066066a2 s390/idle: fix cpu idle time calculation ced8cb0230d0 s390/cmm: fix information leak in cmm_timeout_handler() be87ee689106 nl80211: fix validation of mesh path nexthop 14e0dd84db60 HID: fix error message in hid_open_report() 8a01c4b908cf HID: Fix assumption that devices have inputs cf143d65c556 HID: i2c-hid: add Trekstor Primebook C11B to descriptor override 6608702bec70 scsi: target: cxgbit: Fix cxgbit_fw4_ack() 45e7acdff38e USB: serial: whiteheat: fix line-speed endianness b7ad5aa67058 USB: serial: whiteheat: fix potential slab corruption 36e02e1fba89 usb: xhci: fix __le32/__le64 accessors in debugfs code 8e2cccd6c5d1 USB: ldusb: fix control-message timeout 3f1a7d903b8d USB: ldusb: fix ring-buffer locking f1b94b60bb1c usb-storage: Revert commit 747668dbc061 ("usb-storage: Set virt_boundary_mask to avoid SG overflows") d1c188d330ca USB: gadget: Reject endpoints with 0 maxpacket value ceb6b658f0bd UAS: Revert commit 3ae62a42090f ("UAS: fix alignment of scatter/gather segments") a58cdc35d3a0 ALSA: hda/realtek - Add support for ALC623 101bb262ba43 ALSA: hda/realtek - Fix 2 front mics of codec 0x623 3ae205d7a0a2 ALSA: bebob: Fix prototype of helper function to return negative value 62e42369de37 fuse: truncate pending writes on O_TRUNC 72c913fdde9d fuse: flush dirty data/metadata before non-truncate setattr 696da0225946 ath6kl: fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe() 1a124f16b594 thunderbolt: Use 32-bit writes when writing ring producer/consumer f2cc221b6515 USB: legousbtower: fix a signedness bug in tower_probe() 083322455c67 nbd: verify socket is supported during setup e0064f8de3f5 iwlwifi: exclude GEO SAR support for 3168 5a445f805afc ALSA: hda/realtek: Reduce the Headphone static noise on XPS 9350/9360 ce005e5d6e9f ARM: 8914/1: NOMMU: Fix exc_ret for XIP 394c90d9ce13 tracing: Initialize iter->seq after zeroing in tracing_read_pipe() 12e132664f92 s390/uaccess: avoid (false positive) compiler warnings da24be886ff6 NFSv4: Fix leak of clp->cl_acceptor string cad4448dfc9c nbd: fix possible sysfs duplicate warning c2ea451f22f1 virt: vbox: fix memory leak in hgcm_call_preprocess_linaddr 5865397db6c3 MIPS: fw: sni: Fix out of bounds init of o32 stack 317b6f68abb1 MIPS: include: Mark __xchg as __always_inline 4a4206a83fc6 iio: imu: adis16400: release allocated memory on failure f2824a020746 drm/amdgpu: fix memory leak a1112c465593 perf/x86/amd: Change/fix NMI latency mitigation to use a timestamp 2cd003a820fe sched/vtime: Fix guest/system mis-accounting on task switch 58d33d4a4a1d x86/cpu: Add Comet Lake to the Intel CPU models header 6258745b311b arm64: armv8_deprecated: Checking return value for memory allocation c3689876f5b9 fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc() 4de544b42c7a fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock() c18d86047622 fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry() 2141f777e6e1 ocfs2: clear zero in unaligned direct IO af140367ae66 x86/xen: Return from panic notifier 0169198631e7 MIPS: include: Mark __cmpxchg as __always_inline 9b7591cf6cf6 efi/x86: Do not clean dummy variable in kexec path 318885aa154d efi/cper: Fix endianness of PCIe class code 02c1fb11b6a0 serial: mctrl_gpio: Check for NULL pointer 497fd98a50b2 fs: cifs: mute -Wunused-const-variable message 579249a08348 gpio: max77620: Use correct unit for debounce times 7f3306a3b2df tty: n_hdlc: fix build on SPARC 14a4689f8847 tty: serial: owl: Fix the link time qualifier of 'owl_uart_exit()' d21a5d4a7339 arm64: ftrace: Ensure synchronisation in PLT setup for Neoverse-N1 #1542419 ca2cc4b47d01 nfs: Fix nfsi->nrequests count error on nfs_inode_remove_request aeb242943505 HID: hyperv: Use in-place iterator API in the channel callback 9c75c230ded2 RDMA/iwcm: Fix a lock inversion issue 962cff4f3f89 RDMA/hfi1: Prevent memory leak in sdma_init dfc1daba843b staging: rtl8188eu: fix null dereference when kzalloc fails 3545c018d0c3 perf annotate: Return appropriate error code for allocation failures f8304a9310c3 perf annotate: Propagate the symbol__annotate() error return 4e2ca0c9143c perf annotate: Fix the signedness of failure returns ec783e28e72d perf annotate: Propagate perf_env__arch() error f0ba7ab26bfc perf tools: Propagate get_cpuid() error c022c7f6171e perf jevents: Fix period for Intel fixed counters 5ecf35ed5d17 perf script brstackinsn: Fix recovery from LBR/binary mismatch 262ed71096ba perf map: Fix overlapped map handling d975e5970965 perf tests: Avoid raising SEGV using an obvious NULL dereference e3dc77d662ca libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature 915eb63dac7b iio: fix center temperature of bmc150-accel-core 78e6415d4f9a iio: adc: meson_saradc: Fix memory allocation order 1b6901f3c600 power: supply: max14656: fix potential use-after-free a0d8a590d983 drm/amd/display: fix odm combine pipe reset a897f54e921c PCI/PME: Fix possible use-after-free on remove 0e23eeb0fc58 net: dsa: mv88e6xxx: Release lock while requesting IRQ 646e5c77b418 exec: load_script: Do not exec truncated interpreter path f251c83d6c08 ext4: disallow files with EXT4_JOURNAL_DATA_FL from EXT4_IOC_SWAP_BOOT cc4d8283f6e9 media: vimc: Remove unused but set variables c629fed0347e ALSA: hda/realtek - Apply ALC294 hp init also for S4 resume b73132b74d25 cifs: add credits from unmatched responses/messages ee4d28a716e8 CIFS: Respect SMB2 hdr preamble size in read responses 2a2022688a91 scsi: lpfc: Correct localport timeout duration error 1df87fc5e468 mlxsw: spectrum: Set LAG port collector only when active e32271519bb9 arm64: kpti: Whitelist HiSilicon Taishan v110 CPUs 6021dd86ca38 arm64: Add MIDR encoding for HiSilicon Taishan CPUs 9190141529fb rtc: pcf8523: set xtal load capacitance from DT 961ba81d08d8 usb: handle warm-reset port requests on hub resume 3a77562e18bf ALSA: usb-audio: Cleanup DSD whitelist a0608eec296d usb: dwc3: gadget: clear DWC3_EP_TRANSFER_STARTED on cmd complete d0e8b35e915e usb: dwc3: gadget: early giveback if End Transfer already completed 335d4f818246 samples: bpf: fix: seg fault with NULL pointer arg c41f30e8d233 HID: steam: fix deadlock with input devices. 4c8ae7221bcc HID: steam: fix boot loop with bluetooth firmware ce05beb3b402 NFSv4: Ensure that the state manager exits the loop on SIGKILL 952b0285826e HID: Add ASUS T100CHI keyboard dock battery quirks 24ec7c1b9b17 staging: mt7621-pinctrl: use pinconf-generic for 'dt_node_to_map' and 'dt_free_map' b064e272023c scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks 9aafa2996921 clk: boston: unregister clks on failure in clk_boston_setup() 1ba6488775f1 ath10k: assign 'n_cipher_suites = 11' for WCN3990 to enable WPA3 a6af54d4ad0d platform/x86: Fix config space access for intel_atomisp2_pm 8694ceba9338 platform/x86: Add the VLV ISP PCI ID to atomisp2_pm 8c1b1d3c7593 HID: i2c-hid: Add Odys Winbook 13 to descriptor override 3db3961160f6 HID: i2c-hid: Ignore input report if there's no data present on Elan touchpanels e0bcac994ad8 HID: i2c-hid: Disable runtime PM for LG touchscreen d8187ff32b23 netfilter: ipset: Make invalid MAC address checks consistent cb38a17cc880 Btrfs: fix deadlock on tree root leaf when finding free extent 33970cf511c8 PCI: Fix Switchtec DMA aliasing quirk dmesg noise 437de04184bc bcache: fix input overflow to writeback_rate_minimum be488566ef2f drm/msm/dpu: handle failures while initializing displays b5b3bb03c372 x86/cpu: Add Atom Tremont (Jacobsville) ab0888699734 tools/power turbostat: fix goldmont C-state limit decoding 4da8b5f8a71d usb: dwc2: fix unbalanced use of external vbus-supply 649ee6f0c677 HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override ce43554395a3 f2fs: fix to recover inode->i_flags of inode block during POR b619de076f9c f2fs: fix to recover inode's i_gc_failures during POR 23848022460f powerpc/powernv: hold device_hotplug_lock when calling memtrace_offline_pages() bff91a961a05 sc16is7xx: Fix for "Unexpected interrupt: 8" 157c391babd7 scsi: lpfc: Fix a duplicate 0711 log message number. 6b2fbfacd74b f2fs: flush quota blocks after turnning it off e5641f02dc9e wil6210: fix freeing of rx buffers in EDMA mode d8ab4185ea55 btrfs: tracepoints: Fix wrong parameter order for qgroup events 6bcbe35027e2 btrfs: qgroup: Always free PREALLOC META reserve in btrfs_delalloc_release_extents() 96b9b94647b0 Btrfs: fix memory leak due to concurrent append writes with fiemap 692aa7d55ff8 Btrfs: fix inode cache block reserve leak on failure to allocate data space a8afda7774a3 dm snapshot: rework COW throttling to fix deadlock 223f1af69da8 dm snapshot: introduce account_start_copy() and account_end_copy() 0ca37291020e zram: fix race between backing_dev_show and backing_dev_store ef244c308885 Linux 4.19.81 27414f90ff6e RDMA/cxgb4: Do not dma memory off of the stack 054441182b51 blk-rq-qos: fix first node deletion of rq_qos_del() 2ada40308a0d PCI: PM: Fix pci_power_up() ccb02adf3293 xen/netback: fix error path of xenvif_connect_data() 89ab39da1452 cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown 5f19cbb3ab3f memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()' 0b95aaae783f btrfs: tracepoints: Fix bad entry members of qgroup events 1b921b5bc47f Btrfs: check for the full sync flag while holding the inode lock during fsync ac6bae2b524d Btrfs: add missing extents release on file extent cluster relocation error 6cd5be9832eb btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group() a5a10f7800ed pinctrl: armada-37xx: swap polarity on LED group e0e489aa5bd0 pinctrl: armada-37xx: fix control of pins 32 and up 5e9d71802ddc pinctrl: cherryview: restore Strago DMI workaround for all versions 4dedaa73c4c4 x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu 1709917289cd x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area e49c84c51c3a dm cache: fix bugs when a GFP_NOWAIT allocation fails 5ce7528c4d4a tracing: Fix race in perf_trace_buf initialization 96202569b9fe perf/aux: Fix AUX output stopping 01332b037066 CIFS: Fix use after free of file info structures 71cf88165ff0 CIFS: avoid using MID 0xFFFF 4292745536d2 arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT d97e4a6d2b2f EDAC/ghes: Fix Use after free in ghes_edac remove path ca65fe21981b parisc: Fix vmap memory leak in ioremap()/iounmap() 19e2ed7bfabe xtensa: drop EXPORT_SYMBOL for outs*/ins* 30cff8ab6ed7 mm/memory-failure: poison read receives SIGKILL instead of SIGBUS if mmaped more than once 91eec7692b94 hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic() f712e3066f75 mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo bb6932c5a473 mm/slub: fix a deadlock in show_slab_objects() 9792afbd630b mm/memory-failure.c: don't access uninitialized memmaps in memory_failure() 01a44055a48a mmc: cqhci: Commit descriptors before setting the doorbell 6ea856efef9f fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c 43a2a6c2f0fb drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() 4d5307c099af drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1 11377c3e997e drm/ttm: Restore ttm prefaulting 33af2a8ee304 drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50 24ca62892032 mac80211: Reject malformed SSID elements 73c066a9552a cfg80211: wext: avoid copying malformed SSIDs 83dc16707f6d ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit() 8e367b029e61 ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting b0dd6a24255e Input: synaptics-rmi4 - avoid processing unknown IRQs aa9402c14df6 Input: da9063 - fix capability and drop KEY_SLEEP e254d4359259 scsi: ch: Make it possible to open a ch device multiple times again 0c6905197c5b scsi: core: try to get module before removing device 2a675e73dfec scsi: core: save/restore command resid for error handling 0cea86f270e9 scsi: sd: Ignore a failure to sync cache due to lack of authorization 3638ccda1009 scsi: zfcp: fix reaction on bit error threshold notification d07c028d2bc9 staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS 4034a5030589 MIPS: tlbex: Fix build_restore_pagemask KScratch restore 9f7e157464cd USB: ldusb: fix read info leaks 3b73a0e453bd USB: usblp: fix use-after-free on disconnect 28ab2c5f5899 USB: ldusb: fix memleak on disconnect edd3e9c71cc8 USB: serial: ti_usb_3410_5052: fix port-close races 068fcbe895cd usb: udc: lpc32xx: fix bad bit shift operation 7ed43d2eb0ec ALSA: hda - Force runtime PM on Nvidia HDMI codecs 7dda74810c9a ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers 6c8a9a46ec57 ALSA: hda/realtek - Enable headset mic on Asus MJ401TA 30a83eb0a09d ALSA: hda/realtek - Add support for ALC711 5366778bf0ed USB: legousbtower: fix memleak on disconnect 99b45e7a1ba1 memfd: Fix locking when tagging pins 2770f80afde7 sctp: change sctp_prot .no_autobind with true cd8c21ca7022 net: stmmac: disable/enable ptp_ref_clk in suspend/resume flow da4f0aed87d5 net: ipv6: fix listify ip6_rcv_finish in case of forwarding cc2d858b3f73 net/ibmvnic: Fix EOI when running in XIVE mode. 3f9d4e3c2954 net: i82596: fix dma_alloc_attr for sni_82596 da0baae9a725 net: bcmgenet: Set phydev->dev_flags only for internal PHYs c0f5839a483f net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 16d67acad815 net: avoid potential infinite loop in tc_ctl_action() 2fa80e64de33 ipv4: Return -ENETUNREACH if we can't create route but saddr is valid 2ec0df4e3fee ipv4: fix race condition between route lookup and invalidation 0d3ad773b445 ocfs2: fix panic due to ocfs2_wq is null 0933b0db7fb2 Revert "drm/radeon: Fix EEH during kexec" 9457994a53d1 md/raid0: fix warning message for parameter default_layout 51f0c10890aa libata/ahci: Fix PCS quirk application 9bc5a4db9aa9 namespace: fix namespace.pl script to support relative paths 6acbcd1429f1 r8152: Set macpassthru in reset_resume callback 0cb5c7b06a0a lib: textsearch: fix escapes in example code 50699af3609c net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() db1e664e2d80 mips: Loongson: Fix the link time qualifier of 'serial_exit()' b43bf6b10344 net: dsa: rtl8366rb: add missing of_node_put after calling of_get_child_by_name a16a9c10b2b0 netfilter: nft_connlimit: disable bh on garbage collection 13104599d07f mac80211: fix txq null pointer dereference 09c5a5bb0f26 nl80211: fix null pointer dereference 90a886b68faa xen/efi: Set nonblocking callbacks 5d880444955e MIPS: dts: ar9331: fix interrupt-controller size 6d0da953bd8e net: dsa: qca8k: Use up to 7 ports for all operations 1cd24f5edab8 ARM: dts: am4372: Set memory bandwidth limit for DISPC 960019214539 ieee802154: ca8210: prevent memory leak ec3817c62ede ARM: OMAP2+: Fix warnings with broken omap2_set_init_voltage() a23cd06c2cd2 ARM: OMAP2+: Fix missing reset done flag for am3 and am43 fcff55e25593 scsi: qla2xxx: Fix unbound sleep in fcport delete path. c3d475c7d9b9 scsi: megaraid: disable device when probe failed after enabled device c6d91bd3fa35 scsi: ufs: skip shutdown if hba is not powered db783e05df55 nvme-pci: Fix a race in controller removal c3038e718a19 Linux 4.19.80 0603d82bcae4 perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization 91849adc9f90 PCI: vmd: Fix config addressing when using bus offsets cd4b60e57a7a x86/asm: Fix MWAITX C-state hint value 99ada52ce213 hwmon: Fix HWMON_P_MIN_ALARM mask b9040fab5f36 tracing: Get trace_array reference for available_tracers files a6c9fb2c2ce4 ftrace: Get a reference counter for the trace_array on filter files b7f758631d69 tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency 6271cbff9309 tracing/hwlat: Report total time spent in all NMIs during the sample 3766c9d9c47c arm64/sve: Fix wrong free for task->thread.sve_state 6f64aa703c0c media: stkwebcam: fix runtime PM after driver unbind 664ec2db3b1f Fix the locking in dcache_readdir() and friends a64241ba496c arm64: topology: Use PPTT to determine if PE is a thread b098a4cd99ff ACPI/PPTT: Add support for ACPI 6.3 thread flag a73306414fcd ACPICA: ACPI 6.3: PPTT add additional fields in Processor Structure Flags 34ab38cd8098 MIPS: elf_hwcap: Export userspace ASEs aaa81d9e6523 MIPS: Disable Loongson MMI instructions for kernel build e9360f393d7b NFS: Fix O_DIRECT accounting of number of bytes read/written e0805d7f7f1b btrfs: fix uninitialized ret in ref-verify f7313de46e46 btrfs: fix incorrect updating of log root tree a8de7090805d cifs: use cifsInodeInfo->open_file_lock while iterating to avoid a panic f6c715708fb8 iio: adc: stm32-adc: fix a race when using several adcs with dma and irq a9968a4d6399 iio: adc: stm32-adc: move registers definitions 410ab742a503 gpiolib: don't clear FLAG_IS_OUT when emulating open-drain/open-source b41013b51870 firmware: google: increment VPD key_len properly 491a39dcee44 mm/vmpressure.c: fix a signedness bug in vmpressure_register_event() 7bbe6eefdbb3 kernel/sysctl.c: do not override max_threads provided by userspace 230b339a7c75 CIFS: Force reval dentry if LOOKUP_REVAL flag is set 0bc78de461b4 CIFS: Force revalidate inode when dentry is stale d72c2115108f CIFS: Gracefully handle QueryInfo errors during open 345c03a0defb blk-wbt: fix performance regression in wbt scale_up/scale_down d855a5f2dec7 perf inject jit: Fix JIT_CODE_MOVE filename 47a4e4decddd perf llvm: Don't access out-of-scope array ee7ee6cfc3af efivar/ssdt: Don't iterate over EFI vars if no SSDT override was specified c9a182ddf2d4 iio: light: opt3001: fix mutex unlock race 811616a6400d iio: adc: axp288: Override TS pin bias current for some models 99757b1d9c17 iio: adc: ad799x: fix probe error handling 2cb6f0417ee1 iio: adc: hx711: fix bug in sampling of data 2f9a82e2d2e6 staging: vt6655: Fix memory leak in vt6655_probe df455ed36901 Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc d58d477c5852 gpio: eic: sprd: Fix the incorrect EIC offset when toggling ce20fd3e1530 mei: avoid FW version request on Ibex Peak and earlier d7e57796b6c0 mei: me: add comet point (lake) LP device ids f931791751d3 USB: legousbtower: fix use-after-free on release e3f445666f51 USB: legousbtower: fix open after failed reset request 99c0c615ff98 USB: legousbtower: fix potential NULL-deref on disconnect fe471bf16720 USB: legousbtower: fix deadlock on disconnect 4fde6c982393 USB: legousbtower: fix slab info leak at probe dff3bc5edcf6 usb: renesas_usbhs: gadget: Fix usb_ep_set_{halt,wedge}() behavior 55efffb294d2 usb: renesas_usbhs: gadget: Do not discard queues in usb_ep_set_{halt,wedge}() 3b089cef3cc1 USB: dummy-hcd: fix power budget for SuperSpeed mode ab8d87d14d82 USB: microtek: fix info-leak at probe 0f14e44ebc0e USB: usblcd: fix I/O after disconnect 58c2b4c5610d USB: serial: fix runtime PM after driver unbind 8dcda04939fd USB: serial: option: add support for Cinterion CLS8 devices f7ab1c54c1a4 USB: serial: option: add Telit FN980 compositions 13b0420eb2ea USB: serial: ftdi_sio: add device IDs for Sienna and Echelon PL-20 a463d20a5772 USB: serial: keyspan: fix NULL-derefs on open() and write() 21917fcb05d1 serial: uartlite: fix exit path null pointer 0c999b4b00db USB: ldusb: fix NULL-derefs on driver unbind 39fe586c4069 USB: chaoskey: fix use-after-free on release 2f2b039530ea USB: usblp: fix runtime PM after driver unbind 2095532522d1 USB: iowarrior: fix use-after-free after driver unbind 7f93c8c89541 USB: iowarrior: fix use-after-free on release 2fdcf7e19bde USB: iowarrior: fix use-after-free on disconnect ab162d331cc1 USB: adutux: fix use-after-free on release ca9c18c00a95 USB: adutux: fix NULL-derefs on disconnect 316f51d77597 USB: adutux: fix use-after-free on disconnect ea7255663398 xhci: Increase STS_SAVE timeout in xhci_suspend() cbc5abaa6f30 xhci: Prevent deadlock when xhci adapter breaks during init fde058a17c18 usb: xhci: wait for CNR controller not ready bit in xhci resume 13e793da4f70 xhci: Fix USB 3.1 capability detection on early xHCI 1.1 spec based hosts d6bdd4686ffc xhci: Check all endpoints for LPM timeout faa0502a5be5 xhci: Prevent device initiated U1/U2 link pm if exit latency is too long 077855ba2df2 xhci: Fix false warning message about wrong bounce buffer write length 31604075ceb4 USB: usb-skeleton: fix NULL-deref on disconnect dcabc48fe0ac USB: usb-skeleton: fix runtime PM after driver unbind 571a14063619 USB: yurex: fix NULL-derefs on disconnect a8fe336f20b9 USB: yurex: Don't retry on unexpected errors 86575b7f636f USB: rio500: Remove Rio 500 kernel driver 95bcc0d980ae f2fs: use EINVAL for superblock with invalid magic 7d1688c6731b panic: ensure preemption is disabled during panic() dafd634415a7 Linux 4.19.79 1bd17a737c9e nl80211: validate beacon head 527ba5d7634b cfg80211: Use const more consistently in for_each_element macros ad180cace853 cfg80211: add and use strongly typed element iteration macros 3dab5ba6d7ae staging: erofs: detect potential multiref due to corrupted images 8b4341f9b80b staging: erofs: add two missing erofs_workgroup_put for corrupted images 596bbc4e0edf staging: erofs: some compressed cluster should be submitted for corrupted images e7c44410387c staging: erofs: fix an error handling in erofs_readdir() 1b94c1e80ca8 coresight: etm4x: Use explicit barriers on enable/disable effad578c23f vfs: Fix EOVERFLOW testing in put_compat_statfs64 d976344d27f7 arm64/speculation: Support 'mitigations=' cmdline option af33d746286c arm64: Use firmware to detect CPUs that are not affected by Spectre-v2 17d1acc4c61d arm64: Force SSBS on context switch fe22ea561ce0 arm64: ssbs: Don't treat CPUs with SSBS as unaffected by SSB dada3a4abb43 arm64: add sysfs vulnerability show for speculative store bypass f41df38898ec arm64: add sysfs vulnerability show for spectre-v2 9d1bb39cdd96 arm64: Always enable spectre-v2 vulnerability detection b1a33cfd8034 arm64: Advertise mitigation of Spectre-v2, or lack thereof 59a6dc262c85 arm64: Provide a command line to disable spectre_v2 mitigation c131623b1e9d arm64: Always enable ssb vulnerability detection 47a11f2eafcc arm64: enable generic CPU vulnerabilites support 512158d0c67e arm64: add sysfs vulnerability show for meltdown 047aac35fd1a arm64: Add sysfs vulnerability show for spectre-v1 edfc026626d6 arm64: fix SSBS sanitization 09c22781dd2c arm64: docs: Document SSBS HWCAP a59d42ac50a1 KVM: arm64: Set SCTLR_EL2.DSSBS if SSBD is forcefully disabled and !vhe 1eaff33e2441 arm64: ssbd: Add support for PSTATE.SSBS rather than trapping to EL3 d286a37471b6 riscv: Avoid interrupts being erroneously enabled in handle_exception() 5b67a4721ddd perf stat: Reset previous counts on repeat with interval 15c57bf9dcf8 perf tools: Fix segfault in cpu_cache_level__read() e5331c37c08b tick: broadcast-hrtimer: Fix a race in bc_set_next 140acbb09384 tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure d1e4b4cc3bba powerpc/book3s64/radix: Rename CPU_FTR_P9_TLBIE_BUG feature flag f5f31a6ea558 powerpc/pseries: Fix cpu_hotplug_lock acquisition in resize_hpt() c688982ffaeb nbd: fix crash when the blksize is zero 63bb8b76ed62 KVM: nVMX: Fix consistency check on injected exception error code 34b13ff69668 KVM: PPC: Book3S HV: XIVE: Free escalation interrupts before disabling the VP 1b155b4fe8b4 drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed 04e0c84f137d nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs 575a5bb3d372 perf unwind: Fix libunwind build failure on i386 systems b0aaf65bb16a kernel/elfcore.c: include proper prototypes bab46480e6f9 perf build: Add detection of java-11-openjdk-devel package 46ff0e2f869f sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr() 6cb7aa1b4f94 sched/membarrier: Fix private expedited registration check e250f2b6aa9e sched/membarrier: Call sync_core only before usermode for same mm 9f33b178cbb2 libnvdimm/nfit_test: Fix acpi_handle redefinition 7b4f541fcd1c fuse: fix memleak in cuse_channel_open 2e93d24ac75e libnvdimm/region: Initialize bad block for volatile namespaces 9025adf37ee8 thermal_hwmon: Sanitize thermal_zone type c01a9dbec18a thermal: Fix use-after-free when unregistering thermal zone device 55ebeb4e865d ntb: point to right memory window index 9dabade5c197 x86/purgatory: Disable the stackleak GCC plugin for the purgatory 65348659535d pwm: stm32-lp: Add check in case requested period cannot be achieved 19b1c70e911c pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors 1c70ae6a91f9 drm/amdgpu: Check for valid number of registers to read e0af3b19ad77 drm/amdgpu: Fix KFD-related kernel oops on Hawaii f7ace7f25214 netfilter: nf_tables: allow lookups in dynamic sets f217883bbc92 watchdog: aspeed: Add support for AST2600 520c2a64fc78 ceph: reconnect connection if session hang in opening state 0275113fc09a ceph: fix directories inode i_blkbits initialization 2bc2a90a083a xen/pci: reserve MCFG areas earlier 18dd2b05f349 9p: avoid attaching writeback_fid on mmap with type PRIVATE 07f3596ce344 9p: Transport error uninitialized 448deb13ab9e fs: nfs: Fix possible null-pointer dereferences in encode_attrs() 4753e7a824cb ima: fix freeing ongoing ahash_request b69c3085fcc6 ima: always return negative code for error 6df3c66de09d arm64: cpufeature: Detect SSBS and advertise to userspace 3a0e673305e2 cfg80211: initialize on-stack chandefs 16c75eb13a72 s390/cio: avoid calling strlen on null pointer 3f41e88f4bd4 ieee802154: atusb: fix use-after-free at disconnect 975859bb69b2 xen/xenbus: fix self-deadlock after killing user process e409b81d9ddb Revert "locking/pvqspinlock: Don't wait if vCPU is preempted" 7ed2867ceb41 mmc: sdhci-of-esdhc: set DMA snooping based on DMA coherence 4509a19d5082 mmc: sdhci: improve ADMA error reporting 873f49d6a4e8 drm/i915/gvt: update vgpu workload head pointer correctly 198bc7040c48 drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors 7a85c8673551 drm/msm/dsi: Fix return value check for clk_get_parent 0e45633f49ef drm/omap: fix max fclk divider for omap36xx 90ac4028739c perf stat: Fix a segmentation fault when using repeat forever 22f28afd3d77 watchdog: imx2_wdt: fix min() calculation in imx2_wdt_set_timeout e7cf8cc79f93 PCI: Restore Resizable BAR size bits correctly for 1MB BARs 956ce989c41f PCI: vmd: Fix shadow offsets to reflect spec changes 06f250215beb timer: Read jiffies once when forwarding base clk 12c6c4a50f66 usercopy: Avoid HIGHMEM pfn warning e010c9835183 tracing: Make sure variable reference alias has correct var_ref_idx 022ca58f109e power: supply: sbs-battery: only return health when battery present 5cb6dd823127 power: supply: sbs-battery: use correct flags field fb93ccde081e MIPS: Treat Loongson Extensions as ASEs a0dc60ac6bef crypto: ccree - use the full crypt length value f5c087a0d9a0 crypto: ccree - account for TEE not ready to report 561bf9309209 crypto: caam - fix concurrency issue in givencrypt descriptor 3683dd7074dc crypto: cavium/zip - Add missing single_release() cd8e0a5d94fb crypto: skcipher - Unmap pages after an external error 9349108ae499 crypto: qat - Silence smp_processor_id() warning 532920b26678 tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file 4aaea17d3c31 can: mcp251x: mcp251x_hw_reset(): allow more time after a reset 9124eac41a67 powerpc/book3s64/mm: Don't do tlbie fixup for some hardware revisions 19c12f12093e powerpc/powernv/ioda: Fix race in TCE level allocation 032ce7d766a9 powerpc/powernv: Restrict OPAL symbol map to only be readable by root ba3ca9fcb0e7 powerpc/mce: Schedule work from irq_work ee6eeeb88e79 powerpc/mce: Fix MCE handling for huge pages 1284f2073415 ASoC: sgtl5000: Improve VAG power and mute control 50090b75fa89 ASoC: Define a set of DAPM pre/post-up events 42b888f63333 PM / devfreq: tegra: Fix kHz to Hz conversion 9f0f39c92e4f nbd: fix max number of supported devs eff3a54aae68 KVM: nVMX: handle page fault in vmread fix 21874027e1de KVM: X86: Fix userspace set invalid CR4 30fbe0d380aa KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9 4faa7f05af75 KVM: PPC: Book3S HV: Check for MMU ready on piggybacked virtual cores 577a5119d7af KVM: PPC: Book3S HV: Fix race in re-enabling XIVE escalation interrupts 46cb14a57088 s390/cio: exclude subchannels with no parent from pseudo check 9aa823b3c0a6 s390/topology: avoid firing events before kobjs are created ddfef75f877b KVM: s390: Test for bad access register and size at the start of S390_MEM_OP 8b41a30f91db s390/process: avoid potential reading of freed stack Signed-off-by: Bruce Ashfield (cherry picked from commit e23a86fa40be2e1dfe50baeebe787e98f793cc5b) Signed-off-by: Armin Kuster (cherry picked from commit 8a36666265002805134cc3786c0e81bc709d8d10) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 8e36d9a..f588d7f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "0e4a79e608e92830693e511a3dd282ce7c3b3f41" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine ?= "f272b39688fbec016d91b5c0c9d1bb7b5bc3b2ca" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 2af7987..0f3b0d5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "be50001808f00efee538c2a3e7c0a5a2a2df65da" -SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine_qemuarm ?= "d971adf5221e18df3ba46bddee4719c85f98977a" +SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 73f1715..17620c7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "7fde51abcaf389193ce5d87ebfb8e8fb66a9271a" -SRCREV_machine_qemuarm64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemumips ?= "8ac68d42beb24b275ac0d2a54a0a2291970e5dde" -SRCREV_machine_qemuppc ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemux86 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemux86-64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemumips64 ?= "ea2cb8731306f734bf0227575e04cafac7dfade0" -SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine_qemuarm ?= "425023bd5cfe4f4f7b950c84f62861de600d4f6c" +SRCREV_machine_qemuarm64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemumips ?= "6273d88ca69ada3ae4684fc6301e39381f4cd3e4" +SRCREV_machine_qemuppc ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemux86 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemux86-64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemumips64 ?= "f9368853646be5ce9f122adb733cbf8225641e8c" +SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:28 +0000 Subject: [oe-commits] [openembedded-core] 07/14: linux-yocto/4.19: update to v4.19.87 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.737232328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit fca2e866289cec99eaf65db4038d5473a34b7b57 Author: Bruce Ashfield AuthorDate: Mon Dec 2 22:54:17 2019 -0500 linux-yocto/4.19: update to v4.19.87 Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: 174651bdf802 Linux 4.19.87 6938a9da7ff8 PM / devfreq: Fix kernel oops on governor module load 345712c95eec KVM: PPC: Book3S HV: Flush link stack on guest exit to host kernel 0a60d4bddc0b powerpc/book3s64: Fix link stack flush on context switch 19d98b4d55b0 powerpc/64s: support nospectre_v2 cmdline option b7e2a040d9fc staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error 4101916e9f08 USB: serial: option: add support for Foxconn T77W968 LTE modules 62aca6645c08 USB: serial: option: add support for DW5821e with eSIM support 3349ed266ae2 USB: serial: mos7840: fix remote wakeup abbda35d6a6e USB: serial: mos7720: fix remote wakeup 84743898d60b USB: serial: mos7840: add USB ID to support Moxa UPort 2210 356440a79b6b appledisplay: fix error handling in the scheduled work 0439d6b90187 USB: chaoskey: fix error case of a timeout a18675e5d5f7 usb-serial: cp201x: support Mark-10 digital force gauge 61f6a3fac394 usbip: Fix uninitialized symbol 'nents' in stub_recv_cmd_submit() 375b26a86481 usbip: tools: fix fd leakage in the function of read_attr_usbip_status e70448b92253 USBIP: add config dependency for SGL_ALLOC 5d0b56f6725d virtio_ring: fix return code on DMA mapping fails 78260a294c04 media: imon: invalid dereference in imon_touch_event 94a94b605916 media: cxusb: detect cxusb_ctrl_msg error in query 8b42c263ec1a media: b2c2-flexcop-usb: add sanity checking 56be9f1b8733 media: uvcvideo: Fix error path in control parsing failure 61e73cf57ed8 cpufreq: Add NULL checks to show() and store() methods of cpufreq f217cef919da media: usbvision: Fix races among open, close, and disconnect 467052f6ea5a media: vivid: Fix wrong locking that causes race conditions on streaming stop b73b28b1b2cb media: vivid: Set vid_cap_streaming and vid_out_streaming to true af8071f50f46 nfc: port100: handle command failure cleanly 3510fb7947d5 ALSA: usb-audio: Fix NULL dereference at parsing BADD 2819f4030f43 futex: Prevent robust futex exit race d3f8c58d701c y2038: futex: Move compat implementation into futex.c 344966da99c9 nbd: prevent memory leak ed7a3dde0aa2 x86/speculation: Fix redundant MDS mitigation message 0af5ae268e24 x86/speculation: Fix incorrect MDS/TAA mitigation status ed7312096a1f x86/insn: Fix awk regexp warnings 99b933bbc7b0 ARC: perf: Accommodate big-endian CPU e02f1448282b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary 046f0fcf7397 ocfs2: remove ocfs2_is_o2cb_active() 36bef080b55f net: phy: dp83867: increase SGMII autoneg timer duration 87997a7800a1 net: phy: dp83867: fix speed 10 in sgmii mode 5779cbc98369 mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() a268d985f089 md/raid10: prevent access of uninitialized resync_pages offset f8dc0350d32b ath9k_hw: fix uninitialized variable data f0cfe98332d6 ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 4ae7392ab6f4 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 03bf4876a593 Bluetooth: Fix invalid-free in bcsp_close() 006360ec33d9 mm/page_io.c: do not free shared swap slots 16a300fb1dbb cfg80211: call disconnect_wk when AP stops 2b3541ffdd05 ipv6: Fix handling of LLA with VRF and sockets bound to VRF 091ed093c9c8 mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock 896f7398152b i2c: uniphier-f: fix timeout error after reading 8 bytes 1efa17ab9cb8 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch 1b0f1b2dde06 nvme-pci: fix surprise removal 597a37d01b69 PCI: keystone: Use quirk to limit MRRS for K2G c0418c4a61aa pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD 0858006cda38 pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT 5efa36e7f04a pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL bad4da12b797 pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues c24fe7807320 cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces ee7d2473812b tools: bpftool: pass an argument to silence open_obj_pinned() 367e64ce11fc of: unittest: initialize args before calling of_*parse_*() e4547e028547 of: unittest: allow base devicetree to have symbol metadata 1303c938c953 net: bcmgenet: return correct value 'ret' from bcmgenet_power_down 1d6a0dd6aa53 ACPICA: Use %d for signed int print formatting instead of %u d15b8b691725 clk: tegra20: Turn EMC clock gate into divider 91c5f99d131e vrf: mark skb for multicast or link-local as enslaved to VRF 5c2a3997ae5b dlm: don't leak kernel pointer to userspace afb4717ab81b dlm: fix invalid free 30fc13ae88b2 usb: typec: tcpm: charge current handling for sink during hard reset 5e989b6cad68 scsi: lpfc: Correct loss of fc4 type on remote port address change a391709b636e scsi: lpfc: Fix odd recovery in duplicate FLOGIs in point-to-point 05678af01a33 scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces e6d0262e1628 scsi: megaraid_sas: Fix goto labels in error handling 83e679606e78 scsi: megaraid_sas: Fix msleep granularity ff997bf13c1e scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11 80224e3b08ff scsi: mpt3sas: Don't modify EEDPTagMode field setting on SAS3.5 HBA devices 5553e2bdcb02 scsi: mpt3sas: Fix Sync cache command failure during driver unload 5f2dc610eb28 net: dsa: bcm_sf2: Turn on PHY to allow successful registration 2ac94b9e902f rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information 13d434fed1a2 wireless: airo: potential buffer overflow in sprintf() fad934bb2e47 brcmsmac: never log "tid x is not agg'able" by default bdb61fa50b70 rtl8xxxu: Fix missing break in switch 06ed77066838 wlcore: Fix the return value in case of error in 'wlcore_vendor_cmd_smart_config_start()' c68a499448e1 ath10k: snoc: fix unbalanced clock error handling c262dc0655df wil6210: fix locking in wmi_call ccb2390e8933 wil6210: fix RGF_CAF_ICR address for Talyn-MB 0e1304ae42c2 wil6210: fix L2 RX status handling aa2112d57152 wil6210: fix debugfs memory access alignment ea136e61e4df btrfs: avoid link error with CONFIG_NO_AUTO_INLINE 4a035f2643c6 media: ov13858: Check for possible null pointer 3ee72f30c163 nds32: Fix bug in bitfield.h e6c6c0439a93 net: bpfilter: fix iptables failure if bpfilter_umh is disabled 811c8141d663 sock_diag: fix autoloading of the raw_diag module 3c69a033b416 audit: print empty EXECVE args 5dc441fbef91 soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL 9cdfff0a5e61 clk: sunxi-ng: enable so-said LDOs for A64 SoC's pll-mipi clock a2e6fe1f647f ARM: dts: imx6sx-sdb: Fix enet phy regulator 465073e44fda openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS 31bced01fe77 sched/fair: Don't increase sd->balance_interval on newidle balance ed023646c2cf sched/topology: Fix off by one bug f9fca78e6cf2 net: do not abort bulk send on BQL status 0d3b9ac2844f ocfs2: fix clusters leak in ocfs2_defrag_extent() 6c150df9c2e8 ocfs2: don't put and assigning null to bh allocated outside 6fd469d06eb8 ocfs2: don't use iocb when EIOCBQUEUED returns abc7968b86b1 ocfs2: without quota support, avoid calling quota recovery 6a2245d828e4 mm: handle no memcg case in memcg_kmem_charge() properly 08f07d9f5b17 tools/power turbosat: fix AMD APIC-id output b167fee4e45d arm64: makefile fix build of .i file in external module case fa7f1bce27c0 nvme-pci: fix conflicting p2p resource adds 0bbb8382db4c irq/matrix: Fix memory overallocation ad8298fccd70 ntb: intel: fix return value for ndev_vec_mask() 3bd4422af874 ntb_netdev: fix sleep time mismatch 8dbecf6c2f17 net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read 12eeb72afac2 net: hns3: bugfix for is_valid_csq_clean_head() e3345108409c net: hns3: bugfix for reporting unknown vector0 interrupt repeatly problem b0465d06d4c6 net: hns3: bugfix for buffer not free problem during resetting 3d9bc014c519 fm10k: ensure completer aborts are marked as non-fatal after a resume 2fed73906e97 igb: shorten maximum PHC timecounter update interval 3081ae5e378f powerpc/powernv: hold device_hotplug_lock when calling device_online() 17523d7a1cc8 mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock 02735d5987b9 mm/memory_hotplug: make add_memory() take the device_hotplug_lock 023c071f101c kernel/panic.c: do not append newline to the stack protector panic string 1914e5edd811 fs/hfs/extent.c: fix array out of bounds read of array extent a9f38975eb98 hfs: update timestamp on truncate() 0013adceb521 hfsplus: update timestamps on truncate() 38e7b916daa2 hfs: fix return value of hfs_get_block() 550da9ee35fd hfsplus: fix return value of hfsplus_get_block() 8687d57d247a hfs: prevent btree data loss on ENOSPC 0b54b59d8541 hfsplus: prevent btree data loss on ENOSPC 7beaf6105e2e hfs: fix BUG on bnode parent update 1df96949ebfb hfsplus: fix BUG on bnode parent update 08751e477f0e lib/bitmap.c: fix remaining space computation in bitmap_print_to_pagebuf 1d5834945945 linux/bitmap.h: fix type of nbits in bitmap_shift_right() 8deaaf77ce2e linux/bitmap.h: handle constant zero-size bitmaps correctly 30598425aecc mm/gup_benchmark.c: prevent integer overflow in ioctl 9663d294ae28 block: call rq_qos_exit() after queue is frozen a125df22d134 selftests/powerpc/cache_shape: Fix out-of-tree build 024cd793bbe1 selftests/powerpc/switch_endian: Fix out-of-tree build a4a660f7abd9 selftests/powerpc/signal: Fix out-of-tree build f74f406bbd0b selftests/powerpc/ptrace: Fix out-of-tree build 57aab8f0a33d powerpc/xmon: Relax frame size for clang 32d7474b7a08 ipv4/igmp: fix v1/v2 switchback timeout based on rfc3376, 8.12 691bd94c15b1 vfs: avoid problematic remapping requests into partial EOF block cdc45f204775 um: Make line/tty semantics use true write IRQ a17e3bbfb97c i2c: uniphier-f: fix race condition when IRQ is cleared a118403a5ecc i2c: uniphier-f: fix occasional timeout error 1466eae37a9f i2c: uniphier-f: make driver robust against concurrency 10807b374663 block: fix the DISCARD request merge b948d56951be macsec: let the administrator set UP state even if lowerdev is down f5bdad7106fc macsec: update operstate when lower device changes 4291e97c69f6 mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition ac1cad79bcad tools/testing/selftests/vm/gup_benchmark.c: fix 'write' flag usage 2d9d6c099eaf mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock bcba80f38a00 fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle() 99b3146b799a arm64: lib: use C string functions with KASAN enabled b84e965c7edb sparc64: Rework xchg() definition to avoid warnings. 4e4cad4365e0 powerpc/process: Fix flush_all_to_thread for SPE 54299e1cf379 bpf, btf: fix a missing check bug in btf_parse 8044e741eee4 bpf: devmap: fix wrong interface selection in notifier_call 7b557dbdc519 net: ethernet: cadence: fix socket buffer corruption problem 3681b901e94a thermal: rcar_thermal: Prevent hardware access during system suspend 436e610bf195 thermal: rcar_thermal: fix duplicate IRQ request 51aa1a10fbac selftests: fix warning: "_GNU_SOURCE" redefined c62be4108883 selftests: kvm: Fix -Wformat warnings 5802cb25de86 selftests: watchdog: Fix error message. 74685702363c selftests: watchdog: fix message when /dev/watchdog open fails 58ceffabad41 selftests/ftrace: Fix to test kprobe $comm arg only if available adcb6d9ff121 spi: uniphier: fix incorrect property items 6c2075f792c6 fs/cifs: fix uninitialised variable warnings c5621fbd6560 net: socionext: Stop PHY before resetting netsec 0a6fa6119ab1 mfd: max8997: Enale irq-wakeup unconditionally 5a04242e8c23 mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well dd72391c9a53 mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values 02c9ec11860f mfd: arizona: Correct calling of runtime_put_sync e79d230832d0 net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode 7c011435110f qlcnic: fix a return in qlcnic_dcb_get_capability() 321c40dce581 mISDN: Fix type of switch control variable in ctrl_teimanager 074af1668038 f2fs: spread f2fs_set_inode_flags() e7f81efae3b5 f2fs: fix to spread clear_cold_data() 733fddc34651 thermal: armada: fix a test in probe() bb925b9bece2 RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap 829aa617bf6e rtc: s35390a: Change buf's type to u8 in s35390a_init 8112f3d4ed03 ceph: only allow punch hole mode in fallocate 146fb4b0d4fe ceph: fix dentry leak in ceph_readdir_prepopulate 083757d84859 tools: bpftool: fix completion for "bpftool map update" 570c05378d97 selftests/bpf: fix return value comparison for tests in test_libbpf.sh 3173e226ca41 powerpc/64s/radix: Fix radix__flush_tlb_collapsed_pmd double flushing pmd b43c5287f6bc powerpc/mm/radix: Fix small page at boundary when splitting b499fa070ee4 powerpc/mm/radix: Fix overuse of small pages in splitting logic 434551e9fd44 powerpc/mm/radix: Fix off-by-one in split mapping logic ee35e01b0f08 powerpc/pseries: Export raw per-CPU VPA data via debugfs 9ed143cf730d scsi: hisi_sas: Fix NULL pointer dereference ff6618e06cb4 sparc: Fix parport build warnings. 3d02e3bb3cfe x86/intel_rdt: Prevent pseudo-locking from using stale pointers b6e44f743951 spi: omap2-mcspi: Set FIFO DMA trigger level to word length ad9a4e963c92 swiotlb: do not panic on mapping failures 9b572e8bc038 s390/perf: Return error when debug_register fails 641f1f798c80 atm: zatm: Fix empty body Clang warnings f9304c6277ed sunrpc: safely reallow resvport min/max inversion 7983dea8c368 SUNRPC: Fix a compile warning for cmpxchg64() a0ec7f6eabe8 selftests/bpf: fix file resource leak in load_kallsyms 56b8b1832122 dm raid: avoid bitmap with raid4/5/6 journal device 4de506d51177 sctp: use sk_wmem_queued to check for writable space 1f7f2a0666a3 usbip: tools: fix atoi() on non-null terminated string 283d9618e22b USB: misc: appledisplay: fix backlight update_status return code 80a23f70d546 PCI: vmd: Detach resources after stopping root bus b0f69ccfff3a macintosh/windfarm_smu_sat: Fix debug output 86f63146f886 ALSA: i2c/cs8427: Fix int to char conversion 46729b27706a PM / Domains: Deal with multiple states but no governor in genpd cf800f2b630b ACPI / scan: Create platform device for INT33FE ACPI nodes cb6a3096ec2f kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack f0f842a1a9f9 xfs: clear ail delwri queued bufs on unmount of shutdown fs bb64349b6f56 xfs: fix use-after-free race in xfs_buf_rele e0e8d83e4878 net: ena: Fix Kconfig dependency on X86 7ac437558e4a net: fix warning in af_unix 5e110ec2d924 net: dsa: mv88e6xxx: Fix 88E6141/6341 2500mbps SERDES speed 274726bcf5ba scsi: zorro_esp: Limit DMA transfers to 65535 bytes 1f13afca914f scsi: dc395x: fix DMA API usage in sg_update_list e95ec662b126 scsi: dc395x: fix dma API usage in srb_done 95655b10529d ASoC: tegra_sgtl5000: fix device_node refcounting f1f1002a9987 clk: at91: audio-pll: fix audio pmc type f15b802890bb clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk 6391dd5eb0ef PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks 305c262fb8ee nvme-pci: fix hot removal during error handling 4e4b97f59050 nvmet-fcloop: suppress a compiler warning 2f1e4e65ba41 nvmet: avoid integer overflow in the discard code 30ca1af49481 crypto: ccree - avoid implicit enum conversion 5bbeb4fcf39a scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param 06815ae5e27f scsi: bfa: Avoid implicit enum conversion in bfad_im_post_vendor_event f4bf2dc77826 scsi: isci: Change sci_controller_start_task's return type to sci_status 3a40068dc831 scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler 6288f52ed258 clk: tegra: Fixes for MBIST work around 5a487f40e717 KVM/x86: Fix invvpid and invept register operand size in 64-bit mode 7392aa08f8a4 KVM: nVMX: move check_vmentry_postreqs() call to nested_vmx_enter_non_root_mode() 9fe573d539a8 KVM: nVMX: reset cache/shadows when switching loaded VMCS cec14148c1a9 nfp: bpf: protect against mis-initializing atomic counters bfe01cddb81a scsi: ips: fix missing break in switch 073f454cc28c qed: Align local and global PTT to propagate through the APIs. 45f89cf0f329 amiflop: clean up on errors during setup 4043bc0f634b pwm: lpss: Only set update bit if we are actually changing the settings ad78a958663a pinctrl: sunxi: Fix a memory leak in 'sunxi_pinctrl_build_state()' fae3cf8874c3 RDMA/bnxt_re: Avoid resource leak in case the NQ registration fails b1bf1e424dcb RDMA/bnxt_re: Fix qp async event reporting 2f241e333f7b RDMA/bnxt_re: Avoid NULL check after accessing the pointer bbeeadb7bab4 scsi: hisi_sas: Free slot later in slot_complete_vx_hw() 628cae51693a scsi: hisi_sas: Fix the race between IO completion and timeout for SMP/internal IO d10b7dd14a37 scsi: hisi_sas: Feed back linkrate(max/min) when re-attached 92ac0e324974 m68k: fix command-line parsing when passed from u-boot 4ab1594e699e w1: IAD Register is yet readable trough iad sys file. Fix snprintf (%u for unsigned, count for max size). d11d985d0a82 misc: mic: fix a DMA pool free failure a2204a295554 gsmi: Fix bug in append_to_eventlog sysfs handler cc08097f2619 btrfs: handle error of get_old_root 1b49c453a564 btrfs: defrag: use btrfs_mod_outstanding_extents in cluster_pages_for_defrag 9325e8f4688c PCI: mediatek: Fix class type for MT7622 to PCI_CLASS_BRIDGE_PCI dfffae314a02 mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail e2c158f58522 mmc: mediatek: fill the actual clock for mmc debugfs e3fa491211c4 spi: sh-msiof: fix deferred probing 2cd0b70c55b0 cdrom: don't attempt to fiddle with cdo->capability 0c5c34c1aaf3 skd: fixup usage of legacy IO API 196b007ac0a6 ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem 17fbe3c91ad4 ath10k: set probe request oui during driver start 8111f99f7c44 brcmsmac: AP mode: update beacon when TIM changes 20e42ddf6c1d mt76x0: phy: fix restore phase in mt76x0_phy_recalibrate_after_assoc 8cb568162524 mt76: do not store aggregation sequence number for null-data frames b95998fb6c50 EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr() 97aab1a43a2f powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field bd2a7e53cd6e powerpc/eeh: Fix null deref for devices removed during EEH 16e4657a1d25 powerpc/boot: Disable vector instructions 5346c8403733 powerpc/boot: Fix opal console in boot wrapper 4505cff2ef4a powerpc: Fix signedness bug in update_flash_db() 93b943c0602f synclink_gt(): fix compat_ioctl() 8d67a4ecb473 pty: fix compat ioctls fa3fe5f442ab gfs2: Fix marking bitmaps non-full 26a4c6a562ce PCI: cadence: Write MSI data with 32bits ca71f9c8adc2 pinctrl: madera: Fix uninitialized variable bug in madera_mux_set_mux 4465a916eaa7 printk: fix integer overflow in setup_log_buf() 90d73768ddb6 printk: lock/unlock console only for new logbuf entries 8888689bd433 crypto: testmgr - fix sizeof() on COMP_BUF_SIZE 3757657af27e ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback 49a9643b5e8d mwifiex: Fix NL80211_TX_POWER_LIMITED e80e88ef6057 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() a0ee03bb5269 drm/i915/pmu: "Frequency" is reported as accumulated cycles 8a67fbf65971 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs e8d355befc42 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() b28da9da6e51 Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()" 67380639dfdb virtio_console: allocate inbufs in add_port() only if it is needed 65d153c8ed65 nbd:fix memory leak in nbd_get_socket() 036588ec6888 tools: gpio: Correctly add make dependencies for gpio_utils 7cb8ee734c18 gpio: max77620: Fixup debounce delays 70d594d17ebb vhost/vsock: split packets to send using multiple buffers 48bc34efbc65 net/mlx5: Fix auto group size calculation 28a4cc2b5d6f net/mlxfw: Verify FSM error code translation doesn't exceed array size 7c1a53817782 net/mlx5e: Fix set vf link state error flow 1ff2a0f8692f sfc: Only cancel the PPS workqueue if it exists 13512a5eb818 net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 2ba6a4f5402e net/sched: act_pedit: fix WARN() in the traffic path 9f6de5cf5390 net: rtnetlink: prevent underflows in do_setvfinfo() ebcb0840a76b net/mlx4_en: Fix wrong limitation for number of TX rings 5408138df1db net/mlx4_en: fix mlx4 ethtool -N insertion baa888ca02db mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel 14260788bbb9 Linux 4.19.86 2e1f151cd2d9 x86/resctrl: Fix rdt_find_domain() return value and checks d64b58520670 mmc: tmio: fix SCC error handling to avoid false positive CRC error e2a37708cfca powerpc/time: Fix clockevent_decrementer initalisation for PR KVM ff36ace6c107 tools: PCI: Fix broken pcitest compilation 4039b5dd0f67 PM / devfreq: Fix static checker warning in try_then_request_governor 903cfafe0874 ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate 6491a2d26c08 tcp: start receiver buffer autotuning sooner ef0811ef95ea ARM: dts: omap5: Fix dual-role mode on Super-Speed port 183f9ae8c4d2 mlxsw: spectrum_switchdev: Check notification relevance based on upper device 16ad1c43196a spi: rockchip: initialize dma_slave_config properly f28abe5a3695 mac80211: minstrel: fix sampling/reporting of CCK rates in HT mode 83ea4ccdb9eb mac80211: minstrel: fix CCK rate group streams value 8bbedf4dffe9 mac80211: minstrel: fix using short preamble CCK rates on HT clients 5d017065cec9 misc: cxl: Fix possible null pointer dereference 9089b2f0049e netfilter: nft_compat: do not dump private area e6c540bf9786 net: sched: avoid writing on noop_qdisc b80939a47413 selftests: forwarding: Have lldpad_app_wait_set() wait for unknown, too a119952d4be6 hwmon: (npcm-750-pwm-fan) Change initial pwm target to 255 4bbc8deedd89 hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros 5bdad12ab211 hwmon: (pwm-fan) Silence error on probe deferral 0cb6525b75e1 hwmon: (nct6775) Fix names of DIMM temperature sources a58d5770493c hwmon: (k10temp) Support all Family 15h Model 6xh and Model 7xh processors 1301b861cf50 scsi: arcmsr: clean up clang warning on extraneous parentheses b0c75ea8d372 pinctrl: gemini: Fix up TVC clock group 2a6c8fc0af64 orangefs: rate limit the client not running info message 336793832f26 x86/mm: Do not warn about PCI BIOS W+X mappings 1eeb7407d233 ARM: 8802/1: Call syscall_trace_exit even when system call skipped e616dd603c29 spi: spidev: Fix OF tree warning logic 4fabd2e530ab pinctrl: gemini: Mask and set properly 8aa36b8a7684 spi: fsl-lpspi: Prevent FIFO under/overrun by default 07ed61a0a711 gpio: syscon: Fix possible NULL ptr usage 312de5a09d10 net: fix generic XDP to handle if eth header was mangled 014045888a74 bpf: btf: Fix a missing check bug 85f996c36e15 x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error 3f4f4c639f29 lightnvm: pblk: consider max hw sectors supported for max_write_pgs d4ab0df8d5dd lightnvm: pblk: fix error handling of pblk_lines_init() cdf73455471a lightnvm: do no update csecs and sos on 1.2 1fb60da4d736 lightnvm: pblk: guarantee mw_cunits on read buffer 1e9796622bc7 lightnvm: pblk: fix write amplificiation calculation d56fe8f59a23 lightnvm: pblk: guarantee emeta on line close c7e49f73152f lightnvm: pblk: fix incorrect min_write_pgs ced6b5dae1dc lightnvm: pblk: fix rqd.error return value in pblk_blk_erase_sync e99956093f70 ALSA: hda/ca0132 - Fix input effect controls for desktop cards 9c30ea2dda5d media: venus: vdec: fix decoded data size 5b388c45c3e5 media: cx231xx: fix potential sign-extension overflow on large shift 4d7cf69b77ce GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads 1adde6589b4a media: isif: fix a NULL pointer dereference bug 3404019d6d0f printk: Give error on attempt to set log buffer length to over 2G b2d6db3e572a mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable b0c6a78a8a5a backlight: lm3639: Unconditionally call led_classdev_unregister 94764e3ae569 proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted() e78c55ad6657 s390/kasan: avoid user access code instrumentation ef5ad4f11e74 s390/kasan: avoid instrumentation of early C code 5228d07c4f92 s390/kasan: avoid vdso instrumentation 0046af383099 mmc: mmci: expand startbiterr to irqmask and error check 322f530fd959 x86/intel_rdt: CBM overlap should also check for overlap with CDP peer 36cf91317ca9 x86/intel_rdt: Introduce utility to obtain CDP peer f9a2a8b8a5d4 mtd: devices: m25p80: Make sure WRITE_EN is issued before each write 6664533b4fc1 mtd: spi-nor: cadence-quadspi: Use proper enum for dma_[un]map_single 370dbbc7b5cb media: cx18: Don't check for address of video_dev 76765353043b media: dw9807-vcm: Fix probe error handling 96134bbea649 media: dw9714: Fix error handling in probe function 2103ebde9ac0 platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items 04d38fa8436b bcache: recal cached_dev_sectors on detach 65910055b560 bcache: account size of buckets used in uuid write to ca->meta_sectors_written 16c2d36b1123 reset: Fix potential use-after-free in __of_reset_control_get() 84b787e35482 fbdev: fix broken menu dependencies 21bb43c0dd86 fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() e57ba9db8c5f fbdev: sbuslib: use checked version of put_user() 964cd867ef63 atmel_lcdfb: support native-mode display-timings a3a76b5d22f0 mmc: renesas_sdhi_internal_dmac: set scatter/gather max segment size e8853ef02e2d mmc: tmio: Fix SCC error detection 01395b5f089b mmc: renesas_sdhi_internal_dmac: Whitelist r8a774a1 500c933055e7 x86/fsgsbase/64: Fix ptrace() to read the FS/GS base accurately b17ddbdc6035 xsk: proper AF_XDP socket teardown ordering 29fda86178fe iwlwifi: mvm: don't send keys when entering D3 d43b7b99fe77 ACPI / SBS: Fix rare oops when removing modules 7f02606367b3 xfrm: use correct size to initialise sp->ovec 6b9c4eddb3be crypto: mxs-dcp - Fix AES issues 70ecd0459d03 crypto: mxs-dcp - Fix SHA null hashes and output length fef30612e23c dmaengine: rcar-dmac: set scatter/gather max segment size af23231acaf6 x86/olpc: Fix build error with CONFIG_MFD_CS5535=m 624cd074631a kexec: Allocate decrypted control pages for kdump if SME is enabled 59e5269c692e remoteproc: qcom: q6v5: Fix a race condition on fatal crash 4b8c7bce49ca remoteproc: Check for NULL firmwares in sysfs interface e4aecc15d7c4 tc-testing: fix build of eBPF programs d653bd939cb1 net: hns3: Fix for rx vlan id handle to support Rev 0x21 hardware 3bef7420e129 soc: fsl: bman_portals: defer probe after bman's probe 090122baa262 Input: silead - try firmware reload after unsuccessful resume c13b00c39464 Input: st1232 - set INPUT_PROP_DIRECT property 205ae6b06288 i2c: zx2967: use core to detect 'no zero length' quirk 1698ed9f0e2f i2c: tegra: use core to detect 'no zero length' quirk d511166558a4 i2c: qup: use core to detect 'no zero length' quirk e0d9c58c49e6 i2c: omap: use core to detect 'no zero length' quirk f3afad5d1eff gfs2: slow the deluge of io error messages 35c8125cbea4 media: cec-gpio: select correct Signal Free Time 58d0a3dbad2b media: ov5640: fix framerate update 47dd538e9c44 dmaengine: ioat: fix prototype of ioat_enumerate_channels 90d73c1cadb8 NFSv4.x: fix lock recovery during delegation recall 799c98cba071 printk: Correct wrong casting e7ff1141b60c i2c: brcmstb: Allow enabling the driver on DSL SoCs 8b3e444fe8d0 clk: samsung: Use clk_hw API for calling clk framework from clk notifiers 599d5350f123 clk: samsung: exynos5420: Define CLK_SECKEY gate clock only or Exynos5420 06da39429640 clk: samsung: Use NOIRQ stage for Exynos5433 clocks suspend/resume fe46630cd2a1 qtnfmac: drop error reports for out-of-bounds key indexes 4ecc631d975c qtnfmac: inform wireless core about supported extended capabilities 28d5342b2ae4 qtnfmac: pass sgi rate info flag to wireless core 5554e47a2946 qtnfmac: request userspace to do OBSS scanning if FW can not 75a1e8dec421 brcmfmac: fix full timeout waiting for action frame on-channel tx c01258a2ad7d brcmfmac: reduce timeout for action frame scan 89cf2472a295 cpu/SMT: State SMT is disabled even with nosmt and without "=force" 8fce141f4805 mtd: physmap_of: Release resources on error d46cd42b4ffa usb: dwc2: disable power_down on rockchip devices 3ad0531dbe0c USB: serial: cypress_m8: fix interrupt-out transfer length 24ce099a5388 KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR 8b6021ca47a3 bnxt_en: return proper error when FW returns HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED 6e454b0ad02d ALSA: hda/sigmatel - Disable automute for Elo VuPoint 6925a5afc148 media: i2c: adv748x: Support probing a single output a02bad04d110 media: rcar-vin: fix redeclaration of symbol 14dc7aeef3f4 media: pxa_camera: Fix check for pdev->dev.of_node 7672ca60a14a media: rc: ir-rc6-decoder: enable toggle bit for Kathrein RCU-676 remote 01e9e39f4f61 qed: Avoid implicit enum conversion in qed_ooo_submit_tx_buffers d1dff747758f ata: ep93xx: Use proper enums for directions 6a70c66a84e0 powerpc/64s/radix: Explicitly flush ERAT with local LPID invalidation 9e4649e443e2 powerpc/time: Use clockevents_register_device(), fixing an issue with large decrementer d7e546d06182 ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR() 27ab8f1648ac cpuidle: menu: Fix wakeup statistics updates for polling state 38ad2aa9331b ACPICA: Never run _REG on system_memory and system_IO 216929d15b2c OPP: Return error on error from dev_pm_opp_get_opp_count() 3d0c72f99efc msm/gpu/a6xx: Force of_dma_configure to setup DMA for GMU 674b223d7a48 rpmsg: glink: smem: Support rx peak for size less than 4 bytes ec9fc981de57 IB/mlx4: Avoid implicit enumerated type conversion d5d78049b7a4 RDMA/hns: Limit the size of extend sge of sq 010af7a8d0ae RDMA/hns: Bugfix for CM test 5b7064adfb4b RDMA/hns: Submit bad wr when post send wr exception af76265532a8 RDMA/hns: Bugfix for reserved qp number 350703fae672 IB/rxe: avoid srq memory leak e3db306d1fda IB/mthca: Fix error return code in __mthca_init_one() 1b86b8ad6e47 ixgbe: Fix crash with VFs and flow director on interface flap 0e1fd69cff75 i40e: Use proper enum in i40e_ndo_set_vf_link_state 22b8d7e3bcb5 ixgbe: Fix ixgbe TX hangs with XDP_TX beyond queue limit b69cfc4f2665 md: allow metadata updates while suspending an array - fix 4aa110048087 ice: Fix forward to queue group logic d97a02b84879 clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines 31fb5ea6ed1b clocksource/drivers/sh_cmt: Fixup for 64-bit machines 0e8855ba9f9a tools: PCI: Fix compilation warnings 9372023e10ee PM / hibernate: Check the success of generating md5 digest before hibernation ed896ddfae94 mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer 83cda9ea1876 ARM: dts: at91: sama5d2_ptc_ek: fix bootloader env offsets 10551e574d79 ARM: dts: at91: at91sam9x5cm: fix addressable nand flash size 825d176a1049 ARM: dts: at91: sama5d4_xplained: fix addressable nand flash size ab9928588283 powerpc/xive: Move a dereference below a NULL test 38d7fa28157e powerpc/pseries: Fix how we iterate over the DTL entries a3576a228404 powerpc/pseries: Fix DTL buffer registration b28aa87d081c cxgb4: Use proper enum in IEEE_FAUX_SYNC efdacf2b7aa7 cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update 743ccf759e8e mei: samples: fix a signedness bug in amt_host_if_call() cc7d996a4428 x86/PCI: Apply VMD's AERSID fixup generically 6cedfaffb4ac sunrpc: Fix connect metrics 7e4602eac666 clk: keystone: Enable TISCI clocks if K3_ARCH 6c487c0e877a ext4: fix build error when DX_DEBUG is defined f2877a3c332d ALSA: hda: Fix mismatch for register mask and value in ext controller. ae3765a0a33d dmaengine: timb_dma: Use proper enum in td_prep_slave_sg 0c21aa9b5651 dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction 671ce9f892b9 printk: CON_PRINTBUFFER console registration is a bit racy cd120df118d7 printk: Do not miss new messages when replaying the log 5a6f7274e67b KVM: PPC: Inform the userspace about TCE update failures 38374aa3c916 watchdog: w83627hf_wdt: Support NCT6796D, NCT6797D, NCT6798D 96505abd2435 watchdog: sama5d4: fix timeout-sec usage 26d6e542dc47 watchdog: renesas_wdt: stop when unregistering f4cfb7eeae62 watchdog: core: fix null pointer dereference when releasing cdev a9f36455edc1 irqchip/irq-mvebu-icu: Fix wrong private data retrieval be4f5457a5fd nl80211: Fix a GET_KEY reply attribute 21ba66937e0d usb: dwc3: gadget: Check ENBLSLPM before sending ep command 639fce0bc8b5 usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status() f22a4d8cf049 selftests/tls: Fix recv(MSG_PEEK) & splice() test cases 475398b72984 ath9k: fix reporting calculated new FFT upper max f6ec4fccbf9a PM / devfreq: stopping the governor before device_unregister() fc491a1e77be PM / devfreq: Fix handling of min/max_freq == 0 b5add975c871 PM / devfreq: Fix devfreq_add_device() when drivers are built as modules. 5f5a8d36749f ata: ahci_brcm: Allow using driver or DSL SoCs 4cfcb5379a9c rtlwifi: btcoex: Use proper enumerated types for Wi-Fi only interface e5895e41aeb3 ath10k: fix vdev-start timeout on error 06cb99e6399d arm64/numa: Report correct memblock range for the dummy node 256a29480733 kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table bae080e72e92 iommu/arm-smmu-v3: Fix unexpected CMD_SYNC timeout 2bab3df8f506 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap() 741a445a88e4 mt76: fix handling ps-poll frames ddb4299f1d78 mt76x2: disable WLAN core before probe b14825a5c652 mt76x2: fix tx power configuration for VHT mcs 9 449b9ae3504c IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds e0dee1c839e3 IB/hfi1: Error path MAD response size is incorrect 8d93707e7195 f2fs: keep lazytime on remount a5f7bf0379d3 ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq aa39d53f2b89 ACPI / LPSS: Make acpi_lpss_find_device() also find PCI devices 9372a40b54d0 SUNRPC: Fix priority queue fairness 43876b1ce42b tcp: up initial rmem to 128KB and SYN rwin to around 64KB d2cacb6ac4ff ARM: dts: sun8i: h3: bpi-m2-plus: Fix address for external RGMII Ethernet PHY ed220d3dcc79 ARM: dts: sun8i: h3-h5: ir register size should be the whole memory block ac02379889e2 f2fs: return correct errno in f2fs_gc 7cbac9d598a7 net: hns3: Fix loss of coal configuration while doing reset af98283da9e9 net: hns3: Fix for netdev not up problem when setting mtu 7a1f314e3c80 ARM: dts: omap5: enable OTG role for DWC3 controller 789d29044793 ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode 6d286faeee74 net: xen-netback: fix return type of ndo_start_xmit function c234566f1ea0 net: ovs: fix return type of ndo_start_xmit function d51d9605888d bpf, x32: Fix bug for BPF_JMP | {BPF_JSGT, BPF_JSLE, BPF_JSLT, BPF_JSGE} f3c40792cf4b bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_K shift by 0 a085f797449e bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_X shift by 0 860a7d18b9e6 bpf, x32: Fix bug for BPF_ALU64 | BPF_NEG 03543b9c5573 fbdev: Ditch fb_edid_add_monspecs 703662598b9c arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault f8b09a043685 mm/memory_hotplug: fix updating the node span 6631def3ee38 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() a16a3669273b idr: Fix idr_get_next race with idr_remove 4c62337d8f17 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size() 17a82bc67728 Revert "OPP: Protect dev_list with opp_table lock" 4f4ab0b49cf2 tee: optee: add missing of_node_put after of_device_is_available 2008d0e3d364 i2c: mediatek: modify threshold passed to i2c_get_dma_safe_msg_buf() 976e944e005f spi: mediatek: use correct mata->xfer_len when in fifo transfer c63ee2939dc1 Linux 4.19.85 e99d64837815 slcan: Fix memory leak in error path e4cc9c81e230 memfd: Use radix_tree_deref_slot_protected to avoid the warning. 914834a73b16 net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused 2ed924f2782f s390/vdso: correct vdso mapping for compat tasks 1b904b2eb9c1 media: ov2680: fix null dereference at power on 0c3e32230bcc IB/iser: Fix possible NULL deref at iser_inv_desc() d7b412e1448e fuse: use READ_ONCE on congestion_threshold and max_background 2e72489c822e usb: usbtmc: uninitialized symbol 'actual' in usbtmc_ioctl_clear eb9b6c203870 usb: xhci-mtk: fix ISOC error when interval is zero 8ddec6aaad86 netfilter: masquerade: don't flush all conntracks if only one address deleted on device ba8c4cc746a5 rtc: armada38x: fix possible race condition 44bb1b1256b5 rtc: tx4939: fixup nvmem name and register size e7ab2bab7e60 rtc: isl1208: avoid possible sysfs race 70f0ead5c6af ARM: dts: lpc32xx: Fix SPI controller node names 8e359bce724c arm64: dts: lg: Fix SPI controller node names f52a34b5b111 arm64: dts: amd: Fix SPI bus warnings b26edaa53496 scsi: NCR5380: Check for bus reset 080b37aacd2b scsi: NCR5380: Handle BUS FREE during reselection aa45f4ab86a2 scsi: NCR5380: Don't call dsprintk() following reselection interrupt 23635cf271a3 scsi: NCR5380: Don't clear busy flag when abort fails aeb0ed2e5bb9 scsi: NCR5380: Check for invalid reselection target 98c6d8f8a401 scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data 1a46e4d3da31 scsi: NCR5380: Withhold disconnect privilege for REQUEST SENSE 624f60251f1a scsi: NCR5380: Have NCR5380_select() return a bool 873506e566ef scsi: NCR5380: Clear all unissued commands on host reset fe5ef5fe3e19 iwlwifi: mvm: Allow TKIP for AP mode c4a3dcb0a273 iwlwifi: mvm: use correct FIFO length d395b6f51cf7 iwlwifi: pcie: fit reclaim msg to MAX_MSG_LEN 08d2000d2162 iwlwifi: pcie: gen2: build A-MSDU only for GSO f4f0909f3d3f iwlwifi: api: annotate compressed BA notif array sizes e455ecaf52da iwlwifi: pcie: read correct prph address for newer devices c5eafde04ad3 iwlwifi: fix non_shared_ant for 22000 devices f73c75560ffd iwlwifi: dbg: don't crash if the firmware crashes in the middle of a debug dump 98ca4f397feb crypto: fix a memory leak in rsa-kcs1pad's encryption mode 975b3c8dd182 crypto: s5p-sss: Fix Fix argument list alignment ef089d9b58a7 crypto: s5p-sss: Fix race in error handling d34465e722e7 x86/hyperv: Suppress "PCI: Fatal: No config space access function found" 23a4059cd6b8 Bluetooth: btrsi: fix bt tx timeout issue 245b2765e87c Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS 2c8946462f07 Bluetooth: hci_serdev: clear HCI_UART_PROTO_READY to avoid closing proto races f416fe070ec1 firmware: dell_rbu: Make payload memory uncachable 5d3675e3e6d1 ARM: dts: realview: Fix SPI controller node names 57b78e41a397 EDAC: Raise the maximum number of memory controllers 352668d32cd5 RDMA: Fix dependencies for rdma_user_mmap_io 36ffc9a76df9 f2fs: mark inode dirty explicitly in recover_inode() a4bd303d6774 f2fs: fix to recover inode's project id during POR 7bae8b6b73e4 f2fs: update i_size after DIO completion 9de276a804c7 PCI/ERR: Run error recovery callbacks for all affected devices 8738fd312e63 net: faraday: fix return type of ndo_start_xmit function 8ff333f3f819 net: smsc: fix return type of ndo_start_xmit function 4481669a3a95 ARM: dts: paz00: fix wakeup gpio keycode 4e9cf62e8ffb ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity 63c28c08e485 ARM: tegra: apalis_t30: fix mcp2515 can controller interrupt polarity 2241b82d7b3f ARM: tegra: apalis_t30: fix mmc1 cmd pull-up 1717eca134f2 ARM: dts: tegra20: restore address order 619f46726e66 ARM: dts: tegra30: fix xcvr-setup-use-fuses 70c4b0fb4fd5 arm64: tegra: I2C on Tegra194 is not compatible with Tegra114 e821b710b58d ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string a09b6731c4dd arm64: dts: fsl: Fix I2C and SPI bus warnings 2d6b885ba741 phy: lantiq: Fix compile warning 6fce50c100c8 f2fs: fix remount problem of option io_bits c4a33c4ecc1f scsi: libsas: always unregister the old device if going to discover new 2f9d0f703b9c iw_cxgb4: Use proper enumerated type in c4iw_bar2_addrs 1ae5bfee6cff vfio/pci: Mask buggy SR-IOV VF INTx support dde3433de9a0 vfio/pci: Fix potential memory leak in vfio_msi_cap_len 86f886e91dcf vmbus: keep pointer to ring buffer page 728a7552dc49 misc: genwqe: should return proper error value. 6707b1ba53be misc: kgdbts: Fix restrict error 890bee675729 silmbus: ngd: register controller after power up. 932980ed5b77 slimbus: ngd: return proper error code instead of zero 9874abd5c878 slimbus: ngd: register ngd driver only once. 614744f4e80e coresight: dynamic-replicator: Handle multiple connections 36aa9cd28c59 coresight: tmc: Fix byte-address alignment for RRP 0bb87d413aef coresight: etm4x: Configure EL2 exception level when kernel is running in HYP a0e0ec0a5544 coresight: tmc-etr: Handle driver mode specific ETR buffers 1099665125ed coresight: perf: Disable trace path upon source error 87e382c3f706 coresight: perf: Fix per cpu path management 25deeb3c1b9f coresight: Fix handling of sinks 59a488998caf coresight: Use ERR_CAST instead of ERR_PTR 240293e02123 usb: gadget: uvc: Only halt video streaming endpoint in bulk mode bb7c36e91d45 usb: gadget: uvc: Factor out video USB request queueing c4635c27d3ac ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point a9c11660389c phy: phy-twl4030-usb: fix denied runtime access 6e176dd0e4c2 phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs f0525581df5f phy: brcm-sata: allow PHY_BRCM_SATA driver to be built for DSL SoCs ff0eabfaf4a4 ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws 1b23c28d87e7 gpiolib: Fix gpio_direction_* for single direction GPIOs ec0b30347e4a i2c: aspeed: fix invalid clock parameters for very large divisors de2875336ee8 ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks 4e6c65624090 usb: gadget: uvc: configfs: Sort frame intervals upon writing d036103870c6 usb: gadget: uvc: configfs: Prevent format changes after linking header e6e1ad1e2537 usb: gadget: uvc: configfs: Drop leaked references to config items b7ffda42d720 ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock 0b08daf034cc media: davinci: Fix implicit enum conversion warning 0994d0cb86ec media: au0828: Fix incorrect error messages 0e63f5db54d8 media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init() 2dacea472335 media: imx: work around false-positive warning, again 1b73ea8377da mlxsw: Make MLXSW_SP1_FWREV_MINOR a hard requirement 9d2ce0611ad5 arm64: dts: rockchip: Fix microSD in rk3399 sapphire board 46a9bbe9d579 MIPS: kexec: Relax memory restriction 3b9528b302a6 EDAC: Correct DIMM capacity unit symbol e897dd4cfdde x86/CPU: Change query logic so CPUID is enabled before testing d26ad73be70f x86/CPU: Use correct macros for Cyrix calls fd3f592b2af6 net: freescale: fix return type of ndo_start_xmit function cab175f881c5 net: micrel: fix return type of ndo_start_xmit function 590ee2e0aec7 net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider 73cb54858021 samples/bpf: fix compilation failure 3536c05af6f4 PCI/ERR: Use slot reset if available 0729c5944eee PCI/AER: Don't read upstream ports below fatal errors f3f55d83ea0d PCI/AER: Take reference on error devices 40ebd8b31fea bnx2x: Ignore bandwidth attention in single function mode 0769f445afa4 ARM: dts: stm32: Fix SPI controller node names c6305dfb214b ARM: dts: clearfog: fix sdhci supply property name b939d8b914d8 ARM: dts: stm32: enable display on stm32mp157c-ev1 board 098e12f385f9 x86/mce-inject: Reset injection struct after injection aa190837bec5 ARM: dts: marvell: Fix SPI and I2C bus warnings ccc8bf41dac8 crypto: arm/crc32 - avoid warning when compiling with Clang 9e70da12d01f cpufeature: avoid warning when compiling with clang ad28c2ba4318 crypto: chacha20 - Fix chacha20_block() keystream alignment (again) af4749d23d46 spi: pic32: Use proper enum in dmaengine_prep_slave_rg c2f76a19fbc8 ARM: dts: ste: Fix SPI controller node names 4d22878d5894 ARM: dts: ux500: Fix LCDA clock line muxing 8be4d596d3f2 ARM: dts: ux500: Correct SCU unit address dfc81686a642 f2fs: fix to recover inode's uid/gid during POR c783946ea9b1 f2fs: avoid infinite loop in f2fs_alloc_nid caab324d1b01 ARM: dts: ti: Fix SPI and I2C bus warnings 2cf6352a6d4c ARM: dts: am335x-evm: fix number of cpsw 1eeee2fd2e0c PCI: portdrv: Initialize service drivers directly 38bee3f3f280 mlxsw: spectrum: Init shaper for TCs 8..15 636cbdec5cf4 brcmsmac: Use kvmalloc() for ucode allocations 2980b6a81378 brcmfmac: increase buffer for obtaining firmware capabilities 59d6e59f32cc s390/vdso: correct CFI annotations of vDSO functions 84bfa03445bc s390/vdso: avoid 64-bit vdso mapping for compat tasks 3d510bdf35c2 s390/zcrypt: enable AP bus scan without a valid default domain 5e9923e85e1c usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_OUT 92aeb3756c43 usb: chipidea: Fix otg event handler 979f541851d9 usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started b39e733da3f8 nfp: provide a better warning when ring allocation fails 883843b5a912 net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg() a1b2c39f3ec7 net: hns3: Fix client initialize state issue when roce client initialize failed 20f2b72faff0 net: hns3: Clear client pointer when initialize client failed or unintialize finished ae95237256de net: hns3: Fix cmdq registers initialization issue for vf 110de23fc502 net: hns3: Fix for setting speed for phy failed problem bd23121daecf net: sun: fix return type of ndo_start_xmit function 5d52c10c345d net: amd: fix return type of ndo_start_xmit function 0cd3edaf82e6 net: broadcom: fix return type of ndo_start_xmit function 63a0e0512dba net: xilinx: fix return type of ndo_start_xmit function df9f5c799d85 net: toshiba: fix return type of ndo_start_xmit function e50d7274104c net: marvell: fix return type of ndo_start_xmit function 28fae2d588be net: mvpp2: fix the number of queues per cpu for PPv2.2 0ede78b3576c power: supply: twl4030_charger: disable eoc interrupt on linear charge 773fb69e4307 power: supply: twl4030_charger: fix charging current out-of-bounds 0729f87b840a libfdt: Ensure INT_MAX is defined in libfdt_env.h e000de3f01c5 of/unittest: Fix I2C bus unit-address error 4c64ce947cfa OPP: Protect dev_list with opp_table lock 51e509caf5fa ARM: dts: atmel: Fix I2C and SPI bus warnings 7cfb3b04d096 RDMA/i40iw: Fix incorrect iterator type eb355ccfdf1d powerpc: Fix duplicate const clang warning in user access code e7b37640916f powerpc/pseries: Disable CPU hotplug across migrations 9271304c26fc powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request 0ab2545aa404 powerpc/64s/hash: Fix stab_rr off by one initialization a3581509e890 selftests/powerpc: Do not fail with reschedule 089b169ceb80 powerpc/iommu: Avoid derefence before pointer check 13d5bc50f405 net: ibm: fix return type of ndo_start_xmit function efe22c12087d net: cavium: fix return type of ndo_start_xmit function 279a4f77546a net: hns3: fix return type of ndo_start_xmit function dd4b87a945c1 ipmi: fix return value of ipmi_set_my_LUN ea944c71360f ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address 438bf726def0 ipmi_si: fix potential integer overflow on large shift 78538bae1dab ipmi_si_pci: fix NULL device in ipmi_si error message 5ab64c1633f6 ASoC: rt5682: Fix the boost volume at the begining of playback 6237e9d0715a spi: mediatek: Don't modify spi_transfer when transfer. 779c96ef3fac spi/bcm63xx-hsspi: keep pll clk enabled eaa4d5ac4403 samples/bpf: fix a compilation failure feb52253d738 arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2 1ea4603cc812 tty: serial: qcom_geni_serial: Fix serial when not used as console 87153f7a04c9 serial: mxs-auart: Fix potential infinite loop 400caa3d02ea serial: samsung: Enable baud clock for UART reset procedure in resume 30cfa3ebc0ed serial: uartps: Fix suspend functionality bad4e6d3d40d ARM: dts: xilinx: Fix I2C and SPI bus warnings d15e5038213e PCI: mediatek: Fix unchecked return value 80ec7fcb04a0 net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset() 176f6203a4f4 PCI/ACPI: Correct error message for ASPM disabling 525552a0e849 media: ov2680: don't register the v4l2 subdevice before checking chip ID f4683c89808f media: vsp1: Fix YCbCr planar formats pitch calculation ee5a1460f271 media: vsp1: Fix vsp1_regs.h license header 2d7578285958 s390/qeth: invoke softirqs after napi_schedule() 66fb291b264d s390/qeth: uninstall IRQ handler on device removal ccc1e600844d ath9k: Fix a locking bug in ath9k_add_interface() e97d09277b77 netfilter: nf_tables: avoid BUG_ON usage d1440f1a38eb ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask 75fd1aec33c6 arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou 5fc9af407fc5 ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 0592c2178e3c scsi: ufshcd: Fix NULL pointer dereference for in ufshcd_init 6745591c8da9 ip_gre: fix parsing gre header in ipgre_err ada2a0f1ac54 kernfs: Fix range checks in kernfs_get_target_path 5fba81510697 component: fix loop condition to call unbind() if bind() fails 925c19a8c6bb power: supply: max8998-charger: Fix platform data retrieval 82d8a34470e9 power: reset: at91-poweroff: do not procede if at91_shdwc is allocated 1fb3d279a384 power: supply: ab8500_fg: silence uninitialized variable warnings c9398259cf85 arm64: dts: meson: Fix erroneous SPI bus warnings 89f4d27c1bcd blok, bfq: do not plug I/O if all queues are weight-raised 6c9a79651bff block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash 6d7757f04866 arm64: fix for bad_mode() handler to always result in panic 7f49a2210e85 cxgb4: Fix endianness issue in t4_fwcache() b0cb2d8164d0 android: binder: no outgoing transaction when thread todo has transaction 31e470f92d9e ARM: dts: sun9i: Fix I2C bus warnings 0989aa65bc37 pinctrl: at91: don't use the same irqchip with multiple gpiochips d1b9d321df35 ARM: dts: sunxi: Fix I2C bus warnings 8ac08053744c ARM: dts: socfpga: Fix I2C bus unit-address error e70ccd8a13a9 powerpc/vdso: Correct call frame information 11d7842812f8 ARM: dts: aspeed: Fix I2C bus warnings 5a8130ed237f ARM: dts: bcm: Fix SPI bus warnings 08ffefc8e7ed arm64: dts: broadcom: Fix I2C and SPI bus warnings 174e8262f08a drivers: qcom: rpmh-rsc: clear wait_for_compl after use 09c8a33ed766 soc: qcom: apr: Avoid string overflow 6651ecf92f3c soc: qcom: wcnss_ctrl: Avoid string overflow 4a2c4d1a0b6b soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples 331ed266987e soc: qcom: geni: Don't ignore clk_round_rate() errors in geni_se_clk_tbl_get() b0826d4774c2 ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value 9a484516a410 llc: avoid blocking in llc_sap_close() 50e40ebcaa32 pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map() 3f57f7387db2 arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1 7ed1974d2b03 arm64: dts: renesas: r8a77965: Fix HS-USB compatible dc521bf8ffda arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU 1badf45f08b3 arm64: dts: renesas: salvator-common: adv748x: Override secondary addresses 20f93eb9194c ALSA: intel8x0m: Register irq handler after register initializations e80e83fb0106 arm64: dts: meson-axg: use the proper compatible for ethmac 2694107888a5 arm64: dts: meson: libretech: update board model 3804f9dd8f76 net: bcmgenet: Fix speed selection for reverse MII 914282c62ab2 media: dvb: fix compat ioctl translation 03056f8c725a media: fix: media: pci: meye: validate offset to avoid arbitrary access fe384ab1496c ALSA: hda: Fix implicit definition of pci_iomap() on SH 6281d021bbb3 media: dt-bindings: adv748x: Fix decimal unit addresses 88e9f8198dd5 nvmem: core: return error code instead of NULL from nvmem_device_get b0d54e40f3c4 Drivers: hv: vmbus: Fix synic per-cpu context initialization a1d374ea1e95 net: aquantia: fix hw_atl_utils_fw_upload_dwords a9cab0fe6e26 kprobes: Don't call BUG_ON() if there is a kprobe in use on free list 7aea0bd886ae scsi: pm80xx: Fixed system hang issue during kexec boot a66a544dca32 scsi: pm80xx: Corrected dma_unmap_sg() parameter ac892349e21b ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set 86d5ceaea04c scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir() 66b2e4c7afd0 scsi: lpfc: Fix errors in log messages. 87c32dbd7eff scsi: lpfc: Correct invalid EQ doorbell write on if_type=6 8caed6a5d385 scsi: lpfc: Fix GFT_ID and PRLI logic for RSCN 050e019c2d69 scsi: qla2xxx: Fix duplicate switch's Nport ID entries c7ddd7ba1d05 scsi: qla2xxx: Fix dropped srb resource. 8c32664a6a0d scsi: qla2xxx: Fix port speed display on chip reset 3e3a2c5c4569 scsi: qla2xxx: Check for Register disconnect 3a7ec92a5b2a scsi: qla2xxx: Increase abort timeout value 5320b946687a scsi: qla2xxx: Fix deadlock between ATIO and HW lock 6f6e01ff7413 scsi: qla2xxx: Terminate Plogi/PRLI if WWN is 0 f91811dd9501 scsi: qla2xxx: Defer chip reset until target mode is enabled 667bdc46aa4e scsi: qla2xxx: Fix iIDMA error ca35c5a1cb21 scsi: qla2xxx: Use correct qpair for ABTS/CMD a1f14df33c05 f2fs: fix setattr project check upon fssetxattr ioctl 7b55102cdc61 f2fs: fix memory leak of percpu counter in fill_super() 883037308018 f2fs: fix memory leak of write_io in fill_super() e5b515f56626 signal: Properly deliver SIGSEGV from x86 uprobes 91c3a88054c1 signal: Properly deliver SIGILL from uprobes 3b5681d39fa4 signal: Always ignore SIGKILL and SIGSTOP sent to the global init 93ae4ded2abe IB/hfi1: Missing return value in error path for user sdma 45d0ddf97448 RDMA/hns: Fix an error code in hns_roce_v2_init_eq_table() 8edddc2cf3c1 dmaengine: at_xdmac: remove a stray bottom half unlock 9234fbbd7782 ath9k: add back support for using active monitor interfaces for tx99 82663f99cbdf rtc: pl030: fix possible race condition 5a869e9828e8 rtc: mt6397: fix possible race condition 0773f03aebdd EDAC, sb_edac: Return early on ADDRV bit and address type test fc7be6308364 dmaengine: dma-jz4780: Further residue status fix f6d4561cae3a dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 a34ea3ddc763 usb: mtu3: disable vbus rise/fall interrupts of ltssm a5d1ffee2f2f ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board 67e477d8eaa0 arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire 4c884128b414 firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings d786bf93f0c5 sched/debug: Use symbolic names for task state constants e4e522609854 sched/debug: Explicitly cast sched_feat() to bool 0ddcbbf4cd47 failover: Fix error return code in net_failover_create eca5b74e0080 f2fs: submit bio after shutdown 0f9c9a216288 ARM: dts: omap3-gta04: keep vpll2 always on d59817b0ca62 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot 6b268c233df7 ARM: dts: omap3-gta04: fix touchscreen tsc2007 96907aa1ab3c ARM: dts: omap3-gta04: tvout: enable as display1 alias 8f03a5116e9d ARM: dts: omap3-gta04: fixes for tvout / venc 5cacb026fe26 ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files 69116e3bae2b of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC cc5f462c1b08 ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA 3d5d2f7806a9 ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation 0376916b7b2c ASoC: dapm: Avoid uninitialised variable warning 0204720dde67 udf: Fix crash during mount 52cda4c1d9cd mips: txx9: fix iounmap related issue f63587cbb091 RDMA/core: Follow correct unregister order between sysfs and cgroup 6b827d38cead RDMA/core: Rate limit MAD error messages a618cca0438b IB/ipoib: Ensure that MTU isn't less than minimum permitted 2543eeba256a IB/mlx5: Don't hold spin lock while checking device state 4d8d651e1c5f i2c: mediatek: Use DMA safe buffers for i2c transactions d0d8f0efb6bd ath10k: wmi: disable softirq's while calling ieee80211_rx 14c9bc4be084 ARM: dts: exynos: Disable pull control for S5M8767 PMIC 588822fcb313 ath10k: avoid possible memory access violation 34293775f117 ASoC: sgtl5000: avoid division by zero if lo_vag is zero 6cbd0932ab9a rtnetlink: move type calculation out of loop 4b702fdd6e7e net: lan78xx: Bail out if lan78xx_get_endpoints fails 23ad83c399b0 f2fs: avoid wrong decrypted data from disk b6410b95c224 cfg80211: validate wmm rule when setting 8d705195a9a3 mac80211: fix saving a few HE values 4d146d72687e qxl: fix null-pointer crash during suspend f5ee703ff92c IB/mlx5: Change TX affinity assignment in RoCE LAG mode 5128ea974c22 mtd: rawnand: qcom: don't include dma-direct.h d6ebf70120c6 mtd: rawnand: fsl_ifc: fixup SRAM init for newer ctrl versions 29535bafb64b mtd: rawnand: fsl_ifc: check result of SRAM initialization 6ae8c86ee458 mtd: rawnand: marvell: use regmap_update_bits() for syscon access 6c7644ad22ae ARM: dts: meson8b: fix the clock controller register size e39779f6ea67 ARM: dts: meson8: fix the clock controller register size 6da9a4a98215 net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32 77f9e263e296 net: phy: mscc: read 'vsc8531,vddmac' as an u32 5dc1cbcff700 net/mlx5: Fix atomic_mode enum values b5f6d6de5b12 net: hns3: Change the dst mac addr of loopback packet f995b2efa439 net: hns3: Fix for loopback selftest failed problem d01caf35564c net: hns3: Fix error of checking used vlan id 4aea8f76727e net: hns3: Fix for multicast failure e5f48f8eff66 ASoC: rsnd: ssi: Fix issue in dma data address assignment 0b8e8bddc5c0 soc: imx: gpc: fix PDN delay 7f88d806443f mt76: Fix comparisons with invalid hardware key index 1f54ec5b3047 brcmfmac: fix wrong strnchr usage f05f8607622c mwifex: free rx_cmd skb in suspended state 6c27b9267a84 mwifiex: do no submit URB in suspended state cd554b025c09 rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument c495a8c78b50 ARM: dts: pxa: fix power i2c base address 72e13203c56d ARM: dts: pxa: fix the rtc controller fe9048c7bb38 media: ov772x: Disable clk on error path b489c1e010e4 media: i2c: Fix pm_runtime_get_if_in_use() usage in sensor drivers 5a21c7a0b592 media: vicodec: fix out-of-range values when decoding 17743861edc7 iwlwifi: mvm: avoid sending too many BARs 75de80e11e6b iwlwifi: don't WARN on trying to dump dead firmware ecedae02e89d iwlwifi: drop packets with bad status in CD 02adbecf542e IB/rxe: fixes for rdma read retry cad889676bdb IB/rxe: avoid back-to-back retries ac0ab821c4d5 i40e: Prevent deleting MAC address from VF when set by PF 712d35e0d2c1 i40evf: cancel workqueue sync for adminq when a VF is removed e5d3afbe3a5c i40e: hold the rtnl lock on clearing interrupt scheme f9a84bbd3ca6 i40evf: Don't enable vlan stripping when rx offload is turned on fe301cf64f7e i40e: Check and correct speed values for link on open 8d7e6ab3b5d2 i40evf: set IFF_UNICAST_FLT flag for the VF 015fc5251996 i40e: use correct length for strncpy a90fcbdb9b22 i40evf: Validate the number of queues a PF sends 2da61f212f4d ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks d4e5c8aeb198 arm64: dts: stratix10: i2c clock running out of spec b0bac46b52a9 liquidio: fix race condition in instruction completion processing b2e427c268f3 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook 0b53b56287ab ARM: dts: exynos: Fix HDMI-HPD line handling on Arndale 0baa3fe5805e ARM: dts: exynos: Use i2c-gpio for HDMI-DDC on Arndale 8e6acc5ee14d MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 7c68184fced7 pinctrl: ingenic: Probe driver at subsys_initcall 8ddea21d4c0b ASoC: AMD: Change MCLK to 48Mhz bdb7368ac333 ASoC: meson: axg-fifo: report interrupt request failure aac9381b2ca8 ASoC: dpcm: Properly initialise hw->rate_max ac66c0c470a3 ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl d3a45d4d6f2d ice: Fix and update driver version string 48b128cddb91 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated 9ca72984d7c0 ice: Prevent control queue operations during reset a881088f512e ice: Update request resource command to latest specification f71230e6898e ath10k: limit available channels via DT ieee80211-freq-limit 8cad5d80f8d0 wil6210: fix invalid memory access for rx_buff_mgmt debugfs bcaabaa75eeb wil6210: prevent usage of tx ring 0 for eDMA acf041edec0a wil6210: set edma variables only for Talyn-MB devices be039c973093 wil6210: drop Rx multicast packets that are looped-back to STA 1b0581bf379f ath9k: fix tx99 with monitor mode interface a618e2069783 ath10k: skip resetting rx filter for WCN3990 f7b2312c68a8 ALSA: seq: Do error checks at creating system ports c2f459d3340f cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set d377d63a9228 extcon: cht-wc: Return from default case to avoid warnings 7575a34ed101 remoteproc/davinci: Use %zx for formating size_t c2dca83e9e83 rtc: rv8803: fix the rv8803 id in the OF table 5a408693b414 rtc: sysfs: fix NULL check in rtc_add_groups() a01d6a320440 ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45 ea6a25cd2d41 ARM: dts: rcar: Correct SATA device sizes to 2 MiB 32d3fe68d20e y2038: make do_gettimeofday() and get_seconds() inline 5a830803b593 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply a124e7f2fecf soc/tegra: pmc: Fix pad voltage configuration for Tegra186 90cfef191a30 ALSA: pcm: signedness bug in snd_pcm_plug_alloc() e84cb5882da6 arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage 3bbce894d52d arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage d304218f959e arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node 030f6397eb89 soundwire: intel: Fix uninitialized adev deref 4b4153b7d6af soundwire: Initialize completion for defer messages 38d1ecc23e3e clk: sunxi-ng: h6: fix PWM gate/reset offset 6c0fcc727ff0 iio: dac: mcp4922: fix error handling in mcp4922_write_raw f125d1831402 ath10k: fix kernel panic by moving pci flush after napi_disable 75a600d7f062 tee: optee: take DT status property into account cd3de5870c80 iio: adc: max9611: explicitly cast gain_selectors a6bb63183de2 mmc: sdhci-of-at91: fix quirk2 overwrite b4bc6498c39b mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() bb1bc2d8231c mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() 653d9e0c55bf mm: mempolicy: fix the wrong return value and potential pages leak of mbind 5b1c342fc3e0 iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 29dcbbb5ab0a net: ethernet: dwmac-sun8i: Use the correct function in exit path bdae2f7b2031 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either beb3860c2e0e ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 1a48aaabf1cd i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present 9ace24bba657 IB/hfi1: Use a common pad buffer for 9B and 16B packets 6ec4a5498ee5 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 1f3bbf9f0adc Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 5c9fd709c5f5 Input: synaptics-rmi4 - clear IRQ enables for F54 fbe9849f79aa Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 924a8f2c745a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 8e347aa4e04b Input: synaptics-rmi4 - fix video buffer size c02230815282 Input: ff-memless - kill timer in destroy() 47d06a15f25a Btrfs: fix log context list corruption after rename exchange operation f2465526866a ALSA: usb-audio: Fix incorrect size check for processing/extension units 420433f6cf5c ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk() ab2ee4299b7e ALSA: usb-audio: not submit urb for stopped endpoint a2c763cd9609 ALSA: usb-audio: Fix missing error check at mixer resolution test edc471038b48 slip: Fix memory leak in slip_open error path 4cd50a31ac9e net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules 0a772b2ac696 net: gemini: add missed free_netdev 66daa05750a9 ipmr: Fix skb headroom in ipmr_get_route(). 20beeb30083e ax88172a: fix information leak on short answers c4a0f567e652 scsi: core: Handle drivers which set sg_tablesize to zero 81adf034d5d6 MIPS: BCM63XX: fix switch core reset on BCM6368 dbf1ef2dc0d5 KVM: x86: introduce is_pae_paging Signed-off-by: Bruce Ashfield (cherry picked from commit 064811c18fe26c7d9bc84f86047325e25e2a1001) Signed-off-by: Armin Kuster (cherry picked from commit 7e944cca62851689f9ddf8a5308ee3331f763957) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index f588d7f..7b89a24 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "f272b39688fbec016d91b5c0c9d1bb7b5bc3b2ca" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine ?= "d3fb163023de0a5a57a021e58b55976f68142fc0" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 0f3b0d5..9cde2c2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d971adf5221e18df3ba46bddee4719c85f98977a" -SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine_qemuarm ?= "6e7574e9a9b41143e0c42fcb31b13802529602f0" +SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 17620c7..aab30a9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "425023bd5cfe4f4f7b950c84f62861de600d4f6c" -SRCREV_machine_qemuarm64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemumips ?= "6273d88ca69ada3ae4684fc6301e39381f4cd3e4" -SRCREV_machine_qemuppc ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemux86 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemux86-64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemumips64 ?= "f9368853646be5ce9f122adb733cbf8225641e8c" -SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine_qemuarm ?= "4d9d89763cde098e4a8b879e8c831e35a5f39ae6" +SRCREV_machine_qemuarm64 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemumips ?= "1f0855745653c8cb7d72ea2d03197889cc82a410" +SRCREV_machine_qemuppc ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemux86 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemux86-64 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemumips64 ?= "5ed73d6e6dc7d4ad8184de8eb6641bdb265ae2ea" +SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:26 +0000 Subject: [oe-commits] [openembedded-core] 05/14: linux-yocto/4.19: update to v4.19.78 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.5B4D12328C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit bdc7d1a72bc4b095ae9b26ee9cc861e8e9cb05ab Author: Bruce Ashfield AuthorDate: Mon Oct 21 16:16:13 2019 -0400 linux-yocto/4.19: update to v4.19.78 Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: 58fce2064530 Linux 4.19.78 5b0446c8e0a8 9p/cache.c: Fix memory leak in v9fs_cache_session_get_cookie d85bc11a6894 kexec: bail out upon SIGKILL when allocating memory. c8a65ec0602a NFC: fix attrs checks in netlink interface 1b42503211ca smack: use GFP_NOFS while holding inode_smack::smk_lock ef9744a0218f Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set 4703593498d3 soundwire: fix regmap dependencies and align with other serial links 322753c78d1d soundwire: Kconfig: fix help format 74e2a311a226 sch_cbq: validate TCA_CBQ_WRROPT to avoid crash ed9420ddce87 tipc: fix unlimited bundling of small messages a1afd826e549 xen-netfront: do not use ~0U as error return value for xennet_fill_frags() 36a4043c4bb8 net/rds: Fix error handling in rds_ib_add_one() 012363f5ded0 udp: only do GSO if # of segs > 1 5c08d7e4f1ea net: dsa: rtl8366: Check VLAN ID and not ports 3c1f0704401c vsock: Fix a lockdep warning in __vsock_release() 544aee546174 udp: fix gso_segs calculations 79fd59ae7c2f sch_dsmark: fix potential NULL deref in dsmark_init() 76b552775d60 rxrpc: Fix rxrpc_recvmsg tracepoint 7047aae65456 qmi_wwan: add support for Cinterion CLS8 devices dd9c580a6d9b nfc: fix memory leak in llcp_sock_bind() d5b1db1c7ce4 net: Unpublish sk from sk_reuseport_cb before call_rcu 9d0995cc268b net: qlogic: Fix memory leak in ql_alloc_large_buffers 124b64feafa9 net: ipv4: avoid mixed n_redirects and rate_tokens usage 6f8564edf8c1 ipv6: Handle missing host route in __ipv6_ifa_notify 658d7ee4da50 ipv6: drop incoming packets having a v4mapped source address a495fd19cce2 hso: fix NULL-deref on tty open 7f30c44b7ca4 erspan: remove the incorrect mtu limit for erspan 2b8389112292 cxgb4:Fix out-of-bounds MSI-X info array access ed568ca73601 bpf: fix use after free in prog symbol exposure dbb7339cfddf block: mq-deadline: Fix queue restart handling af10ffa69b06 arm: use STACK_TOP when computing mmap base address f91a9c6591c0 arm: properly account for stack randomization and stack guard gap 53ba8d4358eb mips: properly account for stack randomization and stack guard gap e1b391abbfce arm64: consider stack randomization for mmap base only when necessary 30ab799e758e kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K 52132ff52cad ocfs2: wait for recovering done after direct unlock request d4a546452dcc kbuild: clean compressed initramfs image d983182d4002 crypto: hisilicon - Fix double free in sec_free_hw_sgl() 22c788ba7a52 hypfs: Fix error number left in struct pointer member bbd76d9514c7 pktcdvd: remove warning on attempting to register non-passthrough dev 0840daeea6cb fat: work around race with userspace's read via blockdev while mounting 297904ea60a3 ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address 9a87ab2b4d60 security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb() 69a32a7306dd PCI: exynos: Propagate errors for optional PHYs 1264d2e7b75b PCI: imx6: Propagate errors for optional regulators 403d6c9284f1 PCI: histb: Propagate errors for optional regulators ac9c0e2ecc49 PCI: rockchip: Propagate errors for optional regulators 709c4841e51f HID: apple: Fix stuck function keys when using FN 31e98cba55ed rtc: pcf85363/pcf85263: fix regmap error in set_time 607f95788fa9 rtc: snvs: fix possible race condition 078937549f47 ARM: 8875/1: Kconfig: default to AEABI w/ Clang 3039c788d648 soundwire: intel: fix channel number reported by hardware 6a684e002561 ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes 0f0ced702d53 livepatch: Nullify obj->mod in klp_module_coming()'s error path 78a1138672af HID: wacom: Fix several minor compiler warnings 3b7fbbddeb7a PCI: tegra: Fix OF node reference leak c74a801ded7d mfd: intel-lpss: Remove D3cold delay 70bb4bf9fdfb i2c-cht-wc: Fix lockdep warning 371077ea2e75 MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean 3ed14a8d2fe7 MIPS: Ingenic: Disable broken BTB lookup optimization. 5b400fed74df ext4: fix potential use after free after remounting with noblock_validity 81fbd2327c32 dma-buf/sw_sync: Synchronize signal vs syncpt free c76e18970d93 scsi: core: Reduce memory required for SCSI logging c6304d4d7458 clk: sprd: add missing kfree 7cd89b8db60c mbox: qcom: add APCS child device for QCS404 324b0c9efc77 powerpc: dump kernel log before carrying out fadump or kdump 72884423e77f clk: at91: select parent if main oscillator or bypass is enabled 952d1c6d7cf0 arm64: fix unreachable code issue with cmpxchg b25bd837a637 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c b717a47dd913 powerpc/pseries: correctly track irq state in default idle ae089bf87c57 clk: qcom: gcc-sdm845: Use floor ops for sdcc clks 2c16f72135fb pstore: fs superblock limits 0c09b02842b8 powerpc/64s/exception: machine check use correct cfar for late handler 39b6d05169b2 drm/amdgpu/si: fix ASIC tests 4dcbca872a84 drm/amd/display: support spdif 38dfc974f322 clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain 0b5ac607db4b clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain 2cfb89832179 pinctrl: amd: disable spurious-firing GPIO IRQs 274d7acb0b81 drm/nouveau/volt: Fix for some cards having 0 maximum voltage 9b2d2f2ad003 vfio_pci: Restore original state on release c1f7b3fb87cf powerpc/eeh: Clear stale EEH_DEV_NO_HANDLER flag b2df456c83e3 pinctrl: tegra: Fix write barrier placement in pmx_writel 4c91e678d27c powerpc/pseries/mobility: use cond_resched when updating device tree 6d728a172732 powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function 6aa455b0d0a0 powerpc/rtas: use device model APIs and serialization during LPM 25c501f0f9d9 powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL 2cca24b2cb9a clk: zx296718: Don't reference clk_init_data after registration efa0fe4cde05 clk: sprd: Don't reference clk_init_data after registration 89dc59fb267d clk: sirf: Don't reference clk_init_data after registration bd3a445c2717 clk: actions: Don't reference clk_init_data after registration 437399ed906a powerpc/powernv/ioda2: Allocate TCE table levels on demand for default DMA window 782a77f2eb39 drm/amd/display: reprogram VM config when system resume 24ba84ec0016 drm/amd/display: fix issue where 252-255 values are clipped efb0e1e3d0e1 clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks a2279550f7be clk: qoriq: Fix -Wunused-const-variable 84038a98b904 ipmi_si: Only schedule continuously in the thread in maintenance mode b351726bb5be PCI: rpaphp: Avoid a sometimes-uninitialized warning 0936c46139cb gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property() 6e03bca91f8e drm/radeon: Fix EEH during kexec 441c15582338 drm/rockchip: Check for fast link training before enabling psr f3d62177dee3 drm/panel: check failure cases in the probe func 9cb3698dcc86 drm/stm: attach gem fence to atomic state 043f0229f442 video: ssd1307fb: Start page range at page_offset bd5b6a7c89ef drm/panel: simple: fix AUO g185han01 horizontal blanking db472be8b340 drm/bridge: tc358767: Increase AUX transfer length limit 053d0ec61e33 tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations d598712712e4 tpm: use tpm_try_get_ops() in tpm-sysfs.c. 6cad9d0cf87b Linux 4.19.77 2c60da90ec44 drm/amd/display: Restore backlight brightness after system resume 4d8bdf7f3a86 mm/compaction.c: clear total_{migrate,free}_scanned before scanning a new zone 5bead06b3443 fuse: fix deadlock with aio poll and fuse_iqueue::waitq.lock bbe3e2056d27 md/raid0: avoid RAID0 data corruption due to layout confusion. 4290a9e59323 CIFS: Fix oplock handling for SMB 2.1+ protocols a3a150895b6f CIFS: fix max ea value size a0f7fd38acf5 i2c: riic: Clear NACK in tend isr fec38267a2bf hwrng: core - don't wait on add_early_randomness() 060986096fea quota: fix wrong condition in is_quota_modification() 091c754d5ca9 ext4: fix punch hole for inline_data file systems 775e3e734bd3 ext4: fix warning inside ext4_convert_unwritten_extents_endio caa6926d94f1 /dev/mem: Bail out upon SIGKILL. bd3a11af1bde cfg80211: Purge frame registrations on iftype change 5dc86e9574a1 md: only call set_in_sync() when it is expected to succeed. 598a2cda62d3 md: don't report active array_state until after revalidate_disk() completes. e8323e0ddce1 md/raid6: Set R5_ReadError when there is read failure on parity disk bacff03bb286 Btrfs: fix race setting up and completing qgroup rescan workers b5c42ef09df3 btrfs: qgroup: Fix reserved data space leak if we have multiple reserve calls c521bfa8e2dc btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space 067f82a05c2f btrfs: Relinquish CPUs in btrfs_compare_trees b08344be3546 Btrfs: fix use-after-free when using the tree modification log 4874c6fe1c9e btrfs: fix allocation of free space cache v1 bitmap pages 934243a72849 ovl: filter of trusted xattr results in audit e7265adc0a3c ovl: Fix dereferencing possible ERR_PTR() 2e96c9332595 smb3: allow disabling requesting leases 82652c06f976 block: fix null pointer dereference in blk_mq_rq_timed_out() db5b2fe4d33c i40e: check __I40E_VF_DISABLE bit in i40e_sync_filters_subtask b4a734a529b8 memcg, kmem: do not fail __GFP_NOFAIL charges d40b3eafb52e memcg, oom: don't require __GFP_FS when invoking memcg OOM killer e0c1e6e55bca gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps 3620b06b1db0 efifb: BGRT: Improve efifb_bgrt_sanity_check c4f65c2fb0f5 regulator: Defer init completion for a while after late_initcall 3784576fc639 alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP 174bbcc560cc arm64: dts: rockchip: limit clock rate of MMC controllers for RK3328 8cfe3b8aa3b6 arm64: tlb: Ensure we execute an ISB following walk cache invalidation fc7d6bfdd774 Revert "arm64: Remove unnecessary ISBs from set_{pte,pmd,pud}" 881edc165b8e ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up 2209279439a1 ARM: samsung: Fix system restart on S3C6410 ad884155fb9c ASoC: Intel: Fix use of potentially uninitialized variable 7bdab36455f9 ASoC: Intel: Skylake: Use correct function to access iomem space 3c54f463402f ASoC: Intel: NHLT: Fix debug print format 29ecf8cae5f4 binfmt_elf: Do not move brk for INTERP-less ET_EXEC 02ef5c299d15 media: don't drop front-end reference count for ->detach 589ca8ec4c62 media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table 496cf984a60e KVM: x86: Manually calculate reserved bits when loading PDPTRS 933e3e2b5070 KVM: x86: set ctxt->have_exception in x86_decode_insn() 9723e4458604 KVM: x86: always stop emulation on page fault 8225db4a70b2 parisc: Disable HP HSC-PCI Cards to prevent kernel crash ad41162974c6 fuse: fix missing unlock_page in fuse_writepage() ecfe4b5f70c8 powerpc/imc: Dont create debugfs files for cpu-less nodes e94443fc7b64 scsi: implement .cleanup_rq callback 4ec3ca2770e7 blk-mq: add callback of .cleanup_rq 4848fb93243e ALSA: hda/realtek - PCI quirk for Medion E4254 e9bcaf82dd37 ceph: use ceph_evict_inode to cleanup inode's resource 72f0fff3c450 Revert "ceph: use ceph_evict_inode to cleanup inode's resource" 98dc6d958bd9 randstruct: Check member structs in is_pure_ops_struct() ad6819cd68be IB/hfi1: Define variables as unsigned long to fix KASAN warning a924850c93d4 IB/mlx5: Free mpi in mp_slave mode 40b071992ca5 printk: Do not lose last line in kmsg buffer dump 28f142b940af scsi: qla2xxx: Fix Relogin to prevent modifying scan_state flag 03b75e65ceed scsi: scsi_dh_rdac: zero cdb in send_mode_select() 2e21e5b225ef ALSA: firewire-tascam: check intermediate state of clock status and retry f5779e4449da ALSA: firewire-tascam: handle error code when getting current source of clock fdd131eab68f iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36 6437ec272eda PM / devfreq: passive: fix compiler warning 814f7fe56ebb media: omap3isp: Set device on omap3isp subdevs c5dbd74f8259 btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type 2aeeb0a4b440 iommu/amd: Override wrong IVRS IOAPIC on Raven Ridge systems 291da335040c ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93 8630a4d13683 media: ttusb-dec: Fix info-leak in ttusb_dec_send_command() d47636913bda drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) 5370cf8d90ad ALSA: hda - Drop unsol event handler for Intel HDMI codecs ac1d43a20a08 e1000e: add workaround for possible stalled packet 35b6cba971f5 libertas: Add missing sentinel at end of if_usb.c fw_table 0a43d5d458d5 raid5: don't increment read_errors on EILSEQ return da87dfca25aa mmc: dw_mmc: Re-store SDIO IRQs mask at system resume a0dd3d95fb21 mmc: core: Add helper function to indicate if SDIO IRQs is enabled 8ba99d50cb61 mmc: sdhci: Fix incorrect switch to HS mode 869122775782 mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD a5443cd24063 raid5: don't set STRIPE_HANDLE to stripe which is in batch list 064fba888e77 ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set 476eda2539bb platform/x86: intel_pmc_core: Do not ioremap RAM e836cd2917c6 x86/cpu: Add Tiger Lake to Intel family b21919eeced6 s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding fad90d4bfa8d kprobes: Prohibit probing on BUG() and WARN() address 213077da3e7c dmaengine: ti: edma: Do not reset reserved paRAM slots f1db75622996 md/raid1: fail run raid1 array when active disk less than one 76cf93f04c3d hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap' f0956418d997 closures: fix a race on wakeup from closure_sync 9fcfdff61f74 ACPI / PCI: fix acpi_pci_irq_enable() memory leak e4467fb6ef54 ACPI: custom_method: fix memory leaks 6fceb241dc76 ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks e4b4280dcd97 libtraceevent: Change users plugin directory c55659cd1459 iommu/iova: Avoid false sharing on fq_timer_on 223b0481ed4b libata/ahci: Drop PCS quirk for Denverton and beyond de888e0244cb iommu/amd: Silence warnings under memory pressure 6241c0ac301e ALSA: firewire-motu: add support for MOTU 4pre ad58ce6cacd1 nvme-multipath: fix ana log nsid lookup when nsid is not found 9edc229b9c90 nvmet: fix data units read and written counters in SMART log 7bbb7a9dd2c3 x86/mm/pti: Handle unaligned address gracefully in pti_clone_pagetable() 5201b4ffc324 ASoC: fsl_ssi: Fix clock control issue in master mode 4b7d9c2a716e x86/mm/pti: Do not invoke PTI functions when PTI is disabled eb2485e32f90 arm64: kpti: ensure patched kernel text is fetched from PoU b619496540ba x86/apic/vector: Warn when vector space exhaustion breaks affinity 01e8f487cecb sched/cpufreq: Align trace event behavior of fast switching 2919fa0398ad ACPI / CPPC: do not require the _PSD method b79922133f9c ASoC: es8316: fix headphone mixer volume table dd25f76c1f34 media: ov9650: add a sanity check 342a0bee4d94 perf trace beauty ioctl: Fix off-by-one error in cmd->string table 57409ea782e7 media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate() 78550c5cfe6d media: cpia2_usb: fix memory leaks d796c6c1aab4 media: saa7146: add cleanup in hexium_attach() ab20f38ce522 media: cec-notifier: clear cec_adap in cec_notifier_unregister d51268d7574b PM / devfreq: exynos-bus: Correct clock enable sequence 7e19b7e0d640 PM / devfreq: passive: Use non-devm notifiers f9de170eaf7e EDAC/amd64: Decode syndrome before translating address 6f80e91a66e0 EDAC/amd64: Recognize DRAM device type ECC capability adb97f18b4e7 libperf: Fix alignment trap with xyarray contents in 'perf stat' 4df2427a5148 media: dvb-core: fix a memory leak bug 8d5fccff7b0c posix-cpu-timers: Sanitize bogus WARNONS 9df9652b7345 media: dvb-frontends: use ida for pll number 006a6065c867 media: mceusb: fix (eliminate) TX IR signal length limit d093d3183ca2 nbd: add missing config put e497ec26cc43 led: triggers: Fix a memory leak bug 83c2a42b1b84 ASoC: sun4i-i2s: Don't use the oversample to calculate BCLK 5466c30b11cb tools headers: Fixup bitsperlong per arch includes b1f1b83e2583 ASoC: uniphier: Fix double reset assersion when transitioning to suspend state e6bc6e2c0d1f media: hdpvr: add terminating 0 at end of string 4a2cb7600b72 media: radio/si470x: kill urb on error dfaf60580191 ARM: dts: imx7-colibri: disable HS400 c20ee5d906ec ARM: dts: imx7d: cl-som-imx7: make ethernet work again 21927786df27 m68k: Prevent some compiler warnings in Coldfire builds ba8f56ffaebf net: lpc-enet: fix printk format strings aa2d05a9de05 media: imx: mipi csi-2: Don't fail if initial state times-out 1b7df445d881 media: omap3isp: Don't set streaming state on random subdevs 0c3802174754 media: i2c: ov5645: Fix power sequence 3dfbac0add22 media: vsp1: fix memory leak of dl on error return path c47022e019fe perf record: Support aarch64 random socket_id assignment 482c1d0a7cc4 dmaengine: iop-adma: use correct printk format strings 19a1fa140594 media: rc: imon: Allow iMON RC protocol for ffdc 7e device a527d3d4b513 media: em28xx: modules workqueue not inited for 2nd device 6a1c59a7603d media: fdp1: Reduce FCP not found message level to debug e3f5f626e17a media: mtk-mdp: fix reference count on old device tree 066afce8d87d perf test vfs_getname: Disable ~/.perfconfig to get default output 96b61fe7a5f7 perf config: Honour $PERF_CONFIG env var to specify alternate .perfconfig db751f6d5241 media: gspca: zero usb_buf on error 511110236089 idle: Prevent late-arriving interrupts from disrupting offline 9addfbd40959 sched/fair: Use rq_lock/unlock in online_fair_sched_group 6e9d45022d26 firmware: arm_scmi: Check if platform has released shmem before using 0dbdc1986bb4 efi: cper: print AER info of PCIe fatal error 4410b8517950 EDAC, pnd2: Fix ioremap() size in dnv_rd_reg() cf8f20a1aacf loop: Add LOOP_SET_DIRECT_IO to compat ioctl 18e5e458c6d8 ACPI / processor: don't print errors for processorIDs == 0xff 465bc6e80fd2 media: media/platform: fsl-viu.c: fix build for MICROBLAZE 371538451c21 md: don't set In_sync if array is frozen d38aff20c407 md: don't call spare_active in md_reap_sync_thread if all member devices can't work 1cd972e0a107 md/raid1: end bio when the device faulty 7d75275fbfb1 arm64/prefetch: fix a -Wtype-limits warning 829bebdc1ce6 ASoC: rsnd: don't call clk_get_rate() under atomic context f5bef62df824 EDAC/altera: Use the proper type for the IRQ status bits 87bc43e2a775 ia64:unwind: fix double free for mod->arch.init_unw_table ca57eca32b3e ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid d76b5ac5016c base: soc: Export soc_device_register/unregister APIs 4a75e77ef1b5 media: iguanair: add sanity checks fe8fc7d7cb64 EDAC/mc: Fix grain_bits calculation 55a98e872186 ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() 1af6822f29d6 ALSA: hda - Show the fatal CORB/RIRB error more clearly b40c15c20e42 x86/apic: Soft disable APIC before initializing it ce7fdd5cd83e x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails 0f30856944d4 sched/deadline: Fix bandwidth accounting at all levels after offline migration d29c7b8be599 x86/apic: Make apic_pending_intr_clear() more robust f381d3d2c39c sched/core: Fix CPU controller for !RT_GROUP_SCHED 417cf53b4b85 sched/fair: Fix imbalance due to CPU affinity 7cebdfa62f22 time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint 64f3fb5d751c media: i2c: ov5640: Check for devm_gpiod_get_optional() error 6cc816dd644e media: hdpvr: Add device num check and handling 8bc254d3e6b8 media: exynos4-is: fix leaked of_node references 7ec720763a20 media: mtk-cir: lower de-glitch counter for rc-mm protocol 920acbff8932 media: dib0700: fix link error for dibx000_i2c_set_speed 8f9dc49928c2 leds: leds-lp5562 allow firmware files up to the maximum length fdcf06a35bc6 dmaengine: bcm2835: Print error in case setting DMA mask fails e841313b5731 firmware: qcom_scm: Use proper types for dma mappings ec4815460d81 ASoC: sgtl5000: Fix charge pump source assignment 84bb4024b358 ASoC: sgtl5000: Fix of unmute outputs on probe a7ace049bddc ASoC: tlv320aic31xx: suppress error message for EPROBE_DEFER 3657e58405fb regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg 3eec108aa879 ALSA: hda: Flush interrupts on disabling 5b6c791f494d nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs 33fe1f517e29 nfc: enforce CAP_NET_RAW for raw sockets dd651ab7a114 ieee802154: enforce CAP_NET_RAW for raw sockets 6f0f18e53269 ax25: enforce CAP_NET_RAW for raw sockets 6fbf86627608 appletalk: enforce CAP_NET_RAW for raw sockets 50dddec689cb mISDN: enforce CAP_NET_RAW for raw sockets f06b0b3e5d76 net/mlx5: Add device ID of upcoming BlueField-2 3fdcf6a88ded tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state a749eea97ac9 net: sched: fix possible crash in tcf_action_destroy() 831d0fcba1cf usbnet: sanity checking of packet sizes and device mtu b7eeccc1c786 usbnet: ignore endpoints with invalid wMaxPacketSize ff4419d725c7 skge: fix checksum byte order 9a623e1b1d03 sch_netem: fix a divide by zero in tabledist() 1cd663adcece ppp: Fix memory leak in ppp_write 99952b08537c openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC 587df35cbf65 nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs 195a3ea494d2 net_sched: add max len check for TCA_KIND c31096dc586e net/sched: act_sample: don't push mac header on ip6gre ingress abb04d0a9dea net: qrtr: Stop rx_worker before freeing node 6ea3bc412506 net/phy: fix DP83865 10 Mbps HDX loopback disable function 831d082be72c macsec: drop skb sk before calling gro_cells_receive fd0034688358 cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize 0bf79588586c arcnet: provide a buffer big enough to actually receive packets 555161ee1b7a Linux 4.19.76 59a5cea41dd0 f2fs: use generic EFSBADCRC/EFSCORRUPTED fc3d296491f4 net/rds: Check laddr_check before calling it 3de749d6d7ce net/rds: An rds_sock is added too early to the hash table 07f7ec87b5f6 net_sched: check cops->tcf_block in tc_bind_tclass() 90b0761c1b81 Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices 6934809432d2 netfilter: nft_socket: fix erroneous socket assignment 649836fe946c xfs: don't crash on null attr fork xfs_bmapi_read 91ae87240166 drm/nouveau/disp/nv50-: fix center/aspect-corrected scaling 3717f4a49b34 ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35 46beb6eacef5 Bluetooth: btrtl: HCI reset on close for Realtek BT chip 8ffd7ba9ffb1 net: don't warn in inet diag when IPV6 is disabled ff0fbfacc94f drm: Flush output polling on shutdown 303f6d6bbc0c f2fs: fix to do sanity check on segment bitmap of LFS curseg dec09554eba9 net/ibmvnic: Fix missing { in __ibmvnic_reset dc9118feb472 dm zoned: fix invalid memory access 73d90f57fcc2 Revert "f2fs: avoid out-of-range memory access" 40cdc71e1111 blk-mq: move cancel of requeue_work to the front of blk_exit_queue 313efb253d03 blk-mq: change gfp flags to GFP_NOIO in blk_mq_realloc_hw_ctxs 75448f40b9f6 initramfs: don't free a non-existent initrd ad16dfef4a44 bcache: remove redundant LIST_HEAD(journal) from run_cache_set() 08fdaee2d97b PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it ef2baa03b7f0 f2fs: check all the data segments against all node ones ef06c33dc371 irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices 52b4947bac50 bpf: libbpf: retry loading program on EAGAIN a935d78e54cc Revert "drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD" 288831cba980 scsi: qla2xxx: Return switch command on a timeout 2b983f212c68 scsi: qla2xxx: Remove all rports if fabric scan retry fails 6b449e4cf090 scsi: qla2xxx: Turn off IOCB timeout timer on IOCB completion 9423770eb336 locking/lockdep: Add debug_locks check in __lock_downgrade() 0c23335a2d81 power: supply: sysfs: ratelimit property read error message 1456c40aa906 pinctrl: sprd: Use define directive for sprd_pinconf_params values 037d73a6458e objtool: Clobber user CFLAGS variable 952844f31eb7 ALSA: hda - Apply AMD controller workaround for Raven platform 50c9ccffe041 ALSA: hda - Add laptop imic fixup for ASUS M9V laptop 866a1a7e9f23 ALSA: dice: fix wrong packet parameter for Alesis iO26 9829fd27501e ALSA: usb-audio: Add DSD support for EVGA NU Audio 303921276360 ALSA: usb-audio: Add Hiby device family to quirks for native DSD support 8a845c02e495 ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt() a5e2c65034f8 ASoC: Intel: cht_bsw_max98090_ti: Enable codec clock once and keep it enabled ec2a3681b30c media: tvp5150: fix switch exit in set control handler ba6860700d1f iwlwifi: mvm: always init rs_fw with 20MHz bandwidth rates ced0676fc9c2 iwlwifi: mvm: send BCAST management frames to the right station b3873e34cbf2 net/mlx5e: Rx, Check ip headers sanity 404f118f2790 net/mlx5e: Rx, Fixup skb checksum for packets with tail padding c95ebb394d65 net/mlx5e: XDP, Avoid checksum complete when XDP prog is loaded 79e972a89cad net/mlx5e: Allow reporting of checksum unnecessary 8da68f79b3b3 mlx5: fix get_ip_proto() 44da02576b5d net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets 6debda97411e net/mlx5e: Set ECN for received packets using CQE indication e867ef113004 CIFS: fix deadlock in cached root handling f3160a1d71f7 crypto: talitos - fix missing break in switch statement c1a7fe486647 mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword() 5fdefdcb92bb HID: Add quirk for HP X500 PIXART OEM mouse 3d072c272b88 HID: hidraw: Fix invalid read in hidraw_ioctl acc96be807bb HID: logitech: Fix general protection fault caused by Logitech driver 3e785174fb35 HID: sony: Fix memory corruption issue on cleanup. eb77929769e3 HID: prodikeys: Fix general protection fault during probe 2661d462aaa9 IB/core: Add an unbound WQ type to the new CQ API 70ec2eecc550 drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines 80fc27953e74 powerpc/xive: Fix bogus error code returned by OPAL 4eb92a114834 RDMA/restrack: Protect from reentry to resource return path 373f9092df95 net/ibmvnic: free reset work of removed device from queue 2af977b0d1db Revert "Bluetooth: validate BLE connection interval updates" d573e8a79f70 Linux 4.19.75 b841a9f58d9c media: technisat-usb2: break out of loop at end of buffer f35f5a990a07 arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field c0ccb4da26bc binfmt_elf: move brk out of mmap when doing direct loader exec c3817ffb1036 floppy: fix usercopy direction 9c13e770cca9 ovl: fix regression caused by overlapping layers detection 5e74396d8beb PCI: kirin: Fix section mismatch warning 0d50f7b1e8c8 iommu/amd: Fix race in increase_address_space() 52f32e4aec50 iommu/amd: Flush old domains in kdump kernel ca77acdf1ac9 keys: Fix missing null pointer check in request_key_auth_describe() d73515a17c14 x86/hyper-v: Fix overflow bug in fill_gva_list() 371357770c8b x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation 72c762b01eb0 dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe() d04b522a65c0 dmaengine: ti: dma-crossbar: Fix a memory leak bug 6bc421d5a04a net: seeq: Fix the function used to release some memory in an error handling path 83360eb798ca net: aquantia: fix out of memory condition on rx side 30c345bd786a tools/power turbostat: fix buffer overrun d485c65853de tools/power x86_energy_perf_policy: Fix argument parsing 254b9b2971a7 tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2 a85a0d9f3796 amd-xgbe: Fix error path in xgbe_mod_init() 7ec11cad3fde perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops 560857de3064 perf/x86/intel: Restrict period on Nehalem 65ad72ce10e7 i2c: designware: Synchronize IRQs when unregistering slave client 5a45b14b03f7 sky2: Disable MSI on yet another ASUS boards (P6Xxxx) 6cce2adae3e1 ibmvnic: Do not process reset during or after device removal 080ca754f5db ARM: 8901/1: add a criteria for pfn_valid of arm c6d779fd8197 usb: host: xhci-tegra: Set DMA mask correctly b62946852afa cifs: Use kzfree() to zero out the password 325fa2a6729b cifs: set domainName when a domain-key is used in multiuser 9a74f799b99c kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol 0f7130177325 NFSv2: Fix write regression 60f0d449601d NFSv2: Fix eof handling 6075729f76da netfilter: nf_conntrack_ftp: Fix debug output 7ac5947f7578 netfilter: xt_physdev: Fix spurious error message in physdev_mt_check e997c0730520 x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines 688fdaa54a3e r8152: Set memory to all 0xFFs on failed reg reads d9f79f0ace55 bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0 7d4201ff9f73 batman-adv: Only read OGM2 tvlv_len after buffer len check 5b8b66274183 ARM: 8874/1: mm: only adjust sections of valid mm structures b870f8afc5a5 qed: Add cleanup in qed_slowpath_start() 30881d79de31 xdp: unpin xdp umem pages in error path 55ed0ad50201 Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105 767877deb25a NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup 4ac4f4716fba NFSv4: Fix return value in nfs_finish_open() d7565d51af18 NFSv4: Fix return values for nfs4_file_open() 4e5fbcb9a615 netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info a02c676c0f03 netfilter: nft_flow_offload: missing netlink attribute policy a4fa6c68ecc3 netfilter: ebtables: Fix argument order to ADD_COUNTER 634dd5a48627 fpga: altera-ps-spi: Fix getting of optional confd gpio 0d393f23f18e tools: bpftool: close prog FD before exit on showing a single program c5bb033529f1 selftests/bpf: fix "bind{4, 6} deny specific IP & port" on s390 48d77ca1497f s390/bpf: use 32-bit index for tail calls 999f33c2438c bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() 1a85d5819ade ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack a8919f8d352f ARM: dts: dra74x: Fix iodelay configuration for mmc3 2ff2bd2c5526 ARM: OMAP2+: Fix omap4 errata warning on other SoCs 73d003274a42 s390/bpf: fix lcgr instruction encoding c1e0937ef4d5 bus: ti-sysc: Fix using configured sysc mask value 0aee9e118eee ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss f696ba6b122d ARM: dts: am57xx: Disable voltage switching for SD card ac8f26f6a035 ieee802154: hwsim: unregister hw while hwsim_subscribe_all_others fails c237a050df3b ieee802154: hwsim: Fix error handle path in hwsim_init_module 6a10e87ffca1 nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds 941431c491a6 mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings 770cee245191 tty/serial: atmel: reschedule TX after RX was started 4c2f60ed8ed8 serial: sprd: correct the wrong sequence of arguments 2871621518ac firmware: google: check if size is valid when decoding VPD data 232a6462f43f KVM: coalesced_mmio: add bounds checking 7a1bad565ceb net_sched: let qdisc_put() accept NULL pointer 47288968eebd xen-netfront: do not assume sk_buff_head list is empty in error handling fdd60d80c429 udp: correct reuseport selection with connected sockets 97b5f8c95b75 ip6_gre: fix a dst leak in ip6erspan_tunnel_xmit 4fb95f299504 phy: renesas: rcar-gen3-usb2: Disable clearing VBUS in over-current abf389e0795a media: tm6000: double free if usb disconnect while streaming 77d4e2a05885 USB: usbcore: Fix slab-out-of-bounds bug during device reset b01b1eb24c04 powerpc/mm/radix: Use the right page size for vmemmap mapping 289f3c82b116 Input: elan_i2c - remove Lenovo Legion Y7000 PnpID 305c3b497662 RDMA/restrack: Release task struct which was hold by CM_ID object 8993c673d6c4 HID: wacom: generic: read HID_DG_CONTACTMAX from any feature report 2a0aa8a06aea netfilter: nf_flow_table: set default timeout after successful insertion dbc29aff8d04 Linux 4.19.74 9d587fe2cd70 x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning 96c08711fc66 nvmem: Use the same permissions for eeprom as for nvmem 3622d621e9be rsi: fix a double free bug in rsi_91x_deinit() 780f3aadee1e platform/x86: pmc_atom: Add CB4063 Beckhoff Automation board to critclk_systems DMI table 52bfcc9c8406 modules: fix compile error if don't have strict module rwx ae415d7a2707 modules: fix BUG when load module with rodata=n 0ae0c43abcbf iio: adc: stm32-dfsdm: fix data type acf77c411b4e Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" a03ed2891cdb drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto d13a836d787d drm: panel-orientation-quirks: Add extra quirk table entry for GPD MicroPC 4b30a0698208 firmware: ti_sci: Always request response from firmware 3dfc787f2f50 crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking. e89d4cb6fba3 crypto: talitos - Do not modify req->cryptlen on decryption. 9aff4077304b crypto: talitos - fix ECB algs ivsize c4d7148e2d67 crypto: talitos - check data blocksize in ablkcipher. 02ebbb4f8df8 crypto: talitos - fix CTR alg blocksize 39fa02a36bb3 crypto: talitos - check AES key size e1666bcbae0c driver core: Fix use-after-free and double free on glue directory 72cd230b3231 ubifs: Correctly use tnc_next() in search_dh_cookie() a65290083b66 gpio: fix line flag validation in lineevent_create 0f4095f33557 PCI: Always allow probing with driver_override 70facf939ba2 mtd: rawnand: mtk: Fix wrongly assigned OOB buffer pointer issue 6da56f8982bb clk: rockchip: Don't yell about bad mmc phases when getting a63416f39aaf drm/meson: Add support for XBGR8888 & ABGR8888 formats d9e8b4ba0397 powerpc: Add barrier_nospec to raw_copy_in_user() eb020b77b646 x86/purgatory: Change compiler flags from -mcmodel=kernel to -mcmodel=large to fix kexec relocation errors 73c31bd92039 KVM: nVMX: handle page fault in vmread 6e60900cfa3e KVM: x86: work around leak of uninitialized stack contents 09a9f894c65b KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl 9f8a2825918c KVM: s390: kvm_s390_vm_start_migration: check dirty_bitmap before using it as target for memset() 991b3458da56 genirq: Prevent NULL pointer dereference in resend_irqs() 5b5f14601e0a ixgbe: Prevent u8 wrapping of ITR value to something less than 10us 7cbd49cf0d62 Btrfs: fix assertion failure during fsync and use of stale transaction 22ed1d472811 gpio: fix line flag validation in linehandle_create 705df757e937 gpiolib: acpi: Add gpiolib_acpi_run_edge_events_on_boot option and blacklist 0f4ceb259493 tun: fix use-after-free when register netdev failed 9a4598424e99 tipc: add NULL pointer check before calling kfree_rcu 67fe3b94a833 tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR 7c34a29261ee sctp: use transport pf_retrans in sctp_do_8_2_transport_strike 41b624ff83d2 sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()' a9e91767b921 sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero a7f46e18ecfe net: sched: fix reordering issues 3600a311f83d net: phylink: Fix flow control resolution 821302dd0c51 net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list 88a46756f016 net: Fix null de-reference of device refcount b26f489245b3 ixgbe: Fix secpath usage for IPsec TX offload. 2354e925e361 isdn/capi: check message length in capi_write() ea6ec671c87e ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()' a20c8e4ae48d cdc_ether: fix rndis support for Mediatek based smartphones f57fd58dda42 bridge/mdb: remove wrong use of NLM_F_MULTI db2d0b7c1dde Linux 4.19.73 ba03ee62aed0 vhost: make sure log_num < in_num 569775bd5364 powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts 052bc385f970 powerpc/tm: Remove msr_tm_active() f193e02265aa PCI: Reset both NVIDIA GPU and HDA in ThinkPad P50 workaround ff69322509bb ext4: unsigned int compared against zero 292666d2d868 ext4: fix block validity checks for journal inodes using indirect blocks 97fbf573460e ext4: don't perform block validity checks on the journal inode 1e88a1f874ca drm/atomic_helper: Allow DPMS On<->Off changes for unregistered connectors b1dd1d06b31d virtio/s390: fix race on airq_areas[] 057cdb6f0f47 drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV b113f98432ae bcache: fix race in btree_flush_write() f73c35d92976 bcache: add comments for mutex_lock(&b->write_lock) 7989a5026fd1 bcache: only clear BTREE_NODE_dirty bit when it is set 652993a5aae5 NFSv4: Fix delegation state recovery 5026932adb1a iio: adc: gyroadc: fix uninitialized return code 2e7e7c8f9423 mm/migrate.c: initialize pud_entry in migrate_vma() b8ad18a10f70 i2c: at91: fix clk_offset for sama5d2 4c9170b55f3a i2c: at91: disable TXRDY interrupt after sending data c9c90711ee88 gpio: don't WARN() on NULL descs if gpiolib is disabled a532a120a5cd iommu/iova: Remove stale cached32_node c4fc7cb93e0a powerpc/mm: Limit rma_size to 1TB when running without HV mode 5b9a6ba975c0 ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips 87c3692172da drm/panel: Add support for Armadeus ST0700 Adapt ecf99cdea02d dm thin metadata: check if in fail_io mode when setting needs_check 5e9a2ce6d3b4 pstore: Fix double-free in pstore_mkfile() failure path 192b9af8caf0 resource: fix locking in find_next_iomem_res() 485bcc29a200 resource: Fix find_next_iomem_res() iteration issue 9a80dfccade1 resource: Include resource end in walk_*() interfaces 1c13c9c40e31 btrfs: correctly validate compression type 0ca2688bd7cd RDMA/srp: Accept again source addresses that do not have a port number 9541604735b2 RDMA/srp: Document srp_parse_in() arguments bab0ff2d87db ARM: dts: gemini: Set DIR-685 SPI CS as active low 3a1b79ade460 KVM: PPC: Book3S HV: Fix CR0 setting in TM emulation 3ac718069f7c KVM: PPC: Use ccr field in pt_regs struct embedded in vcpu struct beeeead95b2f KVM: VMX: check CPUID before allowing read/write of IA32_XSS 891011ca564d KVM: VMX: Fix handling of #MC that occurs during VM-Entry 74ce13331db9 KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value 74fd8aae19d9 KVM: x86: optimize check for valid PAT value 812810399999 ceph: use ceph_evict_inode to cleanup inode's resource 42fa0e35d6e0 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec 987564c28e8a cifs: Properly handle auto disabling of serverino option d85e830d8534 scsi: zfcp: fix request object use-after-free in send path causing wrong traces ba8701d2226c staging: wilc1000: fix error path cleanup in wilc_wlan_initialize() 60b856dc1744 scsi: target/iblock: Fix overrun in WRITE SAME emulation ba52842de1ad scsi: target/core: Use the SECTOR_SHIFT constant 17111037fdf0 apparmor: reset pos on failure to unpack for various functions 90ca4912e55d IB/hfi1: Avoid hardlockup with flushlist_lock fa717fc442ff clk: tegra210: Fix default rates for HDA clocks 350503c8982b clk: tegra: Fix maximum audio sync clock for Tegra124/210 acc07941e224 cifs: add spinlock for the openFileList to cifsInodeInfo 1d0648767ccf Btrfs: fix race between block group removal and block group allocation f276beb324cc drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc 7abeffff7bc3 drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2) d5f6539381c7 kvm: Check irqchip mode before assign irqfd 90772cf58838 drm/amdkfd: Add missing Polaris10 ID cacbc85376b6 ARC: mm: SIGSEGV userspace trying to access kernel virtual memory 7edfa9c99d21 ARC: mm: fix uninitialised signal code in do_page_fault 0828438e523e signal/arc: Use force_sig_fault where appropriate fcb2f1e2ea68 dm crypt: move detailed message into debug level 96b44c20e6f0 cifs: smbd: take an array of reqeusts when sending upper layer data 3f27a14b03d8 PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code 842da8fac182 mmc: sdhci-pci: Add support for Intel CML e238e6dc222b blk-mq: free hw queue's resource in hctx's release handler 69409854ba08 dm mpath: fix missing call of path selector type->end_io 0fe097012b6c PCI: Reset Lenovo ThinkPad P50 nvgpu at boot if necessary 5659dfca74d0 PCI: Add macro for Switchtec quirk declarations e4ba157877db dt-bindings: mmc: Add disable-cqe-dcmd property. eb83f9fa10f7 dt-bindings: mmc: Add supports-cqe property 0a0176f93ea9 ARM: dts: qcom: ipq4019: enlarge PCIe BAR range 445a78ea3f90 ARM: dts: qcom: ipq4019: Fix MSI IRQ type df1216d8bc86 ARM: dts: qcom: ipq4019: fix PCI range 2fd4629de519 ext4: protect journal inode's blocks using block_validity f10a92309b83 media: i2c: tda1997x: select V4L2_FWNODE 4061e662c8e9 cifs: Fix lease buffer length error df5d4ea2d8be KVM: x86: Always use 32-bit SMRAM save state for 32-bit kernels 7a74d806bdaa x86/kvm: move kvm_load/put_guest_xcr0 into atomic context 163b24b1a68c kvm: mmu: Fix overflow on kvm mmu page limit calculation feced628c068 IB/mlx5: Reset access mask when looping inside page fault handler 37222eaf7eb7 arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's 3cfce8b77aad usb: typec: tcpm: Try PD-2.0 if sink does not respond to 3.0 source-caps fba4f7c118e4 drm/i915: Sanity check mmap length against object size 6423a2ad5709 drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set 778d626c6af3 CIFS: Fix leaking locked VFS cache pages in writeback retry fb2dabeabb17 CIFS: Fix error paths in writeback code e407b58c3576 drm: add __user attribute to ptr_to_compat() e1a12c3b6f87 PCI: qcom: Don't deassert reset GPIO during probe be905d0f2330 PCI: qcom: Fix error handling in runtime PM support 476ecc14cfdb btrfs: init csum_list before possible free 936690bdd8e6 btrfs: scrub: fix circular locking dependency warning ff55333f5c52 btrfs: scrub: move scrub_setup_ctx allocation out of device_list_mutex 8ba3169dceac btrfs: scrub: pass fs_info to scrub_setup_ctx df7329207870 mmc: renesas_sdhi: Fix card initialization failure in high speed mode 915c9d0a1d68 powerpc/kvm: Save and restore host AMR/IAMR/UAMOR b3f864b88256 spi: spi-gpio: fix SPI_CS_HIGH capability 1d60902a5448 x86/kvmclock: set offset for kvm unstable clock 716b0cfa88a5 iwlwifi: add new card for 9260 series 213566a9b0de iwlwifi: fix devices with PCI Device ID 0x34F0 and 11ac RF modules 2b76fcb6ba62 drm/nouveau: Don't WARN_ON VCPI allocation failures 173b6557fcbc mt76: fix corrupted software generated tx CCMP PN 0d7f329e2431 iio: adc: exynos-adc: Use proper number of channels for Exynos4x12 4e516b721a50 dt-bindings: iio: adc: exynos-adc: Add S5PV210 variant 7f588a7262b3 iio: adc: exynos-adc: Add S5PV210 variant cd490d44150d KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run 687e470e9123 bcache: treat stale && dirty keys as bad keys d1cec665de2c bcache: replace hard coded number with BUCKET_GC_GEN_MAX ee30121fbd78 tpm: Fix some name collisions with drivers/char/tpm.h c207ac66848e mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies 6fd5e50add36 drm/i915/ilk: Fix warning when reading emon_status with no output 2b4f567912ad drm/vblank: Allow dynamic per-crtc max_vblank_count 71f719105462 crypto: ccree - add missing inline qualifier 72eec6b303f4 crypto: ccree - fix resume race condition on init f0e286550af8 IB/uverbs: Fix OOPs upon device disassociation 8c6fb55abf2c ARC: mm: do_page_fault fixes #1: relinquish mmap_sem if signal arrives while handle_mm_fault 96af7d92d8d2 ARC: show_regs: lockdep: re-enable preemption 424b75b79994 media: vim2m: only cancel work if it is for right context be77686f0369 btrfs: Use real device structure to verify dev extent a2790b9939ae btrfs: volumes: Make sure no dev extent is beyond device boundary cfbf227e0591 powerpc/pkeys: Fix handling of pkey state across fork() 2ad95be18995 scsi: megaraid_sas: Use 63-bit DMA addressing 3263f78640cc scsi: megaraid_sas: Add check for reset adapter bit dc4e3ec9d226 scsi: megaraid_sas: Fix combined reply queue mode detection eb124aaa2e85 btrfs: Fix error handling in btrfs_cleanup_ordered_extents 1669d1d2e696 btrfs: Remove extent_io_ops::fill_delalloc 338a528b7922 Btrfs: fix deadlock with memory reclaim during scrub fac803479f60 Btrfs: clean up scrub is_dev_replace parameter d3984e80d7f2 KVM: PPC: Book3S HV: Fix race between kvm_unmap_hva_range and MMU mode switch d88b01d04c6a drm/i915: Cleanup gt powerstate from gem b185bde520d5 drm/i915: Restore sane defaults for KMS on GEM error load f999485109d1 media: vim2m: use cancel_delayed_work_sync instead of flush_schedule_work a7b6f95f3ca6 media: vim2m: use workqueue e432a58d7a0d s390/zcrypt: reinit ap queue state machine during device probe a4f404af3ca8 ARM: davinci: dm644x: define gpio interrupts as separate resources 8d6b2b24ca85 ARM: davinci: dm355: define gpio interrupts as separate resources d31f2b61e7f9 ARM: davinci: dm646x: define gpio interrupts as separate resources 4883e9e66f76 ARM: davinci: dm365: define gpio interrupts as separate resources 0a6c3bdae2c9 ARM: davinci: da8xx: define gpio interrupts as separate resources 016218ef6bb0 drm/amd/dm: Understand why attaching path/tile properties are needed 853dc0759586 drm/amd/pp: Fix truncated clock value when set watermark 5faabd22ed64 powerplay: Respect units on max dcfclk watermark 11bedb2e77a0 Drivers: hv: kvp: Fix the recent regression caused by incorrect clean-up 74ff258346e4 Drivers: hv: kvp: Fix the indentation of some "break" statements e352d8eb9394 drm/atomic_helper: Disallow new modesets on unregistered connectors cff9e1e33151 drm/i915/gen9+: Fix initial readout for Y tiled framebuffers 8ccbb1d24c26 drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE 4b2dfc0e2d44 drm/i915: Fix intel_dp_mst_best_encoder() 796469e361ed x86/kvm/lapic: preserve gfn_to_hva_cache len on cache reinit cdad0f65050e KVM: hyperv: define VP assist page helpers b0d9043bdbe6 KVM: x86: hyperv: keep track of mismatched VP indexes f031fd03e22e KVM: x86: hyperv: consistently use 'hv_vcpu' for 'struct kvm_vcpu_hv' variables 0b535f7b95af KVM: x86: hyperv: enforce vp_index < KVM_MAX_VCPUS 8e91cc7f7f91 drm/amdgpu: Update gc_9_0 golden settings. bcc3bd761ab5 drm/amdgpu/gfx9: Update gfx9 golden settings. 2c2cf2245ff6 remoteproc: qcom: q6v5-mss: add SCM probe dependency 4d9707586ec7 x86, hibernate: Fix nosave_regions setup for hibernation 805e0e46eb54 Drivers: hv: kvp: Fix two "this statement may fall through" warnings 3f3beae22842 keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h bac1c4edb5c4 scsi: qla2xxx: Move log messages before issuing command to firmware 6e087eae89df media: cec: remove cec-edid.c 851308450a8f media: cec/v4l2: move V4L2 specific CEC functions to V4L2 c09d675f294b drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse" 3015291b2fb5 kernel/module: Fix mem leak in module_add_modinfo_attrs 9c49f7811f82 modules: always page-align module section allocations 84ba9ae18fbb remoteproc: qcom: q6v5: shore up resource probe handling 56944c0b9774 clk: s2mps11: Add used attribute to s2mps11_dt_match 480101a4aea2 nvme-fc: use separate work queue to avoid warning 5f147150b753 riscv: remove unused variable in ftrace 8d23872c7539 scripts/decode_stacktrace: match basepath using shell prefix operator, not regex 6c550a5db18f arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64 573370113b24 media: stm32-dcmi: fix irq = 0 case 7f8b23600779 powerpc/64: mark start_here_multiplatform as __ref 85a24825b2e6 x86/ftrace: Fix warning and considate ftrace_jmp_replace() and ftrace_call_replace() b93aed78eb78 selftests: fib_rule_tests: use pre-defined DEV_ADDR 68829256e1f9 timekeeping: Use proper ktime_add when adding nsecs in coarse offset 1aa38eceb6c0 {nl,mac}80211: fix interface combinations on crypto controlled devices 178d1337a527 blk-iolatency: fix STS_AGAIN handling 5f33e81250a6 Blk-iolatency: warn on negative inflight IO counter 91a71a61da8c hv_sock: Fix hang when a connection is closed 86d5ae21d6b8 batman-adv: Only read OGM tvlv_len after buffer len check 4b5fee457723 batman-adv: fix uninit-value in batadv_netlink_get_ifindex() 47a0f70d7d9a powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction 6e7040d65a71 vhost/test: fix build for vhost test - again 4f45483faadf vhost/test: fix build for vhost test dcd22e14780a drm/vmwgfx: Fix double free in vmw_recv_msg() 38d38d1e0cc5 sched/fair: Don't assign runtime for throttled cfs_rq 044ab4715585 ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre 849f85bfdf12 ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL a956998ac1c2 ALSA: hda/realtek - Add quirk for HP Pavilion 15 d11ca2d79334 ALSA: hda/realtek - Fix overridden device-specific initialization 2c4d2ce8b799 ALSA: hda - Fix potential endless loop at applying quirks Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Armin Kuster (cherry picked from commit 611c7d62d67016942323d2fa4f108774c85dce09) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index c55ef50..8e36d9a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine ?= "0e4a79e608e92830693e511a3dd282ce7c3b3f41" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index f4f411d..2af7987 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" -SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine_qemuarm ?= "be50001808f00efee538c2a3e7c0a5a2a2df65da" +SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index fb50586..73f1715 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" -SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" -SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" -SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine_qemuarm ?= "7fde51abcaf389193ce5d87ebfb8e8fb66a9271a" +SRCREV_machine_qemuarm64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemumips ?= "8ac68d42beb24b275ac0d2a54a0a2291970e5dde" +SRCREV_machine_qemuppc ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemux86 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemux86-64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemumips64 ?= "ea2cb8731306f734bf0227575e04cafac7dfade0" +SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:33 +0000 Subject: [oe-commits] [openembedded-core] 12/14: linux-firmware: add PE back In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.A706B2328BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit b1433f396f32c78d6be5633653541ff6375d5220 Author: Oleksandr Kravchuk AuthorDate: Mon Aug 12 18:01:53 2019 +0200 linux-firmware: add PE back Add PE (package epoch) from the previous version of the recipe to avoid problems with package upgrade due to changed versioning scheme. See: http://lists.openembedded.org/pipermail/openembedded-core/2019-August/285633.html Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie (cherry picked from commit 8b6ec55da696087c8ea7bacc042307ee652afd9e) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb index acaca95..9afaad7 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb @@ -190,6 +190,8 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" +PE = "1" + SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:34 +0000 Subject: [oe-commits] [openembedded-core] 13/14: linux-firmware: Upgrade 20190618 -> 20190815 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.B4F332328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 34428eca5f845293b648801bf61957afd249b315 Author: Otavio Salvador AuthorDate: Sat Aug 17 11:48:21 2019 -0300 linux-firmware: Upgrade 20190618 -> 20190815 License-Update: - WHENCE: New firmware files additions and version updates Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton (cherry picked from commit b4c8f2f139d0eeb2ebef3dc5f8309486afdea3d4) Signed-off-by: Armin Kuster --- .../{linux-firmware_20190618.bb => linux-firmware_20190815.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb index 9afaad7..5186388 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb @@ -123,7 +123,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=55814698bbae7c7dd40c9fbde91af0a8 \ + file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -192,7 +192,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" +SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:32 +0000 Subject: [oe-commits] [openembedded-core] 11/14: linux-firmware: bump to 20190618 In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.9A46E2328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 1c16c37e907f4712f40aa70d62c6a526e5228195 Author: Oleksandr Kravchuk AuthorDate: Mon Jul 1 21:11:42 2019 +0200 linux-firmware: bump to 20190618 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie (cherry picked from commit 4cbb7392c729a2436c26308c2320fdae5c450d7a) Signed-off-by: Armin Kuster --- .../{linux-firmware_git.bb => linux-firmware_20190618.bb} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_git.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb index 8b6ad96..acaca95 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb @@ -92,7 +92,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ - file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ + file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ @@ -123,7 +123,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=b6e44adf71bc37e5f26ebfe5a08b5490 \ + file://WHENCE;md5=55814698bbae7c7dd40c9fbde91af0a8 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -190,9 +190,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "711d3297bac870af42088a467459a0634c1970ca" -PE = "1" -PV = "0.0+git${SRCPV}" +SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:35 +0000 Subject: [oe-commits] [openembedded-core] 14/14: linux-firmware: update packaging for brcm files In-Reply-To: <158227868167.22141.10815143790770448112@git.openembedded.org> References: <158227868167.22141.10815143790770448112@git.openembedded.org> Message-ID: <20200221095122.C25502328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. commit 8063a1277433c58a9df43f0185bb89c79f865aa9 Author: Samuli Piippo AuthorDate: Wed Nov 6 09:39:26 2019 +0000 linux-firmware: update packaging for brcm files Add new package for bcm4366c and include available NVRAM config files into the corrent bcm* packages. Signed-off-by: Samuli Piippo Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster (cherry picked from commit 957c3d39b63f57d896ee89d727007ac2ce6672e3) Signed-off-by: Armin Kuster --- .../linux-firmware/linux-firmware_20190815.bb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb index 5186388..d83000b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb @@ -273,6 +273,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm4358 \ ${PN}-bcm43602 \ ${PN}-bcm4366b \ + ${PN}-bcm4366c \ ${PN}-bcm4371 \ ${PN}-bcm4373 \ ${PN}-bcm43xx \ @@ -571,7 +572,7 @@ FILES_${PN}-bcm43xx-hdr = "${nonarch_base_libdir}/firmware/brcm/bcm43xx_hdr-0.fw FILES_${PN}-bcm4329-fullmac = "${nonarch_base_libdir}/firmware/brcm/bcm4329-fullmac-4.bin" FILES_${PN}-bcm43236b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43236b.bin" FILES_${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin" -FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin" +FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin" FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin" FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin" @@ -582,8 +583,8 @@ FILES_${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin FILES_${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \ " -FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.bin" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.bin" +FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" +FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.*" FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin" @@ -594,6 +595,7 @@ FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie. ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \ " FILES_${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.bin" +FILES_${PN}-bcm4366c = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366c-pcie.bin" FILES_${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin" # for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE_\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done @@ -647,6 +649,8 @@ LICENSE_${PN}-bcm43602 = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm43602 += "${PN}-broadcom-license" LICENSE_${PN}-bcm4366b = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm4366b += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4366c = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4366c += "${PN}-broadcom-license" LICENSE_${PN}-bcm4371 = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm4371 += "${PN}-broadcom-license" @@ -656,11 +660,11 @@ LICENSE_${PN}-cypress-license = "Firmware-cypress" FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress" FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd" -FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.bin" -FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.bin" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin" +FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.*" +FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.*" +FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.*" FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin" -FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.bin" +FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.*" FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:29 +0000 Subject: [oe-commits] [openembedded-core] 01/28: webkitgtk: fix reconfigure In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.5D2392328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 090640cff88e21a9588a6f14b1ebb1852d4a3e50 Author: Andreas M?ller AuthorDate: Fri Feb 21 00:48:28 2020 +0100 webkitgtk: fix reconfigure | ln: failed to create symbolic link '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/webkitgtk/2.26.4-r0/recipe-sysroot-native/usr/bin/python': File exists Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 5857237..fa10944 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -61,7 +61,9 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" setup_python_link() { - ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + fi } EXTRA_OECMAKE = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:30 +0000 Subject: [oe-commits] [openembedded-core] 02/28: webkitgtk: enable gobject-introspection for armv7ve - it builds without issues In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.66E2D2328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fc98d7379bf5a01263f4b420cc2167d3704c507c Author: Andreas M?ller AuthorDate: Fri Feb 21 00:48:29 2020 +0100 webkitgtk: enable gobject-introspection for armv7ve - it builds without issues Maybe armv7a can be re-enabled either but due to limited resources there is no chance for me to test. Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index fa10944..a1dba73 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -127,7 +127,6 @@ 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" # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:28 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d771d86 -> 2509886) Message-ID: <158227868892.22605.7410744386866568064@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from d771d86 HACK: extra debug new 090640c webkitgtk: fix reconfigure new fc98d73 webkitgtk: enable gobject-introspection for armv7ve - it builds without issues new aeb5669 bluez5: upgrade 5.52 -> 5.53 new 0498a49 gstreamer1.0: upgrade 1.16.1 -> 1.16.2 new b0bff5c gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 new 8fb00f8 gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 new 7c97981 gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 new af54627 gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 new 47d3852 gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 new 54b4f28 gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 new ff63112 gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 new 8536f9c gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 new f1dee93 gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 new 11828b0 screen: upgrade 4.7.0 -> 4.8.0 new f4c72de stress-ng: upgrade 0.10.16 -> 0.11.00 new f73c726 gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON new eac68ac gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG new 41bbbcd p11-kit: upgrade 0.23.18.1 -> 0.23.20 new d09b77c nspr: upgrade 4.24 -> 4.25 new 25433aa nss: upgrade 3.49.1 -> 3.50 new 4dfc0d9 shadow: upgrade 4.8 -> 4.8.1 new 4f08161 libical: fix host contamination in -dev pkg new 0a3edd4 Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" new 9a51bba dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm new f348c74 liberror-perl: upgrade 0.17028 -> 0.17029 new 606f0d2 ltp: Use upstreamed patch for time64 syscall fixes new a66ea65 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled new 2509886 core-image-sato-sdk-ptest: do not pull in ptest-pkgs The 28 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/reproducible_build_simple.bbclass | 1 - meta/classes/rootfs-postcommands.bbclass | 5 + .../bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} | 4 +- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 + meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + ...or-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 +- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 109 +++++++++++++-------- .../screen/{screen_4.7.0.bb => screen_4.8.0.bb} | 7 +- ...ot-check-for-validity-of-shell-executable.patch | 29 ------ .../shadow/files/CVE-2019-19882.patch | 55 ----------- meta/recipes-extended/shadow/shadow.inc | 6 +- .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} | 0 .../{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} | 4 +- ...ibav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} | 4 +- ....0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} | 4 +- ....16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} | 4 +- ...16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} | 4 +- ...16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} | 13 +-- ...16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} | 4 +- ...hon_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} | 4 +- ....16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} | 4 +- ...aapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} | 4 +- ...treamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} | 4 +- .../images/core-image-sato-sdk-ptest.bb | 2 - meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +- meta/recipes-support/libical/libical_3.0.7.bb | 1 + .../nspr/{nspr_4.24.bb => nspr_4.25.bb} | 4 +- ...a-configure-option-to-disable-ARM-HW-cryp.patch | 4 +- .../nss/{nss_3.49.1.bb => nss_3.50.bb} | 4 +- .../{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 4 +- 31 files changed, 121 insertions(+), 181 deletions(-) rename meta/recipes-connectivity/bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} (91%) rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) rename meta/recipes-extended/screen/{screen_4.7.0.bb => screen_4.8.0.bb} (87%) delete mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch delete mode 100644 meta/recipes-extended/shadow/files/CVE-2019-19882.patch rename meta/recipes-extended/shadow/{shadow_4.8.bb => shadow_4.8.1.bb} (100%) rename meta/recipes-extended/stress-ng/{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} (83%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} (92%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} (98%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} (96%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} (86%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} (88%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} (86%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} (93%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} (95%) rename meta/recipes-support/nspr/{nspr_4.24.bb => nspr_4.25.bb} (97%) rename meta/recipes-support/nss/{nss_3.49.1.bb => nss_3.50.bb} (98%) rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (87%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:31 +0000 Subject: [oe-commits] [openembedded-core] 03/28: bluez5: upgrade 5.52 -> 5.53 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.6DDA92328BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aeb56690f045de80052522e454afcc95204b6cd9 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:16 2020 +0800 bluez5: upgrade 5.52 -> 5.53 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.52.bb b/meta/recipes-connectivity/bluez5/bluez5_5.53.bb similarity index 91% rename from meta/recipes-connectivity/bluez5/bluez5_5.52.bb rename to meta/recipes-connectivity/bluez5/bluez5_5.53.bb index b861030..055e76b 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.52.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.53.bb @@ -1,7 +1,7 @@ require bluez5.inc -SRC_URI[md5sum] = "a33eb9aadf1dd4153420958709d3ce60" -SRC_URI[sha256sum] = "f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a" +SRC_URI[md5sum] = "85b14abb138948f50b1650aa866cb019" +SRC_URI[sha256sum] = "38aa2da8302fefad53116bb281a11968732a42eeb19c5fb3668342f39b7938bc" # noinst programs in Makefile.tools that are conditional on READLINE # support -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:32 +0000 Subject: [oe-commits] [openembedded-core] 04/28: gstreamer1.0: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.76DFF2328BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0498a490506897fd52f84139b67f7dbad8c07f94 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:17 2020 +0800 gstreamer1.0: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../gstreamer/{gstreamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb index d2beafd..50a872e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb @@ -23,8 +23,8 @@ SRC_URI = " \ file://0004-meson-Add-option-for-installed-tests.patch \ file://capfix.patch \ " -SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" -SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" +SRC_URI[md5sum] = "0e661ed5bdf1d8996e430228d022628e" +SRC_URI[sha256sum] = "e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:33 +0000 Subject: [oe-commits] [openembedded-core] 05/28: gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.8046A2328C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b0bff5c25d82802561a8f484b9d7ea7dea623b6a Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:18 2020 +0800 gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...1.0-plugins-base_1.16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb index cf12ceb..6563b6f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb @@ -13,8 +13,8 @@ SRC_URI = " \ file://0005-viv-fb-Make-sure-config.h-is-included.patch \ file://0009-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[md5sum] = "b5eb0651bab70bf1714f103bdd66ce47" -SRC_URI[sha256sum] = "5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b" +SRC_URI[md5sum] = "3fdb32823535799a748c1fc14f978e2c" +SRC_URI[sha256sum] = "b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a" S = "${WORKDIR}/gst-plugins-base-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:34 +0000 Subject: [oe-commits] [openembedded-core] 06/28: gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.8DDD62328C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8fb00f85657baecb85207ae734c45d8ba7e8806b Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:19 2020 +0800 gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...1.0-plugins-good_1.16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index a6eb998..1b4db19 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -4,8 +4,8 @@ SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ " -SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf" -SRC_URI[sha256sum] = "9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f" +SRC_URI[md5sum] = "bd025f8f14974f94b75ac69a9d1b9c93" +SRC_URI[sha256sum] = "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319" S = "${WORKDIR}/gst-plugins-good-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:36 +0000 Subject: [oe-commits] [openembedded-core] 08/28: gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.9EBAE2328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af54627dad718e83e5ae75a9b45f225b9879da5d Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:21 2020 +0800 gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...1.0-plugins-ugly_1.16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb index 30961d0..be10800 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb @@ -9,8 +9,8 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[md5sum] = "668795903cb4971fba9aa89abdea8369" -SRC_URI[sha256sum] = "4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d" +SRC_URI[md5sum] = "10283ff5ef1e34d462dde77042e329bd" +SRC_URI[sha256sum] = "5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca" S = "${WORKDIR}/gst-plugins-ugly-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:35 +0000 Subject: [oe-commits] [openembedded-core] 07/28: gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.965302328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7c979813103ddc5b1c234f3468859da2efe96cfe Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:20 2020 +0800 gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...er1.0-plugins-bad_1.16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb index 024277e..7a227fe 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb @@ -8,8 +8,8 @@ SRC_URI = " \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" -SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" +SRC_URI[md5sum] = "ccc7404230afddec723bbdb63c89feec" +SRC_URI[sha256sum] = "f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74" S = "${WORKDIR}/gst-plugins-bad-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:37 +0000 Subject: [oe-commits] [openembedded-core] 09/28: gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.A748F2328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 47d38527072e1c286c9342b4d90ad51b1a298f8a Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:22 2020 +0800 gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-libav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb index c1bd6b1..2fdefc9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ " -SRC_URI[md5sum] = "58023f4c71bbd711061e350fcd76c09d" -SRC_URI[sha256sum] = "e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4" +SRC_URI[md5sum] = "eacebd0136ede3a9bd3672eeb338806b" +SRC_URI[sha256sum] = "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2" S = "${WORKDIR}/gst-libav-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:38 +0000 Subject: [oe-commits] [openembedded-core] 10/28: gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.B0A872328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 54b4f28d6437c46782a15bf6c9985a8f2f2cd1c4 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:23 2020 +0800 gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb similarity index 92% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb index dfe4b69..f1bdbd2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[md5sum] = "89772e7a277fd0abfc250eaf8e4e9ce9" -SRC_URI[sha256sum] = "cbf54121a2cba575d460833e8132265781252ce32cf5b8f9fa8753e42ab24bb2" +SRC_URI[md5sum] = "6362786d2b6cce34de08c86b7847f782" +SRC_URI[sha256sum] = "11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439" S = "${WORKDIR}/gst-omx-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:39 +0000 Subject: [oe-commits] [openembedded-core] 11/28: gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.BA8E02328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ff63112f2f39df101de4207738968763133416cf Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:24 2020 +0800 gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-python_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb similarity index 88% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb index 0382360..9e024eb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \ file://0001-meson.build-fix-builds-with-python-3.8.patch \ " -SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b" -SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489" +SRC_URI[md5sum] = "6ac709767334d8d0a71cb4e016f6abeb" +SRC_URI[sha256sum] = "208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8" DEPENDS = "gstreamer1.0 python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:41 +0000 Subject: [oe-commits] [openembedded-core] 13/28: gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.CCF172328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f1dee9307b40db45a06a7c4855c1441ec1a167cf Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:26 2020 +0800 gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-vaapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb similarity index 93% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb index a78807c..1bedf25 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb @@ -12,8 +12,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.x file://0001-vaapsink-downgrade-to-marginal.patch \ " -SRC_URI[md5sum] = "15b08f76777359d87b0b4a561db05f1f" -SRC_URI[sha256sum] = "cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a" +SRC_URI[md5sum] = "13f7cb6a64bde24e67f563377487dcce" +SRC_URI[sha256sum] = "191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:40 +0000 Subject: [oe-commits] [openembedded-core] 12/28: gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.C45062328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8536f9cdfda110122637c5daaf4e2b3957d35d8c Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:25 2020 +0800 gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...er1.0-rtsp-server_1.16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb similarity index 86% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb index deac5a9..02c3c83 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb @@ -12,8 +12,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.x file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ " -SRC_URI[md5sum] = "380d6a42e856c32fcefa508ad57129e0" -SRC_URI[sha256sum] = "b0abacad2f86f60d63781d2b24443c5668733e8b08664bbef94124906d700144" +SRC_URI[md5sum] = "8a998725820c771ba45be6e18bfdf73a" +SRC_URI[sha256sum] = "de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e" S = "${WORKDIR}/${PNREAL}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:42 +0000 Subject: [oe-commits] [openembedded-core] 14/28: screen: upgrade 4.7.0 -> 4.8.0 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.D5DC92328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 11828b03a808f3fc78b9b558c8b14dfa722bb517 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:27 2020 +0800 screen: upgrade 4.7.0 -> 4.8.0 License-Update: Change http to https in license text. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-extended/screen/{screen_4.7.0.bb => screen_4.8.0.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/screen/screen_4.7.0.bb b/meta/recipes-extended/screen/screen_4.8.0.bb similarity index 87% rename from meta/recipes-extended/screen/screen_4.7.0.bb rename to meta/recipes-extended/screen/screen_4.8.0.bb index 67aa5f1..4772eb6 100644 --- a/meta/recipes-extended/screen/screen_4.7.0.bb +++ b/meta/recipes-extended/screen/screen_4.8.0.bb @@ -9,7 +9,8 @@ SECTION = "console/utils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://screen.h;endline=26;md5=3971142989289a8198a544220703c2bf" + file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ + " DEPENDS = "ncurses virtual/crypt \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -22,8 +23,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[md5sum] = "b8971ebd68d046f2814d1040cb8e6641" -SRC_URI[sha256sum] = "da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1" +SRC_URI[md5sum] = "d276213d3acd10339cd37848b8c4ab1e" +SRC_URI[sha256sum] = "6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1" inherit autotools texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:43 +0000 Subject: [oe-commits] [openembedded-core] 15/28: stress-ng: upgrade 0.10.16 -> 0.11.00 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.DED3E2328BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f4c72dea699543904c9f22dc3ca4c5c3cd668821 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:28 2020 +0800 stress-ng: upgrade 0.10.16 -> 0.11.00 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb index e67b82a..c8471eb 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ " -SRC_URI[md5sum] = "a337cd5b1412c53c580e95ee2a9fc77b" -SRC_URI[sha256sum] = "eabfffcffcf53e67765181280456c204ad00214339cfdb3ee2769d58b4a7e304" +SRC_URI[md5sum] = "781f8a0f8509a01793d815210086e78a" +SRC_URI[sha256sum] = "a41a6a4a7ea4e50aab7331e5594af7d1b3b6e5815751d137a78a6e166295294e" DEPENDS = "coreutils-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:44 +0000 Subject: [oe-commits] [openembedded-core] 16/28: gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.E73DC2328BD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f73c726c9404f94b7b71ee4152f8a2561311f574 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:41:57 2020 +0800 gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON Use the correct variable so options actually get used and use the correct qt option name to prevent errors. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index 1b4db19..f3e0cee 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig # in a gstreamer1.0-plugins-good bbappend). -EXTRA_OECONF += " \ +EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ -Ddv=disabled \ @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt=disabled \ + -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:45 +0000 Subject: [oe-commits] [openembedded-core] 17/28: gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095129.F0CCD2328BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eac68ac17358c1a1e8be6c73d6fb595a2e206881 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:41:58 2020 +0800 gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG Instead of disabling unconditionally, add PACKAGECONFIG for qt5. Imported from meta-qt5 layer. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index f3e0cee..8b34111 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -42,6 +42,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" +PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native" PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" @@ -50,11 +51,6 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" -# qt5 support is disabled, because it is not present in OE core, and requires more work than -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). -# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig -# in a gstreamer1.0-plugins-good bbappend). - EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ @@ -64,7 +60,6 @@ EXTRA_OEMESON += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:46 +0000 Subject: [oe-commits] [openembedded-core] 18/28: p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.057152328BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41bbbcd14538eb6a868dcabd2e78e360b05ce680 Author: Alexander Kanavin AuthorDate: Fri Feb 21 10:27:29 2020 +0100 p11-kit: upgrade 0.23.18.1 -> 0.23.20 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 87% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec..54b8cc6 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -2,14 +2,14 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit meson gettext pkgconfig gtk-doc +inherit meson gettext pkgconfig gtk-doc bash-completion DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:47 +0000 Subject: [oe-commits] [openembedded-core] 19/28: nspr: upgrade 4.24 -> 4.25 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.1246D2328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d09b77c1d7deb91e7e0c66f2ae842c2d74dba4a6 Author: Wang Mingyu AuthorDate: Fri Feb 21 02:09:39 2020 -0800 nspr: upgrade 4.24 -> 4.25 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/nspr/{nspr_4.24.bb => nspr_4.25.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/nspr/nspr_4.24.bb b/meta/recipes-support/nspr/nspr_4.25.bb similarity index 97% rename from meta/recipes-support/nspr/nspr_4.24.bb rename to meta/recipes-support/nspr/nspr_4.25.bb index e98fe83..1de26e1 100644 --- a/meta/recipes-support/nspr/nspr_4.24.bb +++ b/meta/recipes-support/nspr/nspr_4.25.bb @@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "d630c2111e1db6d2ec2069aad22b4121" -SRC_URI[sha256sum] = "90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0" +SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" +SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" CVE_PRODUCT = "netscape_portable_runtime" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:48 +0000 Subject: [oe-commits] [openembedded-core] 20/28: nss: upgrade 3.49.1 -> 3.50 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.1B5C02328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 25433aaaf4ab2c1e39ac6123bcd504d5c3f4425f Author: Wang Mingyu AuthorDate: Fri Feb 21 02:09:40 2020 -0800 nss: upgrade 3.49.1 -> 3.50 refresh the following patch: 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch | 4 ++-- meta/recipes-support/nss/{nss_3.49.1.bb => nss_3.50.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index 803c06b..c380c14 100644 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -42,8 +42,8 @@ Signed-off-by: Alexander Kanavin /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -28,6 +29,7 @@ - * that compiler uses -mfpu=neon only. */ +@@ -25,6 +26,7 @@ + /* We don't test on big endian platform, so disable this on big endian. */ #define USE_ARM_GCM #endif +#endif diff --git a/meta/recipes-support/nss/nss_3.49.1.bb b/meta/recipes-support/nss/nss_3.50.bb similarity index 98% rename from meta/recipes-support/nss/nss_3.49.1.bb rename to meta/recipes-support/nss/nss_3.50.bb index b16ade9..e9855d7 100644 --- a/meta/recipes-support/nss/nss_3.49.1.bb +++ b/meta/recipes-support/nss/nss_3.50.bb @@ -34,8 +34,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[md5sum] = "6b92ac02dcf9e9e44df5390f6814c157" -SRC_URI[sha256sum] = "d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e" +SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37" +SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:55 +0000 Subject: [oe-commits] [openembedded-core] 27/28: libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.659C92328C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a66ea657cc9cf2c4937672248be93e4b8bcd30f3 Author: Khem Raj AuthorDate: Thu Feb 20 08:53:17 2020 -0800 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb index 502f4e0..265a27c 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "rpm" +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:49 +0000 Subject: [oe-commits] [openembedded-core] 21/28: shadow: upgrade 4.8 -> 4.8.1 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.2415E2328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4dfc0d963884dcf198eab2c0aa10e28036c630cd Author: Wang Mingyu AuthorDate: Fri Feb 21 02:09:15 2020 -0800 shadow: upgrade 4.8 -> 4.8.1 0001-Do-not-check-for-validity-of-shell-executable.patch CVE-2019-19882.patch Removed since they are included in 4.8.1. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...ot-check-for-validity-of-shell-executable.patch | 29 ------------ .../shadow/files/CVE-2019-19882.patch | 55 ---------------------- meta/recipes-extended/shadow/shadow.inc | 6 +-- .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} | 0 4 files changed, 2 insertions(+), 88 deletions(-) diff --git a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch b/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch deleted file mode 100644 index 2d15ff0..0000000 --- a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Dec 2019 19:28:48 +0100 -Subject: [PATCH] Do not check for validity of shell executable. - -This kind of check fails when building a rootfs. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - src/useradd.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 4af0f7c..898fe02 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv) - if ( ( !VALID (optarg) ) - || ( ('\0' != optarg[0]) - && ('/' != optarg[0]) -- && ('*' != optarg[0]) ) -- || (stat(optarg, &st) != 0) -- || (S_ISDIR(st.st_mode)) -- || (access(optarg, X_OK) != 0)) { -+ && ('*' != optarg[0]) )) { - fprintf (stderr, - _("%s: invalid shell '%s'\n"), - Prog, optarg); diff --git a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch b/meta/recipes-extended/shadow/files/CVE-2019-19882.patch deleted file mode 100644 index 894d867..0000000 --- a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 66b7bc0dcfda12d7f58eba993bd02872cae1d713 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 16 Dec 2019 14:11:23 -0500 -Subject: [PATCH] Don't auto-enable ACCT_TOOLS_SETUID if PAM is detected - -Here's a sad story: - -* 70971457 is merged into shadow, allowing newgidmap/newuidmap to be -installed with file caps rather than setuid. -* https://bugs.archlinux.org/task/63248 is filed to take advantage of -this. -* The arch maintainer of the 'shadow' package notices that this doesn't -work, and submits a pull request to fix this in shadow. -* edf7547ad5 is merged, fixing the post install hooks. - -The problem here is that distros have been building shadow with PAM for -O(years), but the install hooks have silently failed due to the -combination of the directory mismatch (suidubins vs suidsbins) and later -success with setuid'ing newgidmap/newuidmap. - -With the install hooks fixed, those of us (Arch[1] and Gentoo[2] so far) -who never built shadow explicitly with --enable-account-tools-setuid are -now getting setuid account tools, and don't have PAM configuration -suitable for use with setuid account management tools. - -It's entirely unclear to me why you'd want this, but I assume there's -some reason out there for it existing. Regardless, setuid binaries are -dangerous and shouldn't be enabled by default without good reason. - -[1] https://bugs.archlinux.org/task/64836 -[2] https://bugs.gentoo.org/702252 - -Upstream-Status: Backport -CVE: CVE-2019-19882 -Signed-off-by: Li Zhou ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e3ed3b43..d6e2bfbd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,7 @@ AC_ARG_ENABLE(account-tools-setuid, - *) AC_MSG_ERROR(bad value ${enableval} for --enable-account-tools-setuid) - ;; - esac], -- [enable_acct_tools_setuid="maybe"] -+ [enable_acct_tools_setuid="no"] - ) - - AC_ARG_ENABLE(utmpx, --- -2.17.1 - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 3bfa39e..f86e5e0 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -13,7 +13,6 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}. file://shadow-4.1.3-dots-in-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ - file://CVE-2019-19882.patch \ " SRC_URI_append_class-target = " \ @@ -25,14 +24,13 @@ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://0001-Do-not-check-for-validity-of-shell-executable.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" -SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4" +SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480" +SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ diff --git a/meta/recipes-extended/shadow/shadow_4.8.bb b/meta/recipes-extended/shadow/shadow_4.8.1.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.8.bb rename to meta/recipes-extended/shadow/shadow_4.8.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:56 +0000 Subject: [oe-commits] [openembedded-core] 28/28: core-image-sato-sdk-ptest: do not pull in ptest-pkgs In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.713F12328BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2509886b413e23b85d7dfb70e62756af33901116 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:40 2020 +0100 core-image-sato-sdk-ptest: do not pull in ptest-pkgs The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; specifying 'ptests-pkgs' also pulls in additional ptests that are specifically excluded from those lists due to causing issues with ptesting. (particularly bash-ptest is one such item) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 85b5adb..58c257c 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" - PROVIDES += "core-image-sato-ptest" # Also include ptests which may not otherwise be included in a sato image -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:50 +0000 Subject: [oe-commits] [openembedded-core] 22/28: libical: fix host contamination in -dev pkg In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.2C4192328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4f08161ccb72533902f6c2688b777545692e154f Author: Sakib Sajal AuthorDate: Thu Feb 20 14:02:47 2020 -0800 libical: fix host contamination in -dev pkg [YOCTO #13512] Signed-off-by: Sakib Sajal Signed-off-by: Richard Purdie --- meta/recipes-support/libical/libical_3.0.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/libical/libical_3.0.7.bb b/meta/recipes-support/libical/libical_3.0.7.bb index ac9c114..a50473e 100644 --- a/meta/recipes-support/libical/libical_3.0.7.bb +++ b/meta/recipes-support/libical/libical_3.0.7.bb @@ -40,5 +40,6 @@ do_install_append () { # Remove build host references sed -i \ -e 's,${STAGING_LIBDIR},${libdir},g' \ + -e 's,${STAGING_INCDIR},${includedir},g' \ ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:51 +0000 Subject: [oe-commits] [openembedded-core] 23/28: Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.34DA92328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0a3edd43060f8292138b228124daef0937f9d942 Author: Peter Kjellerstedt AuthorDate: Sun Feb 9 07:06:58 2020 +0100 Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" This reverts commit 8380df6566db49ef184b837432558750f77f592f. Giving BUILDNAME a static default in reproducible_build_simple.bbclass to have /etc/version be generated with that name lead to other users of BUILDNAME no longer working as expected. E.g., buildstats.bcclass would now write its information in a single directory, overwriting the statistics for each build. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build_simple.bbclass | 1 - meta/classes/rootfs-postcommands.bbclass | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 3e5fd82..3933729 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -7,4 +7,3 @@ export PERL_HASH_SEED = "0" export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" -BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index b2eada5..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -356,6 +356,11 @@ python rootfs_log_check_recommends() { # Perform any additional adjustments needed to make rootf binary reproducible rootfs_reproducible () { if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" != "" ]; then + # Convert UTC into %4Y%2m%2d%2H%2M%2S + sformatted=`date -u -d @${REPRODUCIBLE_TIMESTAMP_ROOTFS} +%4Y%2m%2d%2H%2M%2S` + echo $sformatted > ${IMAGE_ROOTFS}/etc/version + bbnote "rootfs_reproducible: set /etc/version to $sformatted" + if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \ sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:52 +0000 Subject: [oe-commits] [openembedded-core] 24/28: dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.3E40A2328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9a51bbaa1b71501e429154787ae018c4063fd128 Author: Khem Raj AuthorDate: Thu Feb 20 13:09:52 2020 -0800 dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm dnf depends on libsolv, and libsolv does not have and easy way to jusr enable rpmdb support, it either has full rpm or nothing, perhaps it could be improved in libsolv and we can use that but from now we have no other option dnf support only rpm backend and wont work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f..f6e616e 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435..d498347 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:53 +0000 Subject: [oe-commits] [openembedded-core] 25/28: liberror-perl: upgrade 0.17028 -> 0.17029 In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.482DC2328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f348c7409da18ac95f89c5d048b3a6bfb8c23f7f Author: Tim Orling AuthorDate: Thu Feb 20 13:23:15 2020 -0800 liberror-perl: upgrade 0.17028 -> 0.17029 Upstream release notes: " 0.17029 2020-01-28 - Rebuild for order of 'NAME' and 'VERSION' sections in the generated POD documentation (see 0.001004 in https://metacpan.org/changes/distribution/Pod-Weaver-PluginBundle-SHLOMIF ). - VERSION used to appear before NAME. " Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb similarity index 89% rename from meta/recipes-devtools/perl/liberror-perl_0.17028.bb rename to meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 8c6bbcb..038808f 100644 --- a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb +++ b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -32,8 +32,8 @@ RDEPENDS_${PN}-ptest += " \ SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz" -SRC_URI[md5sum] = "ec3522c60a43a368f19c0f89e2205cb1" -SRC_URI[sha256sum] = "3ad85c5e58b31c8903006298424a51bba39f1840e324f5ae612eabc8b935e960" +SRC_URI[md5sum] = "6732b1c6207e4a9a3e2987c88368039a" +SRC_URI[sha256sum] = "1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc" S = "${WORKDIR}/Error-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 09:51:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 09:51:54 +0000 Subject: [oe-commits] [openembedded-core] 26/28: ltp: Use upstreamed patch for time64 syscall fixes In-Reply-To: <158227868892.22605.7410744386866568064@git.openembedded.org> References: <158227868892.22605.7410744386866568064@git.openembedded.org> Message-ID: <20200221095130.577E12328C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 606f0d216ddeb41bd7a91b9bdef2bb38dc6c5a8a Author: Khem Raj AuthorDate: Thu Feb 20 08:50:50 2020 -0800 ltp: Use upstreamed patch for time64 syscall fixes Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 109 +++++++++++++-------- 1 file changed, 66 insertions(+), 43 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index 92e5fdf..c431669 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,4 +1,4 @@ -From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Feb 2020 22:22:17 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them @@ -7,75 +7,98 @@ musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj --- - lib/tst_clocks.c | 9 +++++++++ - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ - 3 files changed, 17 insertions(+) + lib/tst_clocks.c | 9 +++++---- + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 10 insertions(+), 13 deletions(-) -diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c -index 35798a4aaf..6a5b05c4ea 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -28,15 +28,24 @@ +@@ -22,21 +22,22 @@ + #define _GNU_SOURCE + #include + #include +-#include +- ++#define TST_NO_DEFAULT_MAIN ++#include "tst_test.h" + #include "tst_clocks.h" ++#include "lapi/syscalls.h" int tst_clock_getres(clockid_t clk_id, struct timespec *res) { -+#if defined(__NR_clock_getres) - return syscall(SYS_clock_getres, clk_id, res); -+#endif -+ return -1; +- return syscall(SYS_clock_getres, clk_id, res); ++ return tst_syscall(__NR_clock_getres, clk_id, res); } int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) { -+#if defined(__NR_clock_gettime) - return syscall(SYS_clock_gettime, clk_id, ts); -+#endif -+ return -1; +- return syscall(SYS_clock_gettime, clk_id, ts); ++ return tst_syscall(__NR_clock_gettime, clk_id, ts); } int tst_clock_settime(clockid_t clk_id, struct timespec *ts) { -+#if defined(__NR_clock_settime) - return syscall(SYS_clock_settime, clk_id, ts); -+#endif -+ return -1; +- return syscall(SYS_clock_settime, clk_id, ts); ++ return tst_syscall(__NR_clock_settime, clk_id, ts); } -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -index 583d8f7b9b..b498de5b68 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -@@ -41,7 +41,11 @@ - #include +@@ -38,10 +38,8 @@ + #include + #include + #include "test.h" +-#include #include - -+#ifdef __NR_gettimeofday - #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#else -+#define gettimeofday(a,b) (-1) -+#endif +- +-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#include "lapi/syscalls.h" char *TCID = "gettimeofday01"; int TST_TOTAL = 1; -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -index 1d60f448e8..218e017df8 100644 +@@ -63,7 +61,7 @@ int main(int ac, char **av) + for (lc = 0; TEST_LOOPING(lc); lc++) { + tst_count = 0; + +- TEST(gettimeofday((void *)-1, (void *)-1)); ++ TEST(ltp_syscall(__NR_gettimeofday, (void *)-1, (void *)-1)); + + /* gettimeofday returns an int, so we need to turn the long + * TEST_RETURN into an int to test with */ --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -@@ -23,7 +23,11 @@ +@@ -16,14 +16,12 @@ + #include + #include + #include +-#include + #include + #include + #include #include "tst_test.h" - -+#ifdef __NR_gettimeofday - #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#else -+#define gettimeofday(a,b) (-1) -+#endif +- +-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#include "lapi/syscalls.h" static volatile sig_atomic_t done; static char *str_rtime; --- -2.25.0 - +@@ -48,13 +46,13 @@ static void verify_gettimeofday(void) + + alarm(rtime); + +- if (gettimeofday(&tv1, NULL)) { ++ if (tst_syscall(__NR_gettimeofday, &tv1, NULL)) { + tst_res(TBROK | TERRNO, "gettimeofday() failed"); + return; + } + + while (!done) { +- if (gettimeofday(&tv2, NULL)) { ++ if (tst_syscall(__NR_gettimeofday, &tv2, NULL)) { + tst_res(TBROK | TERRNO, "gettimeofday() failed"); + return; + } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 10:35:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 10:35:37 +0000 Subject: [oe-commits] [openembedded-core] branch warrior updated: build-appliance-image: Update to warrior head revision Message-ID: <158228133724.15074.15156430983099899915@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch warrior in repository openembedded-core. The following commit(s) were added to refs/heads/warrior by this push: new ca019ee build-appliance-image: Update to warrior head revision ca019ee is described below commit ca019eec1304ca2a400ea744c0eaafe0a766d5d1 Author: Richard Purdie AuthorDate: Fri Feb 21 10:35:22 2020 +0000 build-appliance-image: Update to warrior head revision Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index a17c51e..20a71ad 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,7 +22,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "d0f73121551dc98f6924cd77952bf9ebf5ef3dd7" +SRCREV ?= "83e9841bb832c0e68b3b34e64166234ad09155b9" SRC_URI = "git://git.yoctoproject.org/poky;branch=warrior \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:26:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:26:56 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (696408c -> 19f6227) Message-ID: <158230241641.15506.12618026108617692068@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from 696408c pm-graph: Provide analyze-suspend as well add 876f4ce meta-oe: master: remmina - use PACKAGECONFIG for spice add ff54337 quagga: fix tmpfiles snippet to refer to /run instead of /var/run add 28a3bbf quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d add c58d9d5 fio: remove disabling of compiler optimizations add 90d73b1 mbedtls: add native and nativesdk to BBCLASSEXTEND add 883966a libzip: upgrade 1.6.0 -> 1.6.1 add fd53a1a net-snmp: Add pkgconfig file support add 0845f5f libpeas: upgrade 1.24.1 -> 1.25.3 add 0daeae1 makedumpfile: upgrade 1.6.6 -> 1.6.7 add 7d242bc python3-grpcio: fix do_compile error for native add 6902dcd s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher add 7449a3e s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes add 59daa12 libcamera: Bumped to latest source revision add 19f6227 syslog-ng: Remove config nag on boot No new revisions were added by this update. Summary of changes: ...n-import-python3-to-use-also-from-sysroot.patch | 61 -- .../recipes-multimedia/libcamera/libcamera.bb | 5 +- .../recipes-connectivity/mbedtls/mbedtls_2.16.3.bb | 2 + ...fig-support-for-building-applications-and.patch | 170 ++++++ .../recipes-protocols/net-snmp/net-snmp_5.8.bb | 1 + .../recipes-protocols/quagga/quagga.inc | 8 +- meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 - .../packagegroups/packagegroup-meta-oe.bb | 8 +- .../libzip/{libzip_1.6.0.bb => libzip_1.6.1.bb} | 4 +- .../{libpeas_1.24.1.bb => libpeas_1.25.3.bb} | 4 +- ...0001-makedumpfile-replace-hardcode-CFLAGS.patch | 6 +- ...e-libebl-from-required-libraries-during-l.patch | 34 -- ...makedumpfile_1.6.6.bb => makedumpfile_1.6.7.bb} | 5 +- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +- .../files/0001-ppt.c-Do-not-include-sys-io.h.patch | 28 - .../samsung-soc-utils/s3c24xx-gpio_svn.bb | 22 - .../samsung-soc-utils/s3c64xx-gpio_svn.bb | 21 - .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 40 -- .../syslog-ng/files/syslog-ng.conf.systemd | 2 +- .../syslog-ng/files/syslog-ng.conf.sysvinit | 2 +- .../usbpath/usbpath/configure.patch | 11 - meta-oe/recipes-support/usbpath/usbpath_svn.bb | 21 - .../0001-makefile-Pass-CFLAGS-to-compile.patch | 26 - .../0002-fix-err-API-to-have-format-string.patch | 656 --------------------- meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb | 25 - ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 6 +- .../python/python3-grpcio_1.27.1.bb | 4 +- 27 files changed, 203 insertions(+), 980 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/libcamera/files/0001-meson-import-python3-to-use-also-from-sysroot.patch create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-pkg-config-support-for-building-applications-and.patch rename meta-oe/recipes-extended/libzip/{libzip_1.6.0.bb => libzip_1.6.1.bb} (77%) rename meta-oe/recipes-gnome/libpeas/{libpeas_1.24.1.bb => libpeas_1.25.3.bb} (80%) delete mode 100644 meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch rename meta-oe/recipes-kernel/makedumpfile/{makedumpfile_1.6.6.bb => makedumpfile_1.6.7.bb} (88%) delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb delete mode 100644 meta-oe/recipes-support/usbpath/usbpath/configure.patch delete mode 100644 meta-oe/recipes-support/usbpath/usbpath_svn.bb delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:46 +0000 Subject: [oe-commits] [meta-openembedded] 01/15: spdlog: Update 1.3.1 to v1.5.0 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165045.D26802328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 476071913bcc18147f39fec8bc613967a4c2fb63 Author: Nicolas SALMIN AuthorDate: Tue Feb 18 15:09:04 2020 +0100 spdlog: Update 1.3.1 to v1.5.0 Please see https://github.com/gabime/spdlog/releases/tag/v1.5.0 Signed-off-by: Nicolas SALMIN Signed-off-by: Khem Raj --- meta-oe/recipes-support/spdlog/{spdlog_1.3.1.bb => spdlog_1.5.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb similarity index 92% rename from meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb rename to meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb index 91e3f67..39629cc 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "a7148b718ea2fabb8387cb90aee9bf448da63e65" +SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:47 +0000 Subject: [oe-commits] [meta-openembedded] 02/15: libmicrohttpd: upgrade 0.9.69 -> 0.9.70 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165045.DF6E62328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e4f390005952885ec8daf4015633f6ef1e195746 Author: Zang Ruochen AuthorDate: Fri Feb 21 16:37:32 2020 +0800 libmicrohttpd: upgrade 0.9.69 -> 0.9.70 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../{libmicrohttpd_0.9.69.bb => libmicrohttpd_0.9.70.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.69.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb similarity index 86% rename from meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.69.bb rename to meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb index 4daeaf7..94976d2 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.69.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb @@ -8,8 +8,8 @@ DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "3ce03db1f10007517cecf05e040069af" -SRC_URI[sha256sum] = "fb9b6b148b787493e637d3083588711e65cbcb726fa02cee2cd543c5de27e37e" +SRC_URI[md5sum] = "dcd6045ecb4ea18c120afedccbd1da74" +SRC_URI[sha256sum] = "90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307" inherit autotools lib_package pkgconfig gettext -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:48 +0000 Subject: [oe-commits] [meta-openembedded] 03/15: log4cpp: upgrade 1.1.2 -> 1.1.3 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165045.EC96A2328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 87c2895d2fd4b3717cec85bce47e96cff0f3ff47 Author: Zang Ruochen AuthorDate: Fri Feb 21 16:37:33 2020 +0800 log4cpp: upgrade 1.1.2 -> 1.1.3 Due to version update, SRC_URI has been modified. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../recipes-support/log4cpp/{log4cpp_1.1.2.bb => log4cpp_1.1.3.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb similarity index 68% rename from meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb rename to meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb index 19b9446..c6f9404 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb @@ -3,12 +3,11 @@ HOMEPAGE = "http://sourceforge.net/projects/log4cpp/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -PRC = "rc5" -SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}${PRC}.tar.gz \ +SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " -SRC_URI[md5sum] = "58b4591a2f3e7ef3d5e3e7cfb3a81a62" -SRC_URI[sha256sum] = "a611d99a20af6676c60219762771c0bfac90f4879bbde70038ece75338b588ec" +SRC_URI[md5sum] = "b9e2cee932da987212f2c74b767b4d8b" +SRC_URI[sha256sum] = "2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d" S = "${WORKDIR}/${BPN}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:45 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (2f8560b -> 9d32796) Message-ID: <158230384534.30942.15658913284359541243@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 2f8560b oprofile: Fix build with bfd 2.34+ new 4760719 spdlog: Update 1.3.1 to v1.5.0 new e4f3900 libmicrohttpd: upgrade 0.9.69 -> 0.9.70 new 87c2895 log4cpp: upgrade 1.1.2 -> 1.1.3 new 4e9f1a2 openldap: upgrade 2.4.48 -> 2.4.49 new 89efe60 snappy: upgrade 1.1.7 -> 1.1.8 new 2b88bf3 ttf-hunkyfonts: upgrade 0.3.0 -> 0.3.1 new 90a1362 libio-socket-ssl-perl: upgrade 2.066 -> 2.067 new 664f8e1 php: Security Advisory - php - CVE-2020-7059 new 7ed78ec Ply: Add recipe for git version new a9fa588 meta-oe: onig: avoid using 'install' with both -D and -t options new 764e279 sshfs-fuse: 3.6.0 -> 3.7.0 new 5935d68 crash: upgrade 7.2.7 -> 7.2.8 new 468547e kpatch: upgrade 0.8.0 -> 0.9.0 new ff9fdba uftrace: upgrade 0.9.3 -> 0.9.4 new 9d32796 oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2f8560b) \ N -- N -- N refs/heads/master-next (9d32796) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../{sshfs-fuse_3.6.0.bb => sshfs-fuse_3.7.0.bb} | 2 +- .../recipes-devtools/php/php/CVE-2020-7059.patch | 86 ++++++++++++++++++++++ meta-oe/recipes-devtools/php/php_7.3.11.bb | 1 + meta-oe/recipes-devtools/ply/ply_git.bb | 38 ++++++++++ .../uftrace/{uftrace_0.9.3.bb => uftrace_0.9.4.bb} | 4 +- .../snappy/{snappy_1.1.7.bb => snappy_1.1.8.bb} | 6 +- ...hunkyfonts_0.3.0.bb => ttf-hunkyfonts_0.3.1.bb} | 6 +- .../crash/{crash_7.2.7.bb => crash_7.2.8.bb} | 2 +- ...tch-build-allow-overriding-of-distro-name.patch | 6 +- meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 +- ...icrohttpd_0.9.69.bb => libmicrohttpd_0.9.70.bb} | 4 +- .../log4cpp/{log4cpp_1.1.2.bb => log4cpp_1.1.3.bb} | 7 +- meta-oe/recipes-support/onig/onig_6.9.4.bb | 3 +- .../openldap/openldap/kill-icu.patch | 30 -------- .../{openldap_2.4.48.bb => openldap_2.4.49.bb} | 7 +- .../spdlog/{spdlog_1.3.1.bb => spdlog_1.5.0.bb} | 2 +- ...erl_2.066.bb => libio-socket-ssl-perl_2.067.bb} | 4 +- 17 files changed, 153 insertions(+), 59 deletions(-) rename meta-filesystems/recipes-filesystems/sshfs-fuse/{sshfs-fuse_3.6.0.bb => sshfs-fuse_3.7.0.bb} (88%) create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2020-7059.patch create mode 100644 meta-oe/recipes-devtools/ply/ply_git.bb rename meta-oe/recipes-devtools/uftrace/{uftrace_0.9.3.bb => uftrace_0.9.4.bb} (94%) rename meta-oe/recipes-extended/snappy/{snappy_1.1.7.bb => snappy_1.1.8.bb} (69%) rename meta-oe/recipes-graphics/ttf-fonts/{ttf-hunkyfonts_0.3.0.bb => ttf-hunkyfonts_0.3.1.bb} (68%) rename meta-oe/recipes-kernel/crash/{crash_7.2.7.bb => crash_7.2.8.bb} (98%) rename meta-oe/recipes-support/libmicrohttpd/{libmicrohttpd_0.9.69.bb => libmicrohttpd_0.9.70.bb} (86%) rename meta-oe/recipes-support/log4cpp/{log4cpp_1.1.2.bb => log4cpp_1.1.3.bb} (68%) delete mode 100644 meta-oe/recipes-support/openldap/openldap/kill-icu.patch rename meta-oe/recipes-support/openldap/{openldap_2.4.48.bb => openldap_2.4.49.bb} (97%) rename meta-oe/recipes-support/spdlog/{spdlog_1.3.1.bb => spdlog_1.5.0.bb} (92%) rename meta-perl/recipes-perl/libio/{libio-socket-ssl-perl_2.066.bb => libio-socket-ssl-perl_2.067.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:49 +0000 Subject: [oe-commits] [meta-openembedded] 04/15: openldap: upgrade 2.4.48 -> 2.4.49 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.0424C2328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4e9f1a2338caae127f77badac6c0ae81e053c42b Author: Zang Ruochen AuthorDate: Fri Feb 21 16:37:34 2020 +0800 openldap: upgrade 2.4.48 -> 2.4.49 -License-Update: Copyright year updated to 2020. -openldap/kill-icu.patch Removed since this is included in 2.4.49. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../openldap/openldap/kill-icu.patch | 30 ---------------------- .../{openldap_2.4.48.bb => openldap_2.4.49.bb} | 7 +++-- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch deleted file mode 100644 index 35e4646..0000000 --- a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marcin Juszkiewicz - -slapd depends on ICU if it was built first. - -Upstream-Status: inappropiate [embedded specific] ---- - configure.in | 8 -------- - 1 file changed, 8 deletions(-) - ---- openldap-2.4.23.orig/configure.in -+++ openldap-2.4.23/configure.in -@@ -2045,18 +2045,10 @@ if test $ol_enable_ndb != no ; then - SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)" - fi - fi - - dnl ---------------------------------------------------------------- --dnl International Components for Unicode --OL_ICU --if test "$ol_icu" = no ; then -- AC_MSG_WARN([ICU not available]) --else -- ICU_LIBS="$ol_icu" --fi --dnl ---------------------------------------------------------------- - dnl - dnl Check for Cyrus SASL - dnl - WITH_SASL=no - ol_link_sasl=no diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.48.bb b/meta-oe/recipes-support/openldap/openldap_2.4.49.bb similarity index 97% rename from meta-oe/recipes-support/openldap/openldap_2.4.48.bb rename to meta-oe/recipes-support/openldap/openldap_2.4.49.bb index ecc219d..670c704 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.48.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.49.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ad914c35f97b468f421f8ac0f3d821f4 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " SECTION = "libs" @@ -16,7 +16,6 @@ LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ file://openldap-m4-pthread.patch \ - file://kill-icu.patch \ file://openldap-2.4.28-gnutls-gcrypt.patch \ file://use-urandom.patch \ file://initscript \ @@ -26,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://remove-user-host-pwd-from-version.patch \ " -SRC_URI[md5sum] = "0729a0711fe096831dedc159e0bbe73f" -SRC_URI[sha256sum] = "d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d" +SRC_URI[md5sum] = "2a47a6bb4319357ea7b032c45283e79e" +SRC_URI[sha256sum] = "e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e" DEPENDS = "util-linux groff-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:51 +0000 Subject: [oe-commits] [meta-openembedded] 06/15: ttf-hunkyfonts: upgrade 0.3.0 -> 0.3.1 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.176362328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2b88bf3204d706b7be778f82eb1f7b60bbb619ef Author: Zang Ruochen AuthorDate: Fri Feb 21 16:37:36 2020 +0800 ttf-hunkyfonts: upgrade 0.3.0 -> 0.3.1 Since the new version does not have the file LICENSE, change the LIC_FILES_CHKSUM to COPYRIGHT.TXT. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../ttf-fonts/{ttf-hunkyfonts_0.3.0.bb => ttf-hunkyfonts_0.3.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb similarity index 68% rename from meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb rename to meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb index bd552c0..4df0c3a 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Hunky fonts - TTF Version" HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts" LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=7fbc338309ac38fefcd64b04bb903e34" +LIC_FILES_CHKSUM = "file://../COPYRIGHT.TXT;md5=70d34478e38b1ad9995079f9921f9ef7" PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" @@ -16,5 +16,5 @@ FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif" FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf" FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf" -SRC_URI[md5sum] = "36444795a356fb8a56c63b2840729bab" -SRC_URI[sha256sum] = "e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829" +SRC_URI[md5sum] = "b933312967842e5737b5415fa22d682a" +SRC_URI[sha256sum] = "3fc528737ccd12ec3c09c4a91447d241d3c5bceeeb4d24b7f2c29b15c9735328" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:50 +0000 Subject: [oe-commits] [meta-openembedded] 05/15: snappy: upgrade 1.1.7 -> 1.1.8 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.0E93D2328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 89efe6026c885df7b0eef3c19256b9c167173a5c Author: Zang Ruochen AuthorDate: Fri Feb 21 16:37:35 2020 +0800 snappy: upgrade 1.1.7 -> 1.1.8 Due to version update, SRC-UR has been modified SRC_URI. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../recipes-extended/snappy/{snappy_1.1.7.bb => snappy_1.1.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.8.bb similarity index 69% rename from meta-oe/recipes-extended/snappy/snappy_1.1.7.bb rename to meta-oe/recipes-extended/snappy/snappy_1.1.8.bb index 9f37c5f..d6d1e41 100644 --- a/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.8.bb @@ -10,10 +10,10 @@ compression ratio." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRC_URI = "https://src.fedoraproject.org/repo/pkgs/snappy/snappy-1.1.7.tar.gz/sha512/32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf/snappy-1.1.7.tar.gz" +SRC_URI = "https://src.fedoraproject.org/repo/pkgs/snappy/snappy-1.1.8.tar.gz/sha512/efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c/snappy-1.1.8.tar.gz" -SRC_URI[md5sum] = "ee9086291c9ae8deb4dac5e0b85bf54a" -SRC_URI[sha256sum] = "3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4" +SRC_URI[md5sum] = "70e48cba7fecf289153d009791c9977f" +SRC_URI[sha256sum] = "16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f" inherit cmake pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:52 +0000 Subject: [oe-commits] [meta-openembedded] 07/15: libio-socket-ssl-perl: upgrade 2.066 -> 2.067 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.21F5A2328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 90a1362303f5d793ad0ed946e39fd173357d8a5a Author: Zang Ruochen AuthorDate: Fri Feb 21 16:37:37 2020 +0800 libio-socket-ssl-perl: upgrade 2.066 -> 2.067 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- ...{libio-socket-ssl-perl_2.066.bb => libio-socket-ssl-perl_2.067.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.066.bb b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.067.bb similarity index 91% rename from meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.066.bb rename to meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.067.bb index 7609846..c262d3a 100644 --- a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.066.bb +++ b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.067.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} += "\ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "ecf96ce2ff9e04a03a2d101c76ce1020" -SRC_URI[sha256sum] = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd" +SRC_URI[md5sum] = "1d55e9f66ca442f4e0ae4d018e3067fc" +SRC_URI[sha256sum] = "ef8842806d047cf56e2af64add4ed30b24547bcbb50e8df33cee0c54609af1c1" S = "${WORKDIR}/IO-Socket-SSL-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:55 +0000 Subject: [oe-commits] [meta-openembedded] 10/15: meta-oe: onig: avoid using 'install' with both -D and -t options In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.3CB252328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a9fa588c65fe5c44635012d6b8d44076642119c9 Author: Mark Asselstine AuthorDate: Fri Feb 21 10:20:56 2020 -0500 meta-oe: onig: avoid using 'install' with both -D and -t options Older versions of 'install' (prior to 8.23) do not allow the -D and -t options to be used together. (see coreutils commit 15d092f94a3a [install: allow options -D and -t to be used together]). On build hosts such as CentOS7, which has install v8.22, we therefor see a failure: install: failed to access ?...onig/6.9.4-r0/image/usr/lib64/onig/ptest/tests/?: No such file or directory We definitely don't want to avoid using useful features of tools but throughout meta-openembedded the mkdir approach is used so let's stick to it and avoid causing undo issues at the expense of one extra line of code. Signed-off-by: Mark Asselstine Signed-off-by: Khem Raj --- meta-oe/recipes-support/onig/onig_6.9.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb index cfa86f0..50d9f52 100644 --- a/meta-oe/recipes-support/onig/onig_6.9.4.bb +++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb @@ -28,5 +28,6 @@ do_compile_ptest() { } do_install_ptest() { - install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:54 +0000 Subject: [oe-commits] [meta-openembedded] 09/15: Ply: Add recipe for git version In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.3381A2328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7ed78ecadec8710c6c73c784cb34625dc08fa64a Author: Leo Yan AuthorDate: Fri Feb 21 10:43:40 2020 +0000 Ply: Add recipe for git version Ply is a light-weight eBPF tool which compiles ply script or one-liner to Linux BPF programs and attaches to kprobes and tracepoints. It doesn't require external dependencies except libc, so it's very friendly for embedded system usage. This patch adds the recipe to support ply building for git version. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/ply/ply_git.bb | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb new file mode 100644 index 0000000..2139588 --- /dev/null +++ b/meta-oe/recipes-devtools/ply/ply_git.bb @@ -0,0 +1,38 @@ +SUMMARY = "Ply: A light-weight dynamic tracer for eBPF" +HOMEPAGE = "https://github.com/iovisor/ply" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "bison-native" + +SRC_URI = "git://github.com/iovisor/ply" +SRCREV = "aa5b9ac31307ec1acece818be334ef801c802a12" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + ( cd ${S}; ./autogen.sh; cd - ) +} + +do_configure() { + ( cd ${S}; ./configure --host=${TARGET_SYS} --prefix=${D}${prefix}; cd - ) +} + +do_compile() { + ( cd ${S}; oe_runmake; cd - ) +} + +do_install() { + ( cd ${S}; oe_runmake install; cd - ) +} + +do_install_append() { + chrpath -d ${D}${prefix}/sbin/ply +} + +# x86, mips32/64, riscv64 are not supported in this release +COMPATIBLE_HOST_i586 = 'null' +COMPATIBLE_HOST_i686 = 'null' +COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST_mipsarchn64 = "null" +COMPATIBLE_HOST_riscv64 = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:57 +0000 Subject: [oe-commits] [meta-openembedded] 12/15: crash: upgrade 7.2.7 -> 7.2.8 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.4F8972328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5935d681caffe644f4937fa6b72a0a4d27c82878 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:13 2020 -0800 crash: upgrade 7.2.7 -> 7.2.8 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/crash/{crash_7.2.7.bb => crash_7.2.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.7.bb b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb similarity index 98% rename from meta-oe/recipes-kernel/crash/crash_7.2.7.bb rename to meta-oe/recipes-kernel/crash/crash_7.2.8.bb index 8098d09..61cc71f 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.7.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb @@ -26,7 +26,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRCREV = "5b0e3777ccbb571678791903e93446ccd0aba03a" +SRCREV = "24f4801f8c8871a2e3e660fe9fa8fdd86bb29876" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:56 +0000 Subject: [oe-commits] [meta-openembedded] 11/15: sshfs-fuse: 3.6.0 -> 3.7.0 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.46D822328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 764e279920b9442d8655519d7a8410274f347b38 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:12 2020 -0800 sshfs-fuse: 3.6.0 -> 3.7.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../sshfs-fuse/{sshfs-fuse_3.6.0.bb => sshfs-fuse_3.7.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb similarity index 88% rename from meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb rename to meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb index 2515d07..bf9c34d 100644 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/libfuse/sshfs" -SRCREV = "a1e5f12c530ccf59434a7d59a34a049f160b3559" +SRCREV = "a7e1038203c856cc7e052d439d1da49fe131339f" S = "${WORKDIR}/git" inherit meson -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:53 +0000 Subject: [oe-commits] [meta-openembedded] 08/15: php: Security Advisory - php - CVE-2020-7059 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.2AD602328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 664f8e13736b610c091c7f3855f655158b09333a Author: Li Zhou AuthorDate: Fri Feb 21 17:15:31 2020 +0800 php: Security Advisory - php - CVE-2020-7059 Backport the patch to solve CVE-2020-7059. Because of the version context, this porting mainly refers to the version merging commit Signed-off-by: Li Zhou Signed-off-by: Khem Raj --- .../recipes-devtools/php/php/CVE-2020-7059.patch | 86 ++++++++++++++++++++++ meta-oe/recipes-devtools/php/php_7.3.11.bb | 1 + 2 files changed, 87 insertions(+) diff --git a/meta-oe/recipes-devtools/php/php/CVE-2020-7059.patch b/meta-oe/recipes-devtools/php/php/CVE-2020-7059.patch new file mode 100644 index 0000000..f7d3ab6 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2020-7059.patch @@ -0,0 +1,86 @@ +From 1adaab3aa81fa9b48e351b5644d9fee70f2fe73f Mon Sep 17 00:00:00 2001 +From: Li Zhou +Date: Thu, 20 Feb 2020 02:05:52 -0800 +Subject: [PATCH] Fix #79099: OOB read in php_strip_tags_ex + +Upstream-Status: Backport +CVE: CVE-2020-7059 +Signed-off-by: Li Zhou +--- + ext/standard/string.c | 6 +++--- + ext/standard/tests/file/bug79099.phpt | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 3 deletions(-) + create mode 100644 ext/standard/tests/file/bug79099.phpt + +diff --git a/ext/standard/string.c b/ext/standard/string.c +index dde97fa..2213d8d 100644 +--- a/ext/standard/string.c ++++ b/ext/standard/string.c +@@ -5163,7 +5163,7 @@ state_1: + } + + lc = '>'; +- if (is_xml && *(p -1) == '-') { ++ if (is_xml && p >= buf + 1 && *(p -1) == '-') { + break; + } + in_q = state = is_xml = 0; +@@ -5195,7 +5195,7 @@ state_1: + goto reg_char_1; + case '!': + /* JavaScript & Other HTML scripting languages */ +- if (*(p-1) == '<') { ++ if (p >= buf + 1 && *(p-1) == '<') { + state = 3; + lc = c; + p++; +@@ -5205,7 +5205,7 @@ state_1: + } + break; + case '?': +- if (*(p-1) == '<') { ++ if (p >= buf + 1 && *(p-1) == '<') { + br=0; + state = 2; + p++; +diff --git a/ext/standard/tests/file/bug79099.phpt b/ext/standard/tests/file/bug79099.phpt +new file mode 100644 +index 0000000..a1f2a33 +--- /dev/null ++++ b/ext/standard/tests/file/bug79099.phpt +@@ -0,0 +1,32 @@ ++--TEST-- ++Bug #79099 (OOB read in php_strip_tags_ex) ++--FILE-- ++ ++--EXPECT-- ++string(0) "" ++string(0) "" ++string(0) "" ++string(0) "" ++string(0) "" ++string(0) "" +-- +1.9.1 + diff --git a/meta-oe/recipes-devtools/php/php_7.3.11.bb b/meta-oe/recipes-devtools/php/php_7.3.11.bb index 0e76cbf..8dbaf89 100644 --- a/meta-oe/recipes-devtools/php/php_7.3.11.bb +++ b/meta-oe/recipes-devtools/php/php_7.3.11.bb @@ -18,6 +18,7 @@ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://0001-Use-pkg-config-for-libxml2-detection.patch \ file://debian-php-fixheader.patch \ file://CVE-2019-6978.patch \ + file://CVE-2020-7059.patch \ " SRC_URI_append_class-target = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:58 +0000 Subject: [oe-commits] [meta-openembedded] 13/15: kpatch: upgrade 0.8.0 -> 0.9.0 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.59ED02328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 468547e8a9503f3aecb533e54239d361512de109 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:14 2020 -0800 kpatch: upgrade 0.8.0 -> 0.9.0 refresh the following patch: 0002-kpatch-build-allow-overriding-of-distro-name.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch | 6 +++--- meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch index 603a147..0cc3684 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch +++ b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch @@ -48,10 +48,10 @@ index 39933fc..c0258a2 100755 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -571,7 +576,7 @@ fi +@@ -613,7 +613,7 @@ fi # Don't check external file. - # shellcheck disable=SC1091 - source /etc/os-release + # shellcheck disable=SC1090 + [[ -f "$RELEASE_FILE" ]] && source "$RELEASE_FILE" -DISTRO="$ID" +DISTRO="${DISTRO:-${ID}}" if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb index 6326a25..59dbc93 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb +++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb @@ -2,9 +2,9 @@ require kpatch.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "2a29bc7dea9a7da12705c7b50315eee1acdd9156" +SRCREV = "fd8209aa00525f3e6092eaccbc34f7ce13c4ebc9" -PV = "0.8.0" +PV = "0.9.0" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:50:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:50:59 +0000 Subject: [oe-commits] [meta-openembedded] 14/15: uftrace: upgrade 0.9.3 -> 0.9.4 In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.64D162328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ff9fdbafafd46061764c87a5c1eccb4beec80116 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:15 2020 -0800 uftrace: upgrade 0.9.3 -> 0.9.4 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-devtools/uftrace/{uftrace_0.9.3.bb => uftrace_0.9.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.3.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb similarity index 94% rename from meta-oe/recipes-devtools/uftrace/uftrace_0.9.3.bb rename to meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb index dba607c..cfe461b 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.3.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb @@ -10,8 +10,8 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -# v0.9.3 -SRCREV = "e77780e7524c0a97f25313b205837191bbe9712a" +# v0.9.4 +SRCREV = "5e422c0ec87b41d14e9ce8527983406718ef64e0" SRC_URI = "git://github.com/namhyung/${BPN} \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 16:51:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 16:51:00 +0000 Subject: [oe-commits] [meta-openembedded] 15/15: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158230384534.30942.15658913284359541243@git.openembedded.org> References: <158230384534.30942.15658913284359541243@git.openembedded.org> Message-ID: <20200221165046.7163D2328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9d32796bb46387ebe5258f300e965262f9207faf Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:39 +0000 Subject: [oe-commits] [openembedded-core] 01/28: webkitgtk: fix reconfigure In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.0C8F52328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0d153e16ade03348f066e1cef916f28ce63b074c Author: Andreas M?ller AuthorDate: Fri Feb 21 00:48:28 2020 +0100 webkitgtk: fix reconfigure | ln: failed to create symbolic link '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/webkitgtk/2.26.4-r0/recipe-sysroot-native/usr/bin/python': File exists Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 5857237..fa10944 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -61,7 +61,9 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" setup_python_link() { - ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + fi } EXTRA_OECMAKE = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:40 +0000 Subject: [oe-commits] [openembedded-core] 02/28: webkitgtk: enable gobject-introspection for armv7ve - it builds without issues In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.148412328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8fe34dd8ee8e213ad954a8534bdfb737676d7c9a Author: Andreas M?ller AuthorDate: Fri Feb 21 00:48:29 2020 +0100 webkitgtk: enable gobject-introspection for armv7ve - it builds without issues Maybe armv7a can be re-enabled either but due to limited resources there is no chance for me to test. Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index fa10944..a1dba73 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -127,7 +127,6 @@ 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" # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:41 +0000 Subject: [oe-commits] [openembedded-core] 03/28: bluez5: upgrade 5.52 -> 5.53 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.1CA7C2328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1df5ece4ef6ef49bfeba83a2716ae4e2ce58d20e Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:16 2020 +0800 bluez5: upgrade 5.52 -> 5.53 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.52.bb b/meta/recipes-connectivity/bluez5/bluez5_5.53.bb similarity index 91% rename from meta/recipes-connectivity/bluez5/bluez5_5.52.bb rename to meta/recipes-connectivity/bluez5/bluez5_5.53.bb index b861030..055e76b 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.52.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.53.bb @@ -1,7 +1,7 @@ require bluez5.inc -SRC_URI[md5sum] = "a33eb9aadf1dd4153420958709d3ce60" -SRC_URI[sha256sum] = "f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a" +SRC_URI[md5sum] = "85b14abb138948f50b1650aa866cb019" +SRC_URI[sha256sum] = "38aa2da8302fefad53116bb281a11968732a42eeb19c5fb3668342f39b7938bc" # noinst programs in Makefile.tools that are conditional on READLINE # support -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:42 +0000 Subject: [oe-commits] [openembedded-core] 04/28: gstreamer1.0: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.247102328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 174b897425f2d65129800b7d32c41103ec3a3f26 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:17 2020 +0800 gstreamer1.0: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../gstreamer/{gstreamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb index d2beafd..50a872e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb @@ -23,8 +23,8 @@ SRC_URI = " \ file://0004-meson-Add-option-for-installed-tests.patch \ file://capfix.patch \ " -SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" -SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" +SRC_URI[md5sum] = "0e661ed5bdf1d8996e430228d022628e" +SRC_URI[sha256sum] = "e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:38 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (ffa91ff -> 1d8e5d1) Message-ID: <158230731864.8648.15413305064215685468@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from ffa91ff wayland: Fix strndup detection on MinGW new 0d153e1 webkitgtk: fix reconfigure new 8fe34dd webkitgtk: enable gobject-introspection for armv7ve - it builds without issues new 1df5ece bluez5: upgrade 5.52 -> 5.53 new 174b897 gstreamer1.0: upgrade 1.16.1 -> 1.16.2 new e852a4b gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 new bbbc517 gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 new 14caa7d gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 new b5d27ff gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 new 189d6c5 gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 new 72c18fd gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 new f48b8d6 gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 new b5d665c gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 new 8cab6fd gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 new e41fa0e screen: upgrade 4.7.0 -> 4.8.0 new dff485f stress-ng: upgrade 0.10.16 -> 0.11.00 new fbaf9af gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON new 62ec484 gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG new acc7e39 p11-kit: upgrade 0.23.18.1 -> 0.23.20 new a8fb5a2 nspr: upgrade 4.24 -> 4.25 new 534e82a nss: upgrade 3.49.1 -> 3.50 new de9cceb shadow: upgrade 4.8 -> 4.8.1 new 9b3aaa0 libical: fix host contamination in -dev pkg new dcd1fbe Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" new aa56c5d dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm new f4a520c liberror-perl: upgrade 0.17028 -> 0.17029 new 5df9d43 ltp: Use upstreamed patch for time64 syscall fixes new 007d693 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled new 1d8e5d1 core-image-sato-sdk-ptest: do not pull in ptest-pkgs The 28 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/reproducible_build_simple.bbclass | 1 - meta/classes/rootfs-postcommands.bbclass | 5 + .../bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} | 4 +- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 + meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + ...or-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 +- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 109 +++++++++++++-------- .../screen/{screen_4.7.0.bb => screen_4.8.0.bb} | 7 +- ...ot-check-for-validity-of-shell-executable.patch | 29 ------ .../shadow/files/CVE-2019-19882.patch | 55 ----------- meta/recipes-extended/shadow/shadow.inc | 6 +- .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} | 0 .../{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} | 4 +- ...ibav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} | 4 +- ....0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} | 4 +- ....16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} | 4 +- ...16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} | 4 +- ...16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} | 13 +-- ...16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} | 4 +- ...hon_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} | 4 +- ....16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} | 4 +- ...aapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} | 4 +- ...treamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} | 4 +- .../images/core-image-sato-sdk-ptest.bb | 2 - meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +- meta/recipes-support/libical/libical_3.0.7.bb | 1 + .../nspr/{nspr_4.24.bb => nspr_4.25.bb} | 4 +- ...a-configure-option-to-disable-ARM-HW-cryp.patch | 4 +- .../nss/{nss_3.49.1.bb => nss_3.50.bb} | 4 +- .../{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 4 +- 31 files changed, 121 insertions(+), 181 deletions(-) rename meta/recipes-connectivity/bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} (91%) rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) rename meta/recipes-extended/screen/{screen_4.7.0.bb => screen_4.8.0.bb} (87%) delete mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch delete mode 100644 meta/recipes-extended/shadow/files/CVE-2019-19882.patch rename meta/recipes-extended/shadow/{shadow_4.8.bb => shadow_4.8.1.bb} (100%) rename meta/recipes-extended/stress-ng/{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} (83%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} (92%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} (98%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} (96%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} (86%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} (88%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} (86%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} (93%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} (95%) rename meta/recipes-support/nspr/{nspr_4.24.bb => nspr_4.25.bb} (97%) rename meta/recipes-support/nss/{nss_3.49.1.bb => nss_3.50.bb} (98%) rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (87%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:44 +0000 Subject: [oe-commits] [openembedded-core] 06/28: gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.354382328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bbbc5176ad40fb4202966b4ea788f0ee503cf374 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:19 2020 +0800 gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...1.0-plugins-good_1.16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index a6eb998..1b4db19 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -4,8 +4,8 @@ SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ " -SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf" -SRC_URI[sha256sum] = "9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f" +SRC_URI[md5sum] = "bd025f8f14974f94b75ac69a9d1b9c93" +SRC_URI[sha256sum] = "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319" S = "${WORKDIR}/gst-plugins-good-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:45 +0000 Subject: [oe-commits] [openembedded-core] 07/28: gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.3DBEB2328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 14caa7dc99386c543d0793aabf95b9d28d046295 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:20 2020 +0800 gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...er1.0-plugins-bad_1.16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb index 024277e..7a227fe 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb @@ -8,8 +8,8 @@ SRC_URI = " \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" -SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" +SRC_URI[md5sum] = "ccc7404230afddec723bbdb63c89feec" +SRC_URI[sha256sum] = "f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74" S = "${WORKDIR}/gst-plugins-bad-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:43 +0000 Subject: [oe-commits] [openembedded-core] 05/28: gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.2D6502328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e852a4bcb7efd5452af5347cbd12b850e993559f Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:18 2020 +0800 gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...1.0-plugins-base_1.16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb index cf12ceb..6563b6f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb @@ -13,8 +13,8 @@ SRC_URI = " \ file://0005-viv-fb-Make-sure-config.h-is-included.patch \ file://0009-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[md5sum] = "b5eb0651bab70bf1714f103bdd66ce47" -SRC_URI[sha256sum] = "5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b" +SRC_URI[md5sum] = "3fdb32823535799a748c1fc14f978e2c" +SRC_URI[sha256sum] = "b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a" S = "${WORKDIR}/gst-plugins-base-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:46 +0000 Subject: [oe-commits] [openembedded-core] 08/28: gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.45A8D2328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b5d27ffc1faab9ae020c9fe3bc32138773671a8f Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:21 2020 +0800 gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...1.0-plugins-ugly_1.16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb index 30961d0..be10800 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb @@ -9,8 +9,8 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[md5sum] = "668795903cb4971fba9aa89abdea8369" -SRC_URI[sha256sum] = "4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d" +SRC_URI[md5sum] = "10283ff5ef1e34d462dde77042e329bd" +SRC_URI[sha256sum] = "5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca" S = "${WORKDIR}/gst-plugins-ugly-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:47 +0000 Subject: [oe-commits] [openembedded-core] 09/28: gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.4D5F82328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 189d6c52fac42a6b5f8c5491a99ec332e98cc852 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:22 2020 +0800 gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-libav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb index c1bd6b1..2fdefc9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ " -SRC_URI[md5sum] = "58023f4c71bbd711061e350fcd76c09d" -SRC_URI[sha256sum] = "e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4" +SRC_URI[md5sum] = "eacebd0136ede3a9bd3672eeb338806b" +SRC_URI[sha256sum] = "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2" S = "${WORKDIR}/gst-libav-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:49 +0000 Subject: [oe-commits] [openembedded-core] 11/28: gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.5D3712328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f48b8d6f3e83ceec5600b8793e37639f45ce71e8 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:24 2020 +0800 gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-python_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb similarity index 88% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb index 0382360..9e024eb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \ file://0001-meson.build-fix-builds-with-python-3.8.patch \ " -SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b" -SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489" +SRC_URI[md5sum] = "6ac709767334d8d0a71cb4e016f6abeb" +SRC_URI[sha256sum] = "208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8" DEPENDS = "gstreamer1.0 python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:50 +0000 Subject: [oe-commits] [openembedded-core] 12/28: gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.65AB32328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b5d665c7f21429c95d980c820f719b4da1573c0a Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:25 2020 +0800 gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...er1.0-rtsp-server_1.16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb similarity index 86% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb index deac5a9..02c3c83 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb @@ -12,8 +12,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.x file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ " -SRC_URI[md5sum] = "380d6a42e856c32fcefa508ad57129e0" -SRC_URI[sha256sum] = "b0abacad2f86f60d63781d2b24443c5668733e8b08664bbef94124906d700144" +SRC_URI[md5sum] = "8a998725820c771ba45be6e18bfdf73a" +SRC_URI[sha256sum] = "de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e" S = "${WORKDIR}/${PNREAL}-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:51 +0000 Subject: [oe-commits] [openembedded-core] 13/28: gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.6DBAC2328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8cab6fd5259a00635ebf8b26aa7f2240ac340bfa Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:26 2020 +0800 gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-vaapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb similarity index 93% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb index a78807c..1bedf25 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb @@ -12,8 +12,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.x file://0001-vaapsink-downgrade-to-marginal.patch \ " -SRC_URI[md5sum] = "15b08f76777359d87b0b4a561db05f1f" -SRC_URI[sha256sum] = "cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a" +SRC_URI[md5sum] = "13f7cb6a64bde24e67f563377487dcce" +SRC_URI[sha256sum] = "191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:52 +0000 Subject: [oe-commits] [openembedded-core] 14/28: screen: upgrade 4.7.0 -> 4.8.0 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.75AF72328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e41fa0e4874ff112e1e557491c1d831d1b44146c Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:27 2020 +0800 screen: upgrade 4.7.0 -> 4.8.0 License-Update: Change http to https in license text. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-extended/screen/{screen_4.7.0.bb => screen_4.8.0.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/screen/screen_4.7.0.bb b/meta/recipes-extended/screen/screen_4.8.0.bb similarity index 87% rename from meta/recipes-extended/screen/screen_4.7.0.bb rename to meta/recipes-extended/screen/screen_4.8.0.bb index 67aa5f1..4772eb6 100644 --- a/meta/recipes-extended/screen/screen_4.7.0.bb +++ b/meta/recipes-extended/screen/screen_4.8.0.bb @@ -9,7 +9,8 @@ SECTION = "console/utils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://screen.h;endline=26;md5=3971142989289a8198a544220703c2bf" + file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ + " DEPENDS = "ncurses virtual/crypt \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -22,8 +23,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[md5sum] = "b8971ebd68d046f2814d1040cb8e6641" -SRC_URI[sha256sum] = "da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1" +SRC_URI[md5sum] = "d276213d3acd10339cd37848b8c4ab1e" +SRC_URI[sha256sum] = "6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1" inherit autotools texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:48 +0000 Subject: [oe-commits] [openembedded-core] 10/28: gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.5533F2328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 72c18fdece8c62d6b6dace79fe3b147030b37bdb Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:23 2020 +0800 gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../{gstreamer1.0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb similarity index 92% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb index dfe4b69..f1bdbd2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[md5sum] = "89772e7a277fd0abfc250eaf8e4e9ce9" -SRC_URI[sha256sum] = "cbf54121a2cba575d460833e8132265781252ce32cf5b8f9fa8753e42ab24bb2" +SRC_URI[md5sum] = "6362786d2b6cce34de08c86b7847f782" +SRC_URI[sha256sum] = "11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439" S = "${WORKDIR}/gst-omx-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:54 +0000 Subject: [oe-commits] [openembedded-core] 16/28: gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.85FD82328E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fbaf9afcbeb031860c249d73650649f8d032310d Author: Anuj Mittal AuthorDate: Fri Feb 21 10:41:57 2020 +0800 gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON Use the correct variable so options actually get used and use the correct qt option name to prevent errors. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index 1b4db19..f3e0cee 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig # in a gstreamer1.0-plugins-good bbappend). -EXTRA_OECONF += " \ +EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ -Ddv=disabled \ @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt=disabled \ + -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:53 +0000 Subject: [oe-commits] [openembedded-core] 15/28: stress-ng: upgrade 0.10.16 -> 0.11.00 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.7E0DA2328E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit dff485f83d1eb786fd99d68fcb532593b4dba784 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:01:28 2020 +0800 stress-ng: upgrade 0.10.16 -> 0.11.00 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb index e67b82a..c8471eb 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ " -SRC_URI[md5sum] = "a337cd5b1412c53c580e95ee2a9fc77b" -SRC_URI[sha256sum] = "eabfffcffcf53e67765181280456c204ad00214339cfdb3ee2769d58b4a7e304" +SRC_URI[md5sum] = "781f8a0f8509a01793d815210086e78a" +SRC_URI[sha256sum] = "a41a6a4a7ea4e50aab7331e5594af7d1b3b6e5815751d137a78a6e166295294e" DEPENDS = "coreutils-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:56 +0000 Subject: [oe-commits] [openembedded-core] 18/28: p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.96AA92328EB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit acc7e393e8e6f0a3d6fda6a34a3d5b04784cbe34 Author: Alexander Kanavin AuthorDate: Fri Feb 21 10:27:29 2020 +0100 p11-kit: upgrade 0.23.18.1 -> 0.23.20 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 87% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec..54b8cc6 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -2,14 +2,14 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit meson gettext pkgconfig gtk-doc +inherit meson gettext pkgconfig gtk-doc bash-completion DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:55 +0000 Subject: [oe-commits] [openembedded-core] 17/28: gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.8F08C2328EA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 62ec484190f51b265606ab1937a5245ddb68eee6 Author: Anuj Mittal AuthorDate: Fri Feb 21 10:41:58 2020 +0800 gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG Instead of disabling unconditionally, add PACKAGECONFIG for qt5. Imported from meta-qt5 layer. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index f3e0cee..8b34111 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -42,6 +42,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" +PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native" PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" @@ -50,11 +51,6 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" -# qt5 support is disabled, because it is not present in OE core, and requires more work than -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). -# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig -# in a gstreamer1.0-plugins-good bbappend). - EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ @@ -64,7 +60,6 @@ EXTRA_OEMESON += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:00 +0000 Subject: [oe-commits] [openembedded-core] 22/28: libical: fix host contamination in -dev pkg In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.BAAC82328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9b3aaa03ace3975b2d6fb9a707b4b791d4f0f916 Author: Sakib Sajal AuthorDate: Thu Feb 20 14:02:47 2020 -0800 libical: fix host contamination in -dev pkg [YOCTO #13512] Signed-off-by: Sakib Sajal Signed-off-by: Richard Purdie --- meta/recipes-support/libical/libical_3.0.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/libical/libical_3.0.7.bb b/meta/recipes-support/libical/libical_3.0.7.bb index ac9c114..a50473e 100644 --- a/meta/recipes-support/libical/libical_3.0.7.bb +++ b/meta/recipes-support/libical/libical_3.0.7.bb @@ -40,5 +40,6 @@ do_install_append () { # Remove build host references sed -i \ -e 's,${STAGING_LIBDIR},${libdir},g' \ + -e 's,${STAGING_INCDIR},${includedir},g' \ ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:03 +0000 Subject: [oe-commits] [openembedded-core] 25/28: liberror-perl: upgrade 0.17028 -> 0.17029 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.D55442328ED@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f4a520cc827187d83f2997614d893bba7d74a152 Author: Tim Orling AuthorDate: Thu Feb 20 13:23:15 2020 -0800 liberror-perl: upgrade 0.17028 -> 0.17029 Upstream release notes: " 0.17029 2020-01-28 - Rebuild for order of 'NAME' and 'VERSION' sections in the generated POD documentation (see 0.001004 in https://metacpan.org/changes/distribution/Pod-Weaver-PluginBundle-SHLOMIF ). - VERSION used to appear before NAME. " Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb similarity index 89% rename from meta/recipes-devtools/perl/liberror-perl_0.17028.bb rename to meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 8c6bbcb..038808f 100644 --- a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb +++ b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -32,8 +32,8 @@ RDEPENDS_${PN}-ptest += " \ SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz" -SRC_URI[md5sum] = "ec3522c60a43a368f19c0f89e2205cb1" -SRC_URI[sha256sum] = "3ad85c5e58b31c8903006298424a51bba39f1840e324f5ae612eabc8b935e960" +SRC_URI[md5sum] = "6732b1c6207e4a9a3e2987c88368039a" +SRC_URI[sha256sum] = "1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc" S = "${WORKDIR}/Error-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:05 +0000 Subject: [oe-commits] [openembedded-core] 27/28: libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.E55D42328EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 007d693a3c51026a9265f8e0bd09af086bcd8252 Author: Khem Raj AuthorDate: Thu Feb 20 08:53:17 2020 -0800 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb index 502f4e0..265a27c 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "rpm" +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:06 +0000 Subject: [oe-commits] [openembedded-core] 28/28: core-image-sato-sdk-ptest: do not pull in ptest-pkgs In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.EDAEF2328F1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1d8e5d1bc1aa8fdaf967395e27b13cc989717fb7 Author: Alexander Kanavin AuthorDate: Wed Feb 19 20:47:40 2020 +0100 core-image-sato-sdk-ptest: do not pull in ptest-pkgs The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; specifying 'ptests-pkgs' also pulls in additional ptests that are specifically excluded from those lists due to causing issues with ptesting. (particularly bash-ptest is one such item) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 85b5adb..58c257c 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" - PROVIDES += "core-image-sato-ptest" # Also include ptests which may not otherwise be included in a sato image -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:04 +0000 Subject: [oe-commits] [openembedded-core] 26/28: ltp: Use upstreamed patch for time64 syscall fixes In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.DD62B2328EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5df9d43a7173e396bb39ff21183b67ba52681993 Author: Khem Raj AuthorDate: Thu Feb 20 08:50:50 2020 -0800 ltp: Use upstreamed patch for time64 syscall fixes Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 109 +++++++++++++-------- 1 file changed, 66 insertions(+), 43 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index 92e5fdf..c431669 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,4 +1,4 @@ -From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Feb 2020 22:22:17 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them @@ -7,75 +7,98 @@ musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj --- - lib/tst_clocks.c | 9 +++++++++ - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ - 3 files changed, 17 insertions(+) + lib/tst_clocks.c | 9 +++++---- + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 10 insertions(+), 13 deletions(-) -diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c -index 35798a4aaf..6a5b05c4ea 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -28,15 +28,24 @@ +@@ -22,21 +22,22 @@ + #define _GNU_SOURCE + #include + #include +-#include +- ++#define TST_NO_DEFAULT_MAIN ++#include "tst_test.h" + #include "tst_clocks.h" ++#include "lapi/syscalls.h" int tst_clock_getres(clockid_t clk_id, struct timespec *res) { -+#if defined(__NR_clock_getres) - return syscall(SYS_clock_getres, clk_id, res); -+#endif -+ return -1; +- return syscall(SYS_clock_getres, clk_id, res); ++ return tst_syscall(__NR_clock_getres, clk_id, res); } int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) { -+#if defined(__NR_clock_gettime) - return syscall(SYS_clock_gettime, clk_id, ts); -+#endif -+ return -1; +- return syscall(SYS_clock_gettime, clk_id, ts); ++ return tst_syscall(__NR_clock_gettime, clk_id, ts); } int tst_clock_settime(clockid_t clk_id, struct timespec *ts) { -+#if defined(__NR_clock_settime) - return syscall(SYS_clock_settime, clk_id, ts); -+#endif -+ return -1; +- return syscall(SYS_clock_settime, clk_id, ts); ++ return tst_syscall(__NR_clock_settime, clk_id, ts); } -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -index 583d8f7b9b..b498de5b68 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -@@ -41,7 +41,11 @@ - #include +@@ -38,10 +38,8 @@ + #include + #include + #include "test.h" +-#include #include - -+#ifdef __NR_gettimeofday - #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#else -+#define gettimeofday(a,b) (-1) -+#endif +- +-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#include "lapi/syscalls.h" char *TCID = "gettimeofday01"; int TST_TOTAL = 1; -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -index 1d60f448e8..218e017df8 100644 +@@ -63,7 +61,7 @@ int main(int ac, char **av) + for (lc = 0; TEST_LOOPING(lc); lc++) { + tst_count = 0; + +- TEST(gettimeofday((void *)-1, (void *)-1)); ++ TEST(ltp_syscall(__NR_gettimeofday, (void *)-1, (void *)-1)); + + /* gettimeofday returns an int, so we need to turn the long + * TEST_RETURN into an int to test with */ --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -@@ -23,7 +23,11 @@ +@@ -16,14 +16,12 @@ + #include + #include + #include +-#include + #include + #include + #include #include "tst_test.h" - -+#ifdef __NR_gettimeofday - #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#else -+#define gettimeofday(a,b) (-1) -+#endif +- +-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#include "lapi/syscalls.h" static volatile sig_atomic_t done; static char *str_rtime; --- -2.25.0 - +@@ -48,13 +46,13 @@ static void verify_gettimeofday(void) + + alarm(rtime); + +- if (gettimeofday(&tv1, NULL)) { ++ if (tst_syscall(__NR_gettimeofday, &tv1, NULL)) { + tst_res(TBROK | TERRNO, "gettimeofday() failed"); + return; + } + + while (!done) { +- if (gettimeofday(&tv2, NULL)) { ++ if (tst_syscall(__NR_gettimeofday, &tv2, NULL)) { + tst_res(TBROK | TERRNO, "gettimeofday() failed"); + return; + } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:58 +0000 Subject: [oe-commits] [openembedded-core] 20/28: nss: upgrade 3.49.1 -> 3.50 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.A93C82328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 534e82abbb33e7c02c183ab0290572b2dc599447 Author: Wang Mingyu AuthorDate: Fri Feb 21 02:09:40 2020 -0800 nss: upgrade 3.49.1 -> 3.50 refresh the following patch: 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch | 4 ++-- meta/recipes-support/nss/{nss_3.49.1.bb => nss_3.50.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index 803c06b..c380c14 100644 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -42,8 +42,8 @@ Signed-off-by: Alexander Kanavin /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -28,6 +29,7 @@ - * that compiler uses -mfpu=neon only. */ +@@ -25,6 +26,7 @@ + /* We don't test on big endian platform, so disable this on big endian. */ #define USE_ARM_GCM #endif +#endif diff --git a/meta/recipes-support/nss/nss_3.49.1.bb b/meta/recipes-support/nss/nss_3.50.bb similarity index 98% rename from meta/recipes-support/nss/nss_3.49.1.bb rename to meta/recipes-support/nss/nss_3.50.bb index b16ade9..e9855d7 100644 --- a/meta/recipes-support/nss/nss_3.49.1.bb +++ b/meta/recipes-support/nss/nss_3.50.bb @@ -34,8 +34,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[md5sum] = "6b92ac02dcf9e9e44df5390f6814c157" -SRC_URI[sha256sum] = "d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e" +SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37" +SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:57 +0000 Subject: [oe-commits] [openembedded-core] 19/28: nspr: upgrade 4.24 -> 4.25 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.A0D382328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a8fb5a2e21b9d6eea2d83c34ffdfb991d4e6ce8e Author: Wang Mingyu AuthorDate: Fri Feb 21 02:09:39 2020 -0800 nspr: upgrade 4.24 -> 4.25 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/nspr/{nspr_4.24.bb => nspr_4.25.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/nspr/nspr_4.24.bb b/meta/recipes-support/nspr/nspr_4.25.bb similarity index 97% rename from meta/recipes-support/nspr/nspr_4.24.bb rename to meta/recipes-support/nspr/nspr_4.25.bb index e98fe83..1de26e1 100644 --- a/meta/recipes-support/nspr/nspr_4.24.bb +++ b/meta/recipes-support/nspr/nspr_4.25.bb @@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "d630c2111e1db6d2ec2069aad22b4121" -SRC_URI[sha256sum] = "90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0" +SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" +SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" CVE_PRODUCT = "netscape_portable_runtime" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:01 +0000 Subject: [oe-commits] [openembedded-core] 23/28: Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.C274D2328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit dcd1fbe153369634c73370cbe22e1dbdac080146 Author: Peter Kjellerstedt AuthorDate: Sun Feb 9 07:06:58 2020 +0100 Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" This reverts commit 8380df6566db49ef184b837432558750f77f592f. Giving BUILDNAME a static default in reproducible_build_simple.bbclass to have /etc/version be generated with that name lead to other users of BUILDNAME no longer working as expected. E.g., buildstats.bcclass would now write its information in a single directory, overwriting the statistics for each build. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/reproducible_build_simple.bbclass | 1 - meta/classes/rootfs-postcommands.bbclass | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 3e5fd82..3933729 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -7,4 +7,3 @@ export PERL_HASH_SEED = "0" export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" -BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e400974..2f17183 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -356,6 +356,11 @@ python rootfs_log_check_recommends() { # Perform any additional adjustments needed to make rootf binary reproducible rootfs_reproducible () { if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" != "" ]; then + # Convert UTC into %4Y%2m%2d%2H%2M%2S + sformatted=`date -u -d @${REPRODUCIBLE_TIMESTAMP_ROOTFS} +%4Y%2m%2d%2H%2M%2S` + echo $sformatted > ${IMAGE_ROOTFS}/etc/version + bbnote "rootfs_reproducible: set /etc/version to $sformatted" + if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \ sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:48:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:48:59 +0000 Subject: [oe-commits] [openembedded-core] 21/28: shadow: upgrade 4.8 -> 4.8.1 In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.B28432328C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit de9cceb13e264434eb0b8393c3b0c0217b8d505e Author: Wang Mingyu AuthorDate: Fri Feb 21 02:09:15 2020 -0800 shadow: upgrade 4.8 -> 4.8.1 0001-Do-not-check-for-validity-of-shell-executable.patch CVE-2019-19882.patch Removed since they are included in 4.8.1. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...ot-check-for-validity-of-shell-executable.patch | 29 ------------ .../shadow/files/CVE-2019-19882.patch | 55 ---------------------- meta/recipes-extended/shadow/shadow.inc | 6 +-- .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} | 0 4 files changed, 2 insertions(+), 88 deletions(-) diff --git a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch b/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch deleted file mode 100644 index 2d15ff0..0000000 --- a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Dec 2019 19:28:48 +0100 -Subject: [PATCH] Do not check for validity of shell executable. - -This kind of check fails when building a rootfs. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - src/useradd.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 4af0f7c..898fe02 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv) - if ( ( !VALID (optarg) ) - || ( ('\0' != optarg[0]) - && ('/' != optarg[0]) -- && ('*' != optarg[0]) ) -- || (stat(optarg, &st) != 0) -- || (S_ISDIR(st.st_mode)) -- || (access(optarg, X_OK) != 0)) { -+ && ('*' != optarg[0]) )) { - fprintf (stderr, - _("%s: invalid shell '%s'\n"), - Prog, optarg); diff --git a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch b/meta/recipes-extended/shadow/files/CVE-2019-19882.patch deleted file mode 100644 index 894d867..0000000 --- a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 66b7bc0dcfda12d7f58eba993bd02872cae1d713 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 16 Dec 2019 14:11:23 -0500 -Subject: [PATCH] Don't auto-enable ACCT_TOOLS_SETUID if PAM is detected - -Here's a sad story: - -* 70971457 is merged into shadow, allowing newgidmap/newuidmap to be -installed with file caps rather than setuid. -* https://bugs.archlinux.org/task/63248 is filed to take advantage of -this. -* The arch maintainer of the 'shadow' package notices that this doesn't -work, and submits a pull request to fix this in shadow. -* edf7547ad5 is merged, fixing the post install hooks. - -The problem here is that distros have been building shadow with PAM for -O(years), but the install hooks have silently failed due to the -combination of the directory mismatch (suidubins vs suidsbins) and later -success with setuid'ing newgidmap/newuidmap. - -With the install hooks fixed, those of us (Arch[1] and Gentoo[2] so far) -who never built shadow explicitly with --enable-account-tools-setuid are -now getting setuid account tools, and don't have PAM configuration -suitable for use with setuid account management tools. - -It's entirely unclear to me why you'd want this, but I assume there's -some reason out there for it existing. Regardless, setuid binaries are -dangerous and shouldn't be enabled by default without good reason. - -[1] https://bugs.archlinux.org/task/64836 -[2] https://bugs.gentoo.org/702252 - -Upstream-Status: Backport -CVE: CVE-2019-19882 -Signed-off-by: Li Zhou ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e3ed3b43..d6e2bfbd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,7 @@ AC_ARG_ENABLE(account-tools-setuid, - *) AC_MSG_ERROR(bad value ${enableval} for --enable-account-tools-setuid) - ;; - esac], -- [enable_acct_tools_setuid="maybe"] -+ [enable_acct_tools_setuid="no"] - ) - - AC_ARG_ENABLE(utmpx, --- -2.17.1 - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 3bfa39e..f86e5e0 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -13,7 +13,6 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}. file://shadow-4.1.3-dots-in-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ - file://CVE-2019-19882.patch \ " SRC_URI_append_class-target = " \ @@ -25,14 +24,13 @@ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://0001-Do-not-check-for-validity-of-shell-executable.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" -SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4" +SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480" +SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ diff --git a/meta/recipes-extended/shadow/shadow_4.8.bb b/meta/recipes-extended/shadow/shadow_4.8.1.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.8.bb rename to meta/recipes-extended/shadow/shadow_4.8.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:02 +0000 Subject: [oe-commits] [openembedded-core] 24/28: dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <158230731864.8648.15413305064215685468@git.openembedded.org> References: <158230731864.8648.15413305064215685468@git.openembedded.org> Message-ID: <20200221174839.CA8E42328EC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit aa56c5dcdea152bee62bb480ccaae177f6c69b9b Author: Khem Raj AuthorDate: Thu Feb 20 13:09:52 2020 -0800 dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm dnf depends on libsolv, and libsolv does not have and easy way to jusr enable rpmdb support, it either has full rpm or nothing, perhaps it could be improved in libsolv and we can use that but from now we have no other option dnf support only rpm backend and wont work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f..f6e616e 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435..d498347 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:26 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2509886 -> 4898d26) Message-ID: <158230736640.10267.2213440316103603503@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 2509886 core-image-sato-sdk-ptest: do not pull in ptest-pkgs discard a66ea65 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled discard 606f0d2 ltp: Use upstreamed patch for time64 syscall fixes discard f348c74 liberror-perl: upgrade 0.17028 -> 0.17029 discard 9a51bba dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm discard 0a3edd4 Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" discard 4f08161 libical: fix host contamination in -dev pkg discard 4dfc0d9 shadow: upgrade 4.8 -> 4.8.1 discard 25433aa nss: upgrade 3.49.1 -> 3.50 discard d09b77c nspr: upgrade 4.24 -> 4.25 discard 41bbbcd p11-kit: upgrade 0.23.18.1 -> 0.23.20 discard eac68ac gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG discard f73c726 gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON discard f4c72de stress-ng: upgrade 0.10.16 -> 0.11.00 discard 11828b0 screen: upgrade 4.7.0 -> 4.8.0 discard f1dee93 gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 discard 8536f9c gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 discard ff63112 gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 discard 54b4f28 gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 discard 47d3852 gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 discard af54627 gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 discard 7c97981 gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 discard 8fb00f8 gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 discard b0bff5c gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 discard 0498a49 gstreamer1.0: upgrade 1.16.1 -> 1.16.2 discard aeb5669 bluez5: upgrade 5.52 -> 5.53 discard fc98d73 webkitgtk: enable gobject-introspection for armv7ve - it builds without issues discard 090640c webkitgtk: fix reconfigure discard d771d86 HACK: extra debug discard 022493b rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard bc32fa1 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 02146e1 HACK: signing: Add extra test debug discard b618172 glew/curl: specify exclusive package configs discard 7fa8f82 base.bbclass: extend PACKAGECONFIG for conflict package configs add 0d153e1 webkitgtk: fix reconfigure add 8fe34dd webkitgtk: enable gobject-introspection for armv7ve - it builds without issues add 1df5ece bluez5: upgrade 5.52 -> 5.53 add 174b897 gstreamer1.0: upgrade 1.16.1 -> 1.16.2 add e852a4b gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 add bbbc517 gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 add 14caa7d gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 add b5d27ff gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 add 189d6c5 gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 add 72c18fd gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 add f48b8d6 gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 add b5d665c gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 add 8cab6fd gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 add e41fa0e screen: upgrade 4.7.0 -> 4.8.0 add dff485f stress-ng: upgrade 0.10.16 -> 0.11.00 add fbaf9af gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON add 62ec484 gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG add acc7e39 p11-kit: upgrade 0.23.18.1 -> 0.23.20 add a8fb5a2 nspr: upgrade 4.24 -> 4.25 add 534e82a nss: upgrade 3.49.1 -> 3.50 add de9cceb shadow: upgrade 4.8 -> 4.8.1 add 9b3aaa0 libical: fix host contamination in -dev pkg add dcd1fbe Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" add aa56c5d dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm add f4a520c liberror-perl: upgrade 0.17028 -> 0.17029 add 5df9d43 ltp: Use upstreamed patch for time64 syscall fixes add 007d693 libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled add 1d8e5d1 core-image-sato-sdk-ptest: do not pull in ptest-pkgs new b7cf349 base.bbclass: extend PACKAGECONFIG for conflict package configs new 919e2b4 glew/curl: specify exclusive package configs new b2c792a HACK: signing: Add extra test debug new 1a90e33 sstatesig: Log timestamps for hashequiv in reprodubile builds new 902d0df rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 4898d26 HACK: extra debug This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2509886) \ N -- N -- N refs/heads/master-next (4898d26) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:27 +0000 Subject: [oe-commits] [openembedded-core] 01/06: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158230736640.10267.2213440316103603503@git.openembedded.org> References: <158230736640.10267.2213440316103603503@git.openembedded.org> Message-ID: <20200221174926.903882328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b7cf34926c51d1f8e5605d4b58a298677a765f12 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:29 +0000 Subject: [oe-commits] [openembedded-core] 03/06: HACK: signing: Add extra test debug In-Reply-To: <158230736640.10267.2213440316103603503@git.openembedded.org> References: <158230736640.10267.2213440316103603503@git.openembedded.org> Message-ID: <20200221174926.B4F222328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b2c792a4f369581be9549e6bf7786595bc5fdc75 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:28 +0000 Subject: [oe-commits] [openembedded-core] 02/06: glew/curl: specify exclusive package configs In-Reply-To: <158230736640.10267.2213440316103603503@git.openembedded.org> References: <158230736640.10267.2213440316103603503@git.openembedded.org> Message-ID: <20200221174926.9CA872328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 919e2b41609b50f51e4b64e6ab6bd0e6380b5ec7 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:30 +0000 Subject: [oe-commits] [openembedded-core] 04/06: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158230736640.10267.2213440316103603503@git.openembedded.org> References: <158230736640.10267.2213440316103603503@git.openembedded.org> Message-ID: <20200221174926.C60C42328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1a90e33358aa01d6655712522326932158958826 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:32 +0000 Subject: [oe-commits] [openembedded-core] 06/06: HACK: extra debug In-Reply-To: <158230736640.10267.2213440316103603503@git.openembedded.org> References: <158230736640.10267.2213440316103603503@git.openembedded.org> Message-ID: <20200221174927.05A262328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4898d267d8b70975937dd4d761e38ffcfc7b6b0b Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:49:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:49:31 +0000 Subject: [oe-commits] [openembedded-core] 05/06: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158230736640.10267.2213440316103603503@git.openembedded.org> References: <158230736640.10267.2213440316103603503@git.openembedded.org> Message-ID: <20200221174926.DC1F12328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 902d0df2a1214e1f3179b1187f4127156ed20b2d Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:38 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (4898d26 -> 1e41c1f) Message-ID: <158230767827.1169.12631719693480290082@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 4898d26 HACK: extra debug new 8929c38 linux-yocto/5.4: update to v5.4.18 new db827b4 linux-yocto/5.4: update to v5.4.20 new 46de7a6 linux-yocto/5.2: update to v5.2.29 new 0428b2b linux-yocto: fix PV new df413f6 devsrc: fix objtool generation for v5.4+ new 51339af linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix new c4b513d linux-yocto: perf: Make perf able to build with latest libbfd new c4a6530 linux-yocto/5.4: update to -rt11 new a3646f2 linux-yocto: drop 4.19 recipes new e08fdee qemu: bump default reference kernel to v5.4 new 6ed18bb musl: Update to final 1.2.0 release new f0abfad alsa-utils: upgrade 1.2.1 -> 1.2.2 new e04ec10 psplash: add systemd support new 1e41c1f binutils: Upgrade to 2.34 release The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarmv5.conf | 2 +- meta/recipes-core/musl/musl_git.bb | 4 +- meta/recipes-core/psplash/files/psplash-init | 8 +- .../psplash/files/psplash-start.service | 10 + .../psplash/files/psplash-systemd.service | 10 + meta/recipes-core/psplash/psplash_git.bb | 38 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 75 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 41 + ...=> 0005-Point-scripts-location-to-libdir.patch} | 10 +- ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- meta/recipes-kernel/linux/kernel-devsrc.bb | 5 + meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 44 - meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 8 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 32 - meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 10 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 50 - meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 24 +- ...cripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 .../{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 +- 47 files changed, 7493 insertions(+), 21780 deletions(-) create mode 100644 meta/recipes-core/psplash/files/psplash-start.service create mode 100644 meta/recipes-core/psplash/files/psplash-systemd.service rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (91%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (97%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (91%) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_4.19.bb rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} (100%) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} (97%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:39 +0000 Subject: [oe-commits] [openembedded-core] 01/14: linux-yocto/5.4: update to v5.4.18 In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.B80092328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8929c38121d96deabbb15f8994cb754682b4528d Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:53 2020 -0500 linux-yocto/5.4: update to v5.4.18 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 58c72057f662 Linux 5.4.18 3353852afe1e tracing/uprobe: Fix to make trace_uprobe_filter alignment safe 5f9b8c5a4618 Revert "rsi: fix potential null dereference in rsi_probe()" 09d4a9c83c68 ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order 52cf138f5cc1 mm/migrate.c: also overwrite error when it is bigger than zero 20e1bbe5cfd7 perf report: Fix no libunwind compiled warning break s390 issue e16b302f691c dm thin: fix use-after-free in metadata_pre_commit_callback 35511d9471be flow_dissector: Fix to use new variables for port ranges in bpf hook f42407a7906b cpuidle: teo: Avoid using "early hits" incorrectly c5e3c887dfc0 btrfs: do not zero f_bavail if we have available space 420e4a521c0e net: Fix skb->csum update in inet_proto_csum_replace16(). e853e3f9f9d4 netfilter: nf_tables_offload: fix check the chain offload flag 17d56cef7f93 netfilter: conntrack: sctp: use distinct states for new SCTP connections b71636ee37fa l2t_seq_next should increase position index 148a71a8ece8 seq_tab_next() should increase position index 0c9a3ab865c3 net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G e2c797b72e01 net/fsl: treat fsl,erratum-a011043 1ce13ed0a5de powerpc/fsl/dts: add fsl,erratum-a011043 6ee3feac65ea qlcnic: Fix CPU soft lockup while collecting firmware dump d693255105b6 ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1 06b5e1087103 r8152: disable DelayPhyPwrChg 510818ae0f38 r8152: avoid the MCU to clear the lanwake 3a128650b47a r8152: disable test IO for RTL8153B bc2ef2e9d142 r8152: Disable PLA MCU clock speed down b05091c3ae99 r8152: disable U2P3 for RTL8153B 26a581fafceb r8152: get default setting of WOL before initializing 281f32e34382 tee: optee: Fix compilation issue with nommu 0703666b9658 led: max77650: add of_match table 313151afdf4c ARM: 8955/1: virt: Relax arch timer version check during early boot edb6590b1b2c scsi: fnic: do not queue commands during fwreset 3075e636b368 Input: max77650-onkey - add of_match table c3a49824165c xfrm: interface: do not confirm neighbor when do pmtu update b38dd235a4bd xfrm interface: fix packet tx through bpf_redirect() c8e04566db7f vti[6]: fix packet tx through bpf_redirect() 5743a3a8a4c7 ARM: dts: am335x-boneblack-common: fix memory size c15ea8e4150d Input: evdev - convert kzalloc()/vzalloc() to kvzalloc() 220ee13d017c iwlwifi: dbg: force stop the debug monitor HW 27cf25a0b87a iwlwifi: Don't ignore the cap field upon mcc update 4df1389ff7b5 iwlwifi: pcie: allocate smaller dev_cmd for TX headers 08022255a9ee XArray: Fix xas_pause at ULONG_MAX b267caf5e51f riscv: delete temporary files 8f2fa34a52c5 perf/x86/intel/uncore: Remove PCIe3 unit for SNR aae7d5784c53 perf/x86/intel/uncore: Add PCI ID of IMC for Xeon E3 V5 Family 86982620f28b wireless: wext: avoid gcc -O3 warning b308d93dd5b3 mac80211: Fix TKIP replay protection immediately after key setup e233cbaf8ecc cfg80211: Fix radar event during another phy CAC 01c2c23d3d5f wireless: fix enabling channel 12 for custom regulatory domain 9e62f296dbae lkdtm/bugs: fix build error in lkdtm_UNSET_SMEP 0b06c373db8a parisc: Use proper printk format for resource_size_t e1133c1796a1 qmi_wwan: Add support for Quectel RM500Q 422566f37e37 ASoC: sti: fix possible sleep-in-atomic 99ced2ecfe9e ASoC: hdac_hda: Fix error in driver removal after failed probe e43ab59fb1aa ASoC: SOF: Intel: fix HDA codec driver probe with multiple controllers 70149813320f platform/x86: intel_pmc_core: update Comet Lake platform driver 689233e8f998 platform/x86: GPD pocket fan: Allow somewhat lower/higher temperature limits 7790a471e80c iavf: remove current MAC address filter on VF reset 73613ce39d59 igb: Fix SGMII SFP module discovery for 100FX/LX. fd335ee1e9e2 ixgbe: Fix calculation of queue with VFs and flow director on interface flap 5113ff357d81 ixgbevf: Remove limit of 10 entries for unicast filter list be87d4f313e3 i40e: Fix virtchnl_queue_select bitmap validation 557fda798eab s390/zcrypt: move ap device reset from bus to driver code 1a18f3a7dbbf ASoC: rt5640: Fix NULL dereference on module unload aab165d61cb4 clk: mmp2: Fix the order of timer mux parents 8b4e524dc02b mac80211: mesh: restrict airtime metric to peered established plinks 096837d4b495 clk: sunxi-ng: h6-r: Fix AR100/R_APB2 parent order e619af70d133 clk: sunxi-ng: sun8i-r: Fix divider on APB0 clock 95c892061e90 rseq: Unregister rseq for clone CLONE_VM 91f91139d32f tools lib traceevent: Fix memory leakage in filter_event 22946b839768 soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot adba4a2a5273 ARM: dts: beagle-x15-common: Model 5V0 regulator 8a14c121d4e4 ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes b5cbe8ad1b60 ARM: dts: sun8i: a83t: Correct USB3503 GPIOs polarity e8b0d16e4c7f arm64: dts: meson-sm1-sei610: add gpio bluetooth interrupt f0a7b02147ad clk: sunxi-ng: v3s: Fix incorrect number of hw_clks. 3ea87219a9c7 cgroup: Prevent double killing of css when enabling threaded cgroup 07d00820bf98 Bluetooth: Fix race condition in hci_release_sock() f39406a925b0 ttyprintk: fix a potential deadlock in interrupt context issue 99652ee9c516 tomoyo: Use atomic_t for statistics counter 81b3fd0cb421 media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0 f416aac94c12 media: gspca: zero usb_buf d35ef79fbc97 media: vp7045: do not read uninitialized values if usb transfer fails 0c7cc4c9c2bb media: af9005: uninitialized variable printked 5b256eea1ae6 media: digitv: don't continue if remote control state can't be read 761a10b67a11 reiserfs: Fix memory leak of journal device string 9bcdb8ba5a3d mm/mempolicy.c: fix out of bounds write in mpol_parse_str() 7965bc367e70 arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' e77625d1f8ff tools lib: Fix builds when glibc contains strlcpy() da1321fc1405 PM / devfreq: Add new name attribute for sysfs e9fac0046579 perf c2c: Fix return type for histogram sorting comparision functions 73774def78ec gfs2: Another gfs2_find_jhead fix d635e7c4b34e e1000e: Revert "e1000e: Make watchdog use delayed work" 21c613793972 e1000e: Drop unnecessary __E1000_DOWN bit twiddling 5ca5637ec665 x86/resctrl: Fix use-after-free due to inaccurate refcount of rdtgroup 40300f986e47 x86/resctrl: Fix use-after-free when deleting resource groups 2dd2e4722922 x86/resctrl: Fix a deadlock due to inaccurate reference cd0826719560 cifs: fix soft mounts hanging in the reconnect code 2c38e6140126 vfs: fix do_last() regression 313c8460cf02 Linux 5.4.17 831919b4c481 power/supply: ingenic-battery: Don't change scale if there's only one dd350f3918be Revert "um: Enable CONFIG_CONSTRUCTORS" a775f67b4b61 KVM: arm64: Write arch.mdcr_el2 changes since last vcpu_load on VHE 00d58d0b58bc crypto: pcrypt - Fix user-after-free on module unload 9f6d555f58f3 crypto: caam - do not reset pointer size from MCFGR register 3b52ada5b82c crypto: vmx - reject xts inputs that are too short 9d9b578ffef3 crypto: af_alg - Use bh_lock_sock in sk_destruct ac39443b7b49 rsi: fix non-atomic allocation in completion handler 1f04209d19c5 rsi: fix memory leak on failed URB submission 2d367468ecdf rsi: fix use-after-free on probe errors d8902b43745f rsi: fix use-after-free on failed probe and unbind 99d9138295cb bus: ti-sysc: Fix missing force mstandby quirk handling 58b09300ee1b Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk d1e5f8c5156e Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks d273ee188a4a ALSA: hda/realtek - Move some alc236 pintbls to fallback table 050072c0f798 usb-storage: Disable UAS on JMicron SATA enclosure a2e6217bd8ea bus: ti-sysc: Add module enable quirk for audio AESS 0c101a22fec5 mmc: sdhci-pci: Add support for Intel JSL ac342e0a1f18 mmc: sdhci-pci: Quirk for AMD SDHC Device 0x7906 142356a63872 ARM: OMAP2+: SmartReflex: add omap_sr_pdata definition f3020d789311 ARM: config: aspeed-g5: Enable 8250_DW quirks 4f8f8f31c505 mfd: intel-lpss: Add Intel Comet Lake PCH-H PCI IDs 81909bd070db perf/imx_ddr: Add enhanced AXI ID filter support b02b0a6bcc81 iommu/amd: Support multiple PCI DMA aliases in IRQ Remapping 1f03a258f20f iommu/amd: Support multiple PCI DMA aliases in device table d7937ea02315 spi: pxa2xx: Add support for Intel Comet Lake-H c90ed6e66288 bus: ti-sysc: Use swsup quirks also for am335x musb 48b038c9d54a bus: ti-sysc: Handle mstandby quirk and use it for musb 6d34eacd8348 media: dvbsky: add support for eyeTV Geniatech T2 lite fef41f3a82ea PCI: Add DMA alias quirk for Intel VCA NTB f8aaefd5510a platform/x86: dell-laptop: disable kbd backlight on Inspiron 10xx 21fd877300b0 staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute' c9ddede0a9fc libbpf: Fix BTF-defined map's __type macro handling of arrays d40471b727e8 drm/amdgpu/SRIOV: add navi12 pci id for SRIOV (v2) 791e3ec642ce ASoC: Intel: cht_bsw_rt5645: Add quirk for boards using pmc_plt_clk_0 48617aa63951 extcon-intel-cht-wc: Don't reset USB data connection at probe de850e86d2e1 HID: steam: Fix input device disappearing b60d320dc363 atm: eni: fix uninitialized variable warning f4691c14d449 stmmac: debugfs entry name is not be changed when udev rename device name. 9d54646059b2 drm/amd/display: Reduce HDMI pixel encoding if max clock is exceeded a347d66cbec7 iommu/dma: fix variable 'cookie' set but not used 4fe14f9db5c9 gpio: max77620: Add missing dependency on GPIOLIB_IRQCHIP dfe190e77862 net: wan: sdla: Fix cast from pointer to integer of different size eea2b2bb502f drivers/net/b44: Change to non-atomic bit operations on pwol_mask c2ae3ce351be net: Google gve: Remove dma_wmb() before ringing doorbell 7db4e6c728cb spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent calls db10c64764eb can: tcan4x5x: tcan4x5x_parse_config(): reset device before register access 68d199fc8e66 usb: musb: jz4740: Silence error if code is -EPROBE_DEFER 3ecda03a5c13 watchdog: orion: fix platform_get_irq() complaints b39f38f0ebed watchdog: rn5t618_wdt: fix module aliases 27757bfb8c72 watchdog: max77620_wdt: fix potential build errors 5399714dc2a1 HID: intel-ish-hid: ipc: Add Tiger Lake PCI device ID e5900bc22253 phy: cpcap-usb: Prevent USB line glitches from waking up modem 98aedb893555 ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime() 68b74847c8bc ASoC: fsl_audmix: add missed pm_runtime_disable a0636e211f8e phy: qcom-qmp: Increase PHY ready timeout b826ffe45a27 drivers/hid/hid-multitouch.c: fix a possible null pointer access. 32a369776bd5 ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free eedf205f0267 ASoC: SOF: fix fault at driver unload after failed probe 8cc2de41a529 HID: wacom: Recognize new MobileStudio Pro PID b55f9e9760c8 HID: intel-ish-hid: ipc: add CMP device id 22aa1db061d2 HID: Add quirk for incorrect input length on Lenovo Y720 854f39866e2f HID: asus: Ignore Asus vendor-page usage-code 0xff events 49de93b4018b HID: ite: Add USB id match for Acer SW5-012 keyboard dock 05c33c23d0b6 HID: Add quirk for Xin-Mo Dual Controller ae9484c6fb60 arc: eznps: fix allmodconfig kconfig warning f5adacf21c6e HID: multitouch: Add LG MELF0410 I2C touchscreen support b576b27f7ba4 rxrpc: Fix use-after-free in rxrpc_receive_data() d3da5e90665a net: include struct nhmsg size in nh nlmsg size 73226c74746d mlxsw: minimal: Fix an error handling path in 'mlxsw_m_port_create()' 3c8c966cc718 udp: segment looped gso packets correctly 87c681943725 net: socionext: fix xdp_result initialization in netsec_process_rx b7eda225ebc1 net: socionext: fix possible user-after-free in netsec_process_rx 717abad86460 net_sched: walk through all child classes in tc_bind_tclass() 55ec468d3093 net_sched: fix ops->bind_class() implementations 2d0b854393af net_sched: ematch: reject invalid TCF_EM_SIMPLE 79c13c063720 zd1211rw: fix storage endpoint lookup 226ed25115b7 rtl8xxxu: fix interface sanity check 670a39aeb07b brcmfmac: fix interface sanity check b896fe1da14f ath9k: fix storage endpoint lookup e08884197082 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() b396ec7241ed cifs: set correct max-buffer-size for smb2_ioctl_init() d65b067c2546 CIFS: Fix task struct use-after-free on reconnect 4f753389bcdc crypto: chelsio - fix writing tfm flags to wrong place 9ba7636fdb42 driver core: Fix test_async_driver_probe if NUMA is disabled 3811bd2b93af iio: st_gyro: Correct data for LSM9DS0 gyro a6d19450c314 iio: adc: stm32-dfsdm: fix single conversion 29795e4f6a36 mei: me: add comet point (lake) H device ids 9272a0797833 mei: hdcp: bind only with i915 on the same PCH 7d46883724e0 binder: fix log spam for existing debugfs file creation. 3e832cf807e8 component: do not dereference opaque pointer in debugfs 6826af9a5c3f debugfs: Return -EPERM when locked down 3b16600e1fd4 serial: imx: fix a race condition in receive path f54b5d4a1abc serial: 8250_bcm2835aux: Fix line mismatch on driver unbind 0710da067387 staging: vt6656: Fix false Tx excessive retries reporting. a56c0f7d5f15 staging: vt6656: use NULLFUCTION stack on mac80211 1a80cc38db42 staging: vt6656: correct packet types for CTS protect, mode. 3a5bff77f48c staging: wlan-ng: ensure error return is actually returned b5e5d81230ec staging: most: net: fix buffer overflow 9ba5957e034d usb: typec: fusb302: fix "op-sink-microwatt" default that was in mW 9bfa308e95b1 usb: typec: wcove: fix "op-sink-microwatt" default that was in mW 445839bc7fa3 usb: dwc3: turn off VBUS when leaving host mode 1fe175772b99 USB: serial: ir-usb: fix IrLAP framing c9b7dcee64c1 USB: serial: ir-usb: fix link-speed handling 85eec8cf9d22 USB: serial: ir-usb: add missing endpoint sanity check 380a352cd3e9 usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186 f841bbcf8130 usb: dwc3: pci: add ID for the Intel Comet Lake -V variant 566264c8b6e3 rsi_91x_usb: fix interface sanity check c48a89147160 orinoco_usb: fix interface sanity check 619c458f8f39 Bluetooth: btusb: fix non-atomic allocation in completion handler 60b6aa2b71ef Linux 5.4.16 d8a11e0f4e26 net/x25: fix nonblocking connect ce75dd3abbc8 netfilter: nf_tables: autoload modules from the abort path 07ac418120ae netfilter: nf_tables: add __nft_chain_type_get() ea52197c9c4b netfilter: ipset: use bitmap infrastructure completely d5fd8ac3fcc5 media: v4l2-ioctl.c: zero reserved fields for S/TRY_FMT 40b1747b0368 libertas: Fix two buffer overflows at parsing bss descriptor 74389183b671 net/sonic: Prevent tx watchdog timeout 58c0c4b122b1 net/sonic: Fix CAM initialization 079e7e775895 net/sonic: Fix command register usage 4d391c40c295 net/sonic: Quiesce SONIC before re-initializing descriptor memory 9f638adb9f1a net/sonic: Fix receive buffer replenishment 3a0c502d4535 net/sonic: Improve receive descriptor status flag check 3a2137846347 net/sonic: Avoid needless receive descriptor EOL flag updates f6ecc13bea2b net/sonic: Fix receive buffer handling e7092fbffc34 net/sonic: Fix interface error stats collection c5a85f05e462 net/sonic: Use MMIO accessors c463d5a17032 net/sonic: Clear interrupt flags immediately 091c1715f9dd net/sonic: Add mutual exclusion for accessing shared state ab94448beeab readdir: be more conservative with directory entry names 454759886d0b do_last(): fetch directory ->i_mode and ->i_uid before it's too late 5d001c4f74e0 net, sk_msg: Don't check if sock is locked when tearing down psock b2e061912c3e xfrm: support output_mark for offload ESP packets 4e1572b19c64 drm/i915/userptr: fix size calculation 503b54ab9666 iwlwifi: mvm: fix potential SKB leak on TXQ TX 1e3c082df320 iwlwifi: mvm: fix SKB leak on invalid queue 68ee631ba110 tracing: xen: Ordered comparison of function pointers 3c6a183d3108 scsi: RDMA/isert: Fix a recently introduced regression related to logout bbf0d37947f7 hwmon: (nct7802) Fix non-working alarm on voltages 515b97c73447 hwmon: (nct7802) Fix voltage limits to wrong registers 54b818246b03 hsr: Fix a compilation error 5440678b5acb leds: gpio: Fix uninitialized gpio label for fwnode based probe 376b860334d2 readdir: make user_access_begin() use the real access range 16aab32ff8b3 iommu/amd: Fix IOMMU perf counter clobbering during init 9f6216862a20 lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user() 9e2e1a5abccd netfilter: nft_osf: add missing check for DREG attribute 373ffce2337b Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register 21aa01da9dba Input: pegasus_notetaker - fix endpoint sanity check c65dfef27803 Input: aiptek - fix endpoint sanity check 56ded4adf16e Input: gtco - fix endpoint sanity check 3e629da150b5 Input: sur40 - fix interface sanity checks 68c2bc4da098 Input: pm8xxx-vib - fix handling of separate enable register c3f6abfe2f11 net/tls: fix async operation c9cb4f2bea44 mlxsw: switchx2: Do not modify cloned SKBs during xmit 77d323cc3783 mmc: sdhci_am654: Reset Command and Data line after tuning d5bb81660456 mmc: sdhci_am654: Remove Inverted Write Protect flag d8bc6ac2db28 mmc: sdhci: fix minimum clock rate for v3 controller 723f200e19bd mmc: tegra: fix SDR50 tuning override bccb1568bae8 ARM: 8950/1: ftrace/recordmcount: filter relocation types ff847d466bdb Revert "Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers" cec754961758 Input: keyspan-remote - fix control-message timeouts 5d1973adcfff iommu/vt-d: Call __dmar_remove_one_dev_info with valid pointer d4616a9f8ee9 pinctrl: sunrisepoint: Add missing Interrupt Status register offset dd05cf12c72f XArray: Fix xas_find returning too many entries db38561288b7 XArray: Fix xa_find_after with multi-index entries a5135ca1f92a XArray: Fix infinite loop with entry at ULONG_MAX b8560e3d90af iwlwifi: mvm: don't send the IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues 4e7d8cd6a1a8 Revert "iwlwifi: mvm: fix scan config command size" 7cf7a7d02587 powerpc/xive: Discard ESB load value when interrupt is invalid 6145307fa693 powerpc/mm/hash: Fix sharing context ids between kernel & userspace bf470f051556 tracing: Fix histogram code when expression has same var as value 07af0d03e8b2 tracing: Do not set trace clock if tracefs lockdown is in effect 67551f958458 tracing/uprobe: Fix double perf_event linking on multiprobe uprobe 44eebad10496 tracing: trigger: Replace unneeded RCU-list traversals b1302cbe530b PM: hibernate: fix crashes with init_on_free=1 d63b777d8145 drm/i915: Align engine->uabi_class/instance with i915_drm.h 3e041c27b990 drm/panfrost: Add the panfrost_gem_mapping concept 8c40a8d7d384 PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken fdd0f3b0e98b ceph: hold extra reference to r_parent over life of request 19d0cd212742 hwmon: (core) Do not use device managed functions for memory allocations 0387ee1b95d1 hwmon: (adt7475) Make volt2reg return same reg as reg2volt input 2d00fec60c8d afs: Fix characters allowed into cell names b29d143a690a Revert "io_uring: only allow submit from owning task" 29ce06b6b6d4 ipv4: Detect rollover in specific fib table dump 9bd7ae7eab7c net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path 43eda24c6f75 net/mlx5e: kTLS, Remove redundant posts in TX resync flow 384faad2ad5a net/mlx5e: kTLS, Fix corner-case checks in TX resync flow 7ae31c620dcc net/mlx5: DR, use non preemptible call to get the current cpu number 8a3b1a86d4f3 net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep b20f5fb7d473 net/mlx5: DR, Enable counter on non-fwd-dest objects ffc574c95e5b net/mlx5: Update the list of the PCI supported devices 36940c4daad0 net/mlx5: Fix lowest FDB pool size d18d22ce8f62 net: Fix packet reordering caused by GRO and listified RX cooperation 8bc302520616 fou: Fix IPv6 netlink policy e7b6ef675c46 mlxsw: spectrum_acl: Fix use-after-free during reload ef3c0a1660a7 airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE 9975b19b8d82 airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE a802ddbf41a3 tun: add mutex_unlock() call and napi.skb clearing in tun_get_user() 69486bfa064e tcp: do not leave dangling pointers in tp->highest_sack 562a7c35049c tcp_bbr: improve arithmetic division in bbr_update_bw() 41c230ae2aa4 Revert "udp: do rmem bulk free even if the rx sk queue is empty" 63635790a891 net: usb: lan78xx: Add .ndo_features_check d6f7ed61fa6e net-sysfs: Fix reference count leak 9b60a32108e2 net_sched: use validated TCA_KIND attribute in tc_new_tfilter() b6a9a954b3fe net_sched: fix datalen for ematch 888934af187c net: rtnetlink: validate IFLA_MTU attribute in rtnl_create_link() 500869d71822 net, ip_tunnel: fix namespaces move ead0377f601e net, ip6_tunnel: fix namespaces move 7943bb0f0636 net: ip6_gre: fix moving ip6gre between namespaces c6e524f4fad3 net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM 32df8d0bf461 net: bcmgenet: Use netif_tx_napi_add() for TX NAPI e2bd33937c50 ipv6: sr: remove SKB_GSO_IPXIP6 on End.D* actions 6cbb9683d743 gtp: make sure only SOCK_DGRAM UDP sockets are accepted 80a4c81c6791 firestream: fix memory leaks 34545cad8e04 can, slip: Protect tty->disc_data in write_wakeup and close with RCU Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 52f0e3b..5901ba4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine ?= "d8831a265698a000bb7305e0234dcaa302cf25a5" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index a028b37..9a18c63 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" -SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine_qemuarm ?= "e144b0946f1a159a8b5770f1fcedaebf8eadac84" +SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" PV = "5.4.15" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 9fbc47d..eea4f20 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" -SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" -SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" -SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine_qemuarm ?= "ab36b8853718cf0c92d6c37a62568d34424234e8" +SRCREV_machine_qemuarm64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemumips ?= "f9d6dd093282ef21a11d170660bb06ec81908836" +SRCREV_machine_qemuppc ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemuriscv64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemux86 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemux86-64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemumips64 ?= "8b16e493669ee19054a6407d331da75a32ed45b2" +SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:40 +0000 Subject: [oe-commits] [openembedded-core] 02/14: linux-yocto/5.4: update to v5.4.20 In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.C20032328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit db827b4a18b0fdd4b6d4106edee614de7f133ecc Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:54 2020 -0500 linux-yocto/5.4: update to v5.4.20 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 27dfbcc2f53d Linux 5.4.20 2d8fdc5744ff selinux: fall back to ref-walk if audit is required ae7f404d9227 libertas: make lbs_ibss_join_existing() return error code on rates overflow 61087dce64a5 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 3c822e1f3118 mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv() c5b071e3f44d mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status() 2cf2b620af7b dmaengine: axi-dmac: add a check for devm_regmap_init_mmio eada328f7f9b clk: meson: g12a: fix missing uart2 in regmap table 3cfb0b360b37 mfd: max77650: Select REGMAP_IRQ in Kconfig 3b9586e82c90 regmap: fix writes to non incrementing registers 4eb12ef7491d pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B 7b07d15aa5b4 pinctrl: sh-pfc: r8a77965: Fix DU_DOTCLKIN3 drive/bias control 875e01dd8a97 selinux: fix regression introduced by move_mount(2) syscall 3b2e595dfe2b selinux: revert "stop passing MAY_NOT_BLOCK to the AVC upon follow_link" 837c36e0451f bcache: avoid unnecessary btree nodes flushing in btree_flush_write() 7c71d438e7e5 dt-bindings: iio: adc: ad7606: Fix wrong maxItems value d15a2930f6d7 media: i2c: adv748x: Fix unsafe macros 30dd20c6d0e3 drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe 8dfa11837606 crypto: caam/qi2 - fix typo in algorithm's driver name 1f42c6de7b94 crypto: atmel-sha - fix error handling when setting hmac key fb42d3f4ec86 crypto: artpec6 - return correct error code for failed setkey() ee1c6b1aa9dc crypto: testmgr - don't try to decrypt uninitialized buffers 771fd0b2e8bf mtd: sharpslpart: Fix unsigned comparison to zero 1765aaef1753 mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock 7df80a021f66 arm64: nofpsmid: Handle TIF_FOREIGN_FPSTATE flag cleanly 0ec337059d71 KVM: arm64: Treat emulated TVAL TimerValue as a signed 32-bit integer a17d21640453 KVM: arm64: pmu: Fix chained SW_INCR counters a6229d1b5c22 KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset 93a509cf1182 KVM: arm: Make inject_abt32() inject an external abort instead 9cce31930ad3 KVM: arm: Fix DFSR setting for non-LPAE aarch32 guests 48f9ec2020b3 KVM: arm/arm64: Fix young bit from mmu notifier 537493f1460a arm64: ptrace: nofpsimd: Fail FP/SIMD regset operations 37014cee458c arm64: cpufeature: Set the FP/SIMD compat HWCAP bits properly 1a2b07a2c3dd arm64: cpufeature: Fix the type of no FP/SIMD capability ba95651cefe1 sched/uclamp: Fix a bug in propagating uclamp value in new cgroups 5d42957c9045 ARM: 8949/1: mm: mark free_memmap as __init 199808393ef7 KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections c406e5352155 ARM: at91: pm: use of_device_id array to find the proper shdwc node 69f08f44b4c1 ARM: at91: pm: use SAM9X60 PMC's compatible 451b91d88a1d iommu/arm-smmu-v3: Populate VMID field for CMDQ_OP_TLBI_NH_VA c4faf627c76e powerpc/pseries: Allow not having ibm, hypertas-functions::hcall-multi-tce for DDW cff30edec932 powerpc/pseries/vio: Fix iommu_table use-after-free refcount warning 5ca556d5edfd powerpc/papr_scm: Fix leaking 'bus_desc.provider_name' in some paths 05a23f436471 powerpc/ptdump: Only enable PPC_CHECK_WX with STRICT_KERNEL_RWX 17f37249d7db powerpc/ptdump: Fix W+X verification call in mark_rodata_ro() 6d7edac1469e Revert "powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests" 45c764da005a soc: qcom: rpmhpd: Set 'active_only' for active only power domains 0bf48acf4338 tools/power/acpi: fix compilation error 5d3453a5660b ARM: dts: at91: sama5d3: define clock rate range for tcb1 581a5fbf4f6d ARM: dts: at91: sama5d3: fix maximum peripheral clock rates 8e8802c93509 ARM: dts: meson8b: use the actual frequency for the GPU's 364MHz OPP 16665fffafee ARM: dts: meson8: use the actual frequency for the GPU's 182.1MHz OPP 3d2d8cd29c1b arm64: dts: marvell: clearfog-gt-8k: fix switch cpu port node c44134c2a287 arm64: dts: renesas: r8a77990: ebisu: Remove clkout-lr-synchronous from sound 6f9da85057c1 ARM: dts: am43xx: add support for clkout1 clock bd13285419b9 ARM: dts: at91: Reenable UART TX pull-ups d01521db86ac arm64: dts: uDPU: fix broken ethernet 5ee40005f420 arm64: dts: qcom: msm8998: Fix tcsr syscon size bc684844e7e0 platform/x86: intel_mid_powerbtn: Take a copy of ddata b09e3d3e79cf ARC: [plat-axs10x]: Add missing multicast filter number to GMAC node 2de1af2bcba0 watchdog: qcom: Use platform_get_irq_optional() for bark irq f599ae7529e6 rtc: cmos: Stop using shared IRQ 7a3aa58c0e02 rtc: hym8563: Return -EINVAL if the time is known to be invalid ffad5982ce58 x86/boot: Handle malformed SRAT tables during early ACPI parsing f4818129947c NFSv4.0: nfs4_do_fsinfo() should not do implicit lease renewals cf360732f811 NFSv4: try lease recovery on NFS4ERR_EXPIRED 5d0a6d77b69c NFSv4: pnfs_roc() must use cred_fscmp() to compare creds 86065de0eb0a NFS: Fix fix of show_nfs_errors 5d7030939d22 NFS/pnfs: Fix pnfs_generic_prepare_to_resend_writes() 1ef47a06d2d4 NFS: Revalidate the file size on a fatal write error b7560b5b72a2 nfs: NFS_SWAP should depend on SWAP 7842c7b30d75 bpf, sockmap: Check update requirements after locking 45d7b0e316d9 bpf: Improve bucket_log calculation logic cb675fde4c44 selftests/bpf: Test freeing sockmap/sockhash with a socket in it 1098f9696152 bpf, sockhash: Synchronize_rcu before free'ing map 657a17ce530e bpf, sockmap: Don't sleep while holding RCU lock on tear-down 1dfc34bd009a bpftool: Don't crash on missing xlated program instructions ec81471a70d1 iwlwifi: mvm: avoid use after free for pmsr request b706a4986382 PCI/AER: Initialize aer_fifo b51ac6e721d5 PCI: Don't disable bridge BARs when assigning bus resources 67016624a0be PCI: tegra: Fix afi_pex2_ctrl reg offset for Tegra30 df26f04f23bd PCI/switchtec: Fix vep_vector_number ioread width b72b8d0725b0 PCI/switchtec: Use dma_set_mask_and_coherent() 15818c08ca79 ath10k: pci: Only dump ATH10K_MEM_REGION_TYPE_IOREG when safe 4f0e6425a2da PCI/IOV: Fix memory leak in pci_iov_add_virtfn() da268240fb0a scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails 21702236f352 RDMA/umem: Fix ib_umem_find_best_pgsz() 56b22525ab80 RDMA/cma: Fix unbalanced cm_id reference count during address resolve b73401025a14 RDMA/uverbs: Verify MR access flags 78923675151e RDMA/core: Fix locking in ib_uverbs_event_read 33daaea78a1f RDMA/i40iw: fix a potential NULL pointer dereference b1f90d263a3b RDMA/netlink: Do not always generate an ACK for some netlink operations 839fb9e04cd7 IB/mlx4: Fix leak in id_map_find_del 996dc3d50add IB/srp: Never use immediate data if it is disabled by a user 56f5f41e80b3 IB/mlx4: Fix memory leak in add_gid error flow b96c27b1891b hv_sock: Remove the accept port restriction f7775193b643 ASoC: pcm: update FE/BE trigger order based on the command d6591ea2dd1a Linux 5.4.19 866323ccc138 powerpc/kuap: Fix set direction in allow/prevent_user_access() 3556d66be3f1 regulator fix for "regulator: core: Add regulator_is_equal() helper" 0f51165c22e4 rxrpc: Fix service call disconnection 743823969080 perf/core: Fix mlock accounting in perf_mmap() d1318034e9e9 clocksource: Prevent double add_timer_on() for watchdog_timer d15b033e9603 x86/apic/msi: Plug non-maskable MSI affinity race b64d7f7af8f9 cifs: fail i/o on soft mounts if sessionsetup errors out 3e3e8551a5a2 KVM: Play nice with read-only memslots when querying host page size 7426ddf01f16 KVM: Use vcpu-specific gva->hva translation when querying host page size 09bd0033df05 KVM: nVMX: vmread should not set rflags to specify success in case of #PF 1d6cfa003c21 KVM: x86: fix overlap between SPTE_MMIO_MASK and generation 8a1cd01bee30 KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM fc46f8a115e5 KVM: x86: use CPUID to locate host page table reserved bits f805ec37828b KVM: x86/mmu: Apply max PA check for MMIO sptes to 32-bit KVM 59593aed7e9e drm/dp_mst: Remove VCPI while disabling topology mgr 498742625716 btrfs: free block groups after free'ing fs trees 26ca39ac5593 btrfs: use bool argument in free_root_pointers() d0d327fe37cc x86/timer: Don't skip PIT setup when APIC is disabled or in legacy mode 8fbabd15bdbc mfd: bd70528: Fix hour register mask 555b3025e8fa mfd: rn5t618: Mark ADC control register volatile 3cf5733a2db7 mfd: da9062: Fix watchdog compatible string 9af68afd832f ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug 207014751cd1 net/mlx5: Deprecate usage of generic TLS HW capability bit 70b68add8d65 net/mlx5: Fix deadlock in fs_core 0fea83e06f12 drop_monitor: Do not cancel uninitialized work item 2b2de489c823 qed: Fix timestamping issue for L2 unicast ptp packets. 036ecba2eb99 ipv6/addrconf: fix potential NULL deref in inet6_set_link_af() 7fd6c4da37d4 taprio: Fix dropping packets when using taprio + ETF offloading a5b959885c45 taprio: Use taprio_reset_tc() to reset Traffic Classes configuration ee6adcf2c318 taprio: Add missing policy validation for flags d544302521af taprio: Fix still allowing changing the flags during runtime 47578c894979 taprio: Fix enabling offload with wrong number of traffic classes 4c4153375b67 net: macb: Limit maximum GEM TX length in TSO 96ad794892e7 net: macb: Remove unnecessary alignment check for TSO 9211b26dcfee net/mlx5: IPsec, fix memory leak at mlx5_fpga_ipsec_delete_sa_ctx 0be678f179e0 net/mlx5: IPsec, Fix esp modify function attribute 74888191bb13 net: systemport: Avoid RBUF stuck in Wake-on-LAN mode 8526c3b6e753 net: stmmac: fix a possible endless loop ebf9cdfbcd38 net_sched: fix a resource leak in tcindex_set_parms() 6994d92ed59a net: mvneta: move rx_dropped and rx_errors in per-cpu stats 76e828ceafee net: dsa: microchip: enable module autoprobe 07d7fcb1dd29 net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port 84e4db766fc6 net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan() fddb5a50801a dpaa_eth: support all modes with rate adapting PHYs 3f90dce11916 devlink: report 0 after hitting end in region read 6978e2935c74 bonding/alb: properly access headers in bond_alb_xmit() 0a56a2e1624a ASoC: sgtl5000: Fix VDDA and VDDIO comparison 67d5b7a1f971 regulator: core: Add regulator_is_equal() helper c533cf50fdf6 ubifs: Fix memory leak from c->sup_node fa70d4f7f8e0 ubi: Fix an error pointer dereference in error handling code 6f362620793b ubi: fastmap: Fix inverted logic in seen selfcheck c6d07f6e50e4 virtio_balloon: Fix memory leaks on errors in virtballoon_probe() 3ac13462f55a virtio-balloon: Fix memory leak when unloading while hinting is in progress 7eece787ed82 nfsd: Return the correct number of bytes written to the file e94829641e69 nfsd: fix jiffies/time_t mixup in LRU list 9f3fa8bea96d nfsd: fix delay timer on 32-bit architectures 0d1dacfda0e5 IB/core: Fix ODP get user pages flow 320a24fae280 IB/mlx5: Fix outstanding_pi index for GSI qps b4d104ce6dfe net: tulip: Adjust indentation in {dmfe, uli526x}_init_module 9b14bd934ce3 net: smc911x: Adjust indentation in smc911x_phy_configure 761b51409246 ppp: Adjust indentation into ppp_async_input bd1bac782d92 NFC: pn544: Adjust indentation in pn544_hci_check_presence da535ca18ef5 drm: msm: mdp4: Adjust indentation in mdp4_dsi_encoder_enable bf45386cef7e powerpc/44x: Adjust indentation in ibm4xx_denali_fixup_memsize 0a7473b27eb9 ext2: Adjust indentation in ext2_fill_super 421b77ae26f4 phy: qualcomm: Adjust indentation in read_poll_timeout 55a268cf341f mtd: spi-nor: Split mt25qu512a (n25q512a) entry into two 3c9edf55817a scsi: ufs: Recheck bkops level if bkops is disabled 5f8c02d32223 scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free bdc7651e6164 scsi: csiostor: Adjust indentation in csio_device_reset 454db8d6163b scsi: qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type 05dceb5a62ce ASoC: meson: axg-fifo: fix fifo threshold setup 7c662f69fa05 percpu: Separate decrypted varaibles anytime encryption can be enabled 59c458d51099 broken ping to ipv6 linklocal addresses on debian buster 07fbef9a6e18 fix up iter on short count in fuse_direct_io() e0fc65ef8a60 virtio-pci: check name when counting MSI-X vectors f603b3714e4e virtio-balloon: initialize all vq callbacks fe84d084b2e9 drm/amd/dm/mst: Ignore payload update failures f4bda8b61e7c clk: tegra: Mark fuse clock as critical 806cabd3117f mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush 091c96151279 arm64: dts: qcom: qcs404-evb: Set vdd_apc regulator in high power mode ed53278ee834 mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section 03c03090c3aa ocfs2: fix oops when writing cloned file 6e41b5499960 KVM: s390: do not clobber registers during guest reset/store status b1f9f9b84374 KVM: x86: Revert "KVM: X86: Fix fpu state crash in kvm guest" 58e1e7514f06 KVM: x86: Ensure guest's FPU state is loaded when accessing for emulation a6ff6e0546d0 KVM: x86: Handle TIF_NEED_FPU_LOAD in kvm_{load,put}_guest_fpu() e3a37628c46d KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails 9d9933f7f3f4 KVM: x86: Don't let userspace set host-reserved cr4 bits 715f9f9a0768 KVM: VMX: Add non-canonical check on writes to RTIT address MSRs 2aebc6ed84ef x86/KVM: Clean up host's steal time structure f7c1a6c67ff3 x86/kvm: Cache gfn to pfn translation d71eef9fcc0b x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed a3db2949904b x86/kvm: Introduce kvm_(un)map_gfn() 68460ceba319 x86/kvm: Be careful not to clear KVM_VCPU_FLUSH_TLB bit d0671151c2b9 kvm/svm: PKU not currently supported 9213699efd1f KVM: PPC: Book3S PR: Free shared page if mmu initialization fails b2301deda8ce KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails 0718e2d3dc54 KVM: x86: Fix potential put_fpu() w/o load_fpu() on MPX platform 72324a1db6a1 KVM: x86: Protect MSR-based index computations in fixed_msr_to_seg_unit() from Spectre-v1/L1TF attacks 2fb35312c070 KVM: x86: Protect x86_decode_insn from Spectre-v1/L1TF attacks f2a514318263 KVM: x86: Protect MSR-based index computations from Spectre-v1/L1TF attacks in x86.c a07fdd5fcb30 KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks c09be769b48d KVM: x86: Protect MSR-based index computations in pmu.h from Spectre-v1/L1TF attacks 2f8a13754e05 KVM: x86: Protect ioapic_write_indirect() from Spectre-v1/L1TF attacks c8a6b5918942 KVM: x86: Protect kvm_hv_msr_[get|set]_crash_data() from Spectre-v1/L1TF attacks bf13472e5c05 KVM: x86: Protect kvm_lapic_reg_write() from Spectre-v1/L1TF attacks 8b73ccf4b475 KVM: x86: Protect DR-based index computations from Spectre-v1/L1TF attacks c2b02d093a08 KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks 79777eb82c23 KVM: x86: Refactor prefix decoding to prevent Spectre-v1/L1TF attacks 443fd0049dcf KVM: x86: Refactor picdev_write() to prevent Spectre-v1/L1TF attacks 8dcbf26833cc aio: prevent potential eventfd recursion on poll 844d2025b68d eventfd: track eventfd_signal() recursion depth d5d6b5887241 bcache: add readahead cache policy options via sysfs interface f158399c1fe9 watchdog: fix UAF in reboot notifier handling in watchdog core code c157da57304e xen/balloon: Support xend-based toolstack take two 726599c63799 tools/kvm_stat: Fix kvm_exit filter name 7a19bd6fe21b media: rc: ensure lirc is initialized before registering input device fd52d88c1dd8 media: iguanair: fix endpoint sanity check ae116f21b24a drm/rect: Avoid division by zero 5b442859ab80 drm: atmel-hlcdc: prefer a lower pixel-clock than requested d065ae83dff8 drm: atmel-hlcdc: enable clock before configuring timing engine 6421785d17e1 drm: atmel-hlcdc: use double rate for pixel clock only if supported ae35ac3c4b08 gfs2: fix O_SYNC write handling 637348690865 gfs2: move setting current->backing_dev_info c61b93fae603 gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0 65afa6958134 sunrpc: expiry_time should be seconds not timeval 301763168c5f mwifiex: fix unbalanced locking in mwifiex_process_country_ie() 535a755d6e6d iwlwifi: don't throw error when trying to remove IGTK cbe53807a14d ARM: tegra: Enable PLLP bypass during Tegra124 LP1 9e78c0e74261 btrfs: Correctly handle empty trees in find_first_clear_extent_bit d82ff2d6406d btrfs: flush write bio if we loop in extent_write_cache_pages 5e7a9ad78d56 Btrfs: fix race between adding and putting tree mod seq elements and nodes ce066845584a btrfs: drop log root for dropped roots 7baf8f665b77 btrfs: set trans->drity in btrfs_commit_transaction 78748f249199 Btrfs: fix infinite loop during fsync after rename operations 79a29dee9024 Btrfs: make deduplication with range including the last block work ddb36ab79b11 Btrfs: fix missing hole after hole punching and fsync when using NO_HOLES f0edd3abee0d ext4: fix race conditions in ->d_compare() and ->d_hash() d44fa04f0864 ext4: fix deadlock allocating crypto bounce page from mempool b19f130269c0 jbd2_seq_info_next should increase position index 6282102dbcbf nfsd: fix filecache lookup 4544a6912416 NFS: Directory page cache pages need to be locked when read 293cdcd89b6c NFS: Fix memory leaks and corruption in readdir 8d313c04b425 scsi: qla2xxx: Fix unbound NVME response length 246a54895ac6 powerpc/futex: Fix incorrect user access blocking eee7a67c0391 crypto: picoxcell - adjust the position of tasklet_init and fix missed tasklet_kill e057d64f86d4 crypto: api - Fix race condition in crypto_spawn_alg 12a15e1c544e crypto: atmel-aes - Fix counter overflow in CTR mode 2c4d8203ff0c crypto: pcrypt - Do not clear MAY_SLEEP flag in original request ded7c73a2b8c crypto: arm64/ghash-neon - bump priority to 150 3a35871603a6 crypto: ccp - set max RSA modulus size for v3 platform devices as well 58d8f2dec6ab crypto: hisilicon - Use the offset fields in sqe to avoid need to split scatterlists a791fc62a574 crypto: api - fix unexpectedly getting generic implementation 1f5f3f65f956 selftests: bpf: Ignore FIN packets for reuseport tests 44a522bf5edc selftests: bpf: Use a temporary file in test_sockmap da43712a7262 selftests/bpf: Skip perf hw events test if the setup disabled it 49437ecf9f30 selftests/bpf: Fix test_attach_probe c0ada6ad3ec5 samples/bpf: Xdp_redirect_cpu fix missing tracepoint attach a69af866bd35 samples/bpf: Don't try to remove user's homedir on clean fbee8f61747f tc-testing: fix eBPF tests failure on linux fresh clones f7a2ccc00a36 libbpf: Fix realloc usage in bpf_core_find_cands ab48c14a444b bpf, devmap: Pass lockdep expression to RCU lists 77bb53cb0948 selftests/bpf: Fix perf_buffer test on systems w/ offline CPUs 5b0e9b563c01 riscv, bpf: Fix broken BPF tail calls f3107a3c9b84 btrfs: Handle another split brain scenario with metadata uuid feature dd9837259de0 btrfs: fix improper setting of scanned for range cyclic write cache pages b4c8ed0bf977 crypto: pcrypt - Avoid deadlock by using per-instance padata queues c8e9dafe668d ftrace: Protect ftrace_graph_hash with ftrace_sync 6a652ed941aa ftrace: Add comment to why rcu_dereference_sched() is open coded c9dc142b39a8 tracing: Annotate ftrace_graph_notrace_hash pointer with __rcu 024537c7548f tracing: Annotate ftrace_graph_hash pointer with __rcu df57920d6e18 ASoC: SOF: core: release resources on errors in probe_continue 3145862d8f9e ASoC: SOF: Introduce state machine for FW boot 0b84591fdd5e scsi: qla2xxx: Fix stuck login session using prli_pend_timer 78cbd2c397bf dm: fix potential for q->make_request_fn NULL pointer 1426201af047 dm thin metadata: use pool locking at end of dm_pool_metadata_close 40d3d8d6eb64 dm crypt: fix benbi IV constructor crash if used in authenticated mode b805ec7d089f dm crypt: fix GFP flags passed to skcipher_request_alloc() 1781fa54a4ea dm writecache: fix incorrect flush sequence when doing SSD mode commit a8d99d630117 dm space map common: fix to ensure new block isn't already in use 188f9b710ff1 dm zoned: support zone sizes smaller than 128MiB ad7c38abe8ba ARM: dma-api: fix max_pfn off-by-one error in __dma_supported() bae74e7ac842 of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc f5f68d165dc0 cpufreq: Avoid creating excessively large stack frames 7dce99d3182a PM: core: Fix handling of devices deleted during system-wide resume e9116299ffac f2fs: fix race conditions in ->d_compare() and ->d_hash() 6d722cd2e387 f2fs: fix dcache lookup of !casefolded directories f4803553aae6 f2fs: code cleanup for f2fs_statfs_project() b1de9ec0e788 f2fs: fix miscounted block limit in f2fs_statfs_project() ae2cb41583a9 f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project() 08846286bf28 ovl: fix lseek overflow on 32bit 809e16a6eeb3 ovl: fix wrong WARN_ON() in ovl_cache_update_ino() 03572189d61c power: supply: ltc2941-battery-gauge: fix use-after-free 6f33d59ae165 power: supply: axp20x_ac_power: Fix reporting online status 4eed5d3bb14a cpupower: Revert library ABI changes from commit ae2917093fb60bdc1ed3e 2b27acfde9b2 scsi: qla2xxx: Fix mtcp dump collection failure edd15b154653 scsi: megaraid_sas: Do not initiate OCR if controller is not in ready state 3728834fff19 erofs: fix out-of-bound read for shifted uncompressed block 3ebbfdf41d26 scripts/find-unused-docs: Fix massive false positives a421f513779c fs: allow deduplication of eof block into the end of the destination file 5fefc9b3e358 padata: Remove broken queue flushing 5f63963669ec crypto: ccree - fix PM race condition 5e33535cf13c crypto: ccree - fix FDE descriptor sequence d8760030e701 crypto: ccree - fix pm wrongful error reporting 70439e8b7ccf crypto: ccree - fix AEAD decrypt auth fail 80c660892c24 crypto: ccree - fix backlog memory leak d2b1dcd5430f crypto: api - Check spawn->alg under lock in crypto_drop_spawn 0ed43162f578 nvmem: core: fix memory abort in cleanup path 6bdd1a0ed111 mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile 385c61a41cf9 hv_balloon: Balloon up according to request page number 570a29b1f75b ASoC: SOF: core: free trace on errors 84c9efd2f855 mmc: sdhci-of-at91: fix memleak on clk_get failure 65e6f63ebfb9 ubifs: Fix deadlock in concurrent bulk-read and writepage e3a561aa5376 ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag 91f96a9cdd82 ubifs: Fix wrong memory allocation 0119c617ebb6 ubifs: don't trigger assertion on invalid no-key filename 9220bf17ae18 fscrypt: don't print name of busy file when removing key ad270734193e alarmtimer: Unregister wakeup source when module get fails 05b147599f9d ACPI / battery: Deal better with neither design nor full capacity not being reported 7b86d05d1b02 ACPI / battery: Use design-cap for capacity calculations if full-cap is not available 93bba324c28a ACPI / battery: Deal with design or full capacity being reported as -1 832d6f76f268 ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards 44f6e43924f8 mmc: spi: Toggle SPI polarity, do not hardcode it 47bdd025b921 PCI: keystone: Fix error handling when "num-viewport" DT property is not populated a8b56e222300 PCI: keystone: Fix link training retries initiation 6700c0d9ae92 PCI: keystone: Fix outbound region mapping 05d56da81d94 PCI: tegra: Fix return value check of pm_runtime_get_sync() 38b67e60b6b5 tracing: Fix now invalid var_ref_vals assumption in trace action 5b92f86c8492 powerpc/32s: Fix CPU wake-up from sleep mode 4135a03fdf2e powerpc/32s: Fix bad_kuap_fault() 1bd3b871af57 powerpc/pseries: Advance pfn if section is not present in lmb_is_removable() 02c4699fb664 powerpc/xmon: don't access ASDR in VMs 796085dbe323 powerpc/ptdump: Fix W+X verification 2cabe61ab8ae powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case 63098a93063a s390/mm: fix dynamic pagetable upgrade for hugetlbfs e25f00c69039 MIPS: boot: fix typo in 'vmlinux.lzma.its' target bd9abdfd68b2 MIPS: fix indentation of the 'RELOCS' message 6b29d4a1f832 MIPS: syscalls: fix indentation of the 'SYSNR' message 6cca9100db90 KVM: arm64: Only sign-extend MMIO up to register width 4dd5c62d2e4c KVM: arm/arm64: Correct AArch32 SPSR on exception entry b0e01e9d2353 KVM: arm/arm64: Correct CPSR on exception entry cc7931dc766f KVM: arm64: Correct PSTATE on exception entry 5222ded5c72c arm64: acpi: fix DAIF manipulation with pNMI 79c56db06547 ALSA: hda: Add JasperLake PCI ID and codec vid 3d938d9febd1 ALSA: hda: Add Clevo W65_67SB the power_save blacklist 6cb7581f5702 ALSA: hda: Apply aligned MMIO access only conditionally 68efc422c547 platform/x86: intel_scu_ipc: Fix interrupt support 5bf25f3828a2 x86/cpu: Update cached HLE state on write to TSX_CTRL_CPUID_CLEAR 146f086a409b irqdomain: Fix a memory leak in irq_domain_push_irq() db165906cad5 lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() 9cbcbfc67b25 media: v4l2-rect.h: fix v4l2_rect_map_inside() top/left adjustments 965ccdedf1bf media: v4l2-core: compat: ignore native command codes d2db1cbc751f media/v4l2-core: set pages dirty upon releasing DMA buffers d364e9b37cc9 mm: move_pages: report the number of non-attempted pages 95419e7ef266 mm: thp: don't need care deferred split queue in memcg charge move path aab4189dfdb1 mm/memory_hotplug: fix remove_memory() lockdep splat cb33e477a50b utimes: Clamp the timestamps in notify_change() 73031a617ac3 mmc: sdhci-pci: Make function amd_sdhci_reset static af823232b018 mm/sparse.c: reset section's mem_map when fully deactivated c2c814fc9aee memcg: fix a crash in wb_workfn when a device disappears 39fac95159b4 ALSA: dummy: Fix PCM format loop in proc output 6edf790e9e51 ALSA: usb-audio: Annotate endianess in Scarlett gen2 quirk 85dbab63b461 ALSA: usb-audio: Fix endianess in descriptor validation 2068fbb20b9f usb: gadget: f_ecm: Use atomic_t to track in-flight request a7d00597e0b7 usb: gadget: f_ncm: Use atomic_t to track in-flight request 683b53b5aa12 usb: gadget: legacy: set max_speed to super-speed 063daad1412e usb: gadget: f_fs: set req->num_sgs as 0 for non-sg transfer 47dbff795049 objtool: Silence build output 72a533fc29e1 usb: typec: tcpci: mask event interrupts when remove driver 91cfedb762bd usb: dwc3: gadget: Delay starting transfer 1dc0d21fc1e6 usb: dwc3: gadget: Check END_TRANSFER completion 4e5d1bf6e68f brcmfmac: Fix memory leak in brcmf_usbdev_qinit 1c8c75275f97 Bluetooth: btusb: Disable runtime suspend on Realtek devices 1bfecb50771d Bluetooth: btusb: fix memory leak on fw 21780d1fd65b nvmet: Fix controller use after free 6243cb9e32d2 nvmet: Fix error print message at nvmet_install_queue function 6a4fea54ab46 rcu: Use READ_ONCE() for ->expmask in rcu_read_unlock_special() c71706a5ffff srcu: Apply *_ONCE() to ->srcu_last_gp_end dcad7270b2c7 rcu: Avoid data-race in rcu_gp_fqs_check_wake() a523031513b7 rcu: Use *_ONCE() to protect lockless ->expmask accesses d42b2370f28a tracing: Fix sched switch start/stop refcount racy updates e39351c52efb tracing/kprobes: Have uname use __get_str() in print_fmt 59b2e64b16bb ipc/msg.c: consolidate all xxxctl_down() functions 8ce07d95d67a netfilter: ipset: fix suspicious RCU usage in find_set_and_id 7bad0dda8164 mfd: dln2: More sanity checking for endpoints 6fcbff54ded1 media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors 9f5c4fac341c bnxt_en: Fix logic that disables Bus Master during firmware reset. fddd3f73ad08 netdevsim: fix stack-out-of-bounds in nsim_dev_debugfs_init() f146529c0049 MAINTAINERS: correct entries for ISDN/mISDN section 096df4720ab6 ionic: fix rxq comp packet type mask b6a7ba0e8622 tcp: clear tp->segs_{in|out} in tcp_disconnect() 31fceaf08597 tcp: clear tp->data_segs{in|out} in tcp_disconnect() 2fc4773b6af7 tcp: clear tp->delivered in tcp_disconnect() c9b6c6d07e5c tcp: clear tp->total_retrans in tcp_disconnect() 269a3c472a6f rxrpc: Fix NULL pointer deref due to call->conn being cleared on disconnect 843e115de475 rxrpc: Fix missing active use pinning of rxrpc_local object 524cba2f8de5 rxrpc: Fix insufficient receive notification generation 62221a9b1c9a rxrpc: Fix use-after-free in rxrpc_put_local() 5fa06c956821 bnxt_en: Fix TC queue mapping. 8566221e46eb net: stmmac: Delete txtimer in suspend() dd8142a6fa52 net_sched: fix an OOB access in cls_tcindex 919f13c56485 net: hsr: fix possible NULL deref in hsr_handle_frame() f3dea4cea67a l2tp: Allow duplicate session creation with UDP b080bc8481d9 gtp: use __GFP_NOWARN to avoid memalloc warning 0f8f0429a299 cls_rsvp: fix rsvp_policy 097ef8be69a3 bnxt_en: Move devlink_register before registering netdev aaf5369c72e9 sparc32: fix struct ipc64_perm type definition Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 5901ba4..fc31dc8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "d8831a265698a000bb7305e0234dcaa302cf25a5" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 9a18c63..cfecf98 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e144b0946f1a159a8b5770f1fcedaebf8eadac84" -SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" +SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "5.4.15" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index eea4f20..aa17380 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ab36b8853718cf0c92d6c37a62568d34424234e8" -SRCREV_machine_qemuarm64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemumips ?= "f9d6dd093282ef21a11d170660bb06ec81908836" -SRCREV_machine_qemuppc ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemuriscv64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemux86 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemux86-64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemumips64 ?= "8b16e493669ee19054a6407d331da75a32ed45b2" -SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" +SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" +SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" +SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:42 +0000 Subject: [oe-commits] [openembedded-core] 04/14: linux-yocto: fix PV In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.D4D222328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0428b2b1c7acc7f38e5022d69e44502f95a39da1 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:56 2020 -0500 linux-yocto: fix PV For whatever reason, the creation of the 5.4 recipes missed the PV that we've always had in linux-yocto. PV follows the LINUX_VERSION variable and clearly indicates that we have git commits in our tree above the -stable releases. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index fc31dc8..ab93f1b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index cfecf98..097357d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index aa17380..0b2a230 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -35,7 +35,7 @@ LINUX_VERSION ?= "5.4.20" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:41 +0000 Subject: [oe-commits] [openembedded-core] 03/14: linux-yocto/5.2: update to v5.2.29 In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.CC3082328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 46de7a665ac91ee2e726b7d8eed3b9a43babd71e Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:55 2020 -0500 linux-yocto/5.2: update to v5.2.29 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: 928ea9c56927 Linux 5.2.29 4e41907620bc slip: Fix use-after-free Read in slip_open d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support 4ac031b15d86 USB: serial: mos7840: fix remote wakeup 4d44a218aea6 USB: serial: mos7720: fix remote wakeup 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 13a33fb9debe appledisplay: fix error handling in the scheduled work 0cd437d7c16b USB: chaoskey: fix error case of a timeout 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status 726510907c68 USBIP: add config dependency for SGL_ALLOC 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer 1e4921f684ca media: imon: invalid dereference in imon_touch_event d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq 767facdefa23 media: usbvision: Fix races among open, close, and disconnect ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true 57f2b5c44f02 nfc: port100: handle command failure cleanly 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD c938307a439a futex: Prevent robust futex exit race 8b0f13ee2b7b nbd: prevent memory leak 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" 53eaf5993eea ath9k_hw: fix uninitialized variable data 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() 01d151b7e74e virtio_balloon: fix shrinker count caae62219805 virtio_ring: fix return code on DMA mapping fails 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed abce58c3af15 nbd:fix memory leak in nbd_get_socket() 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils 3608aa07bac2 gpio: max77620: Fixup debounce delays c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers 95a617d1f70c net/mlx5: Update the list of the PCI supported devices febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 e049e3c43308 taprio: don't reject same mqprio settings 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress 27845a1dd06b net/mlx5: Fix auto group size calculation ec6d299939c3 net/mlx5e: Fix set vf link state error flow bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel da957117e731 fbdev: Ditch fb_edid_add_monspecs 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault 0063e9b69796 mm/memory_hotplug: fix updating the node span d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process 045a481acd16 slcan: Fix memory leak in error path 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite 8505966cdc7e mm/page_io.c: do not free shared swap slots 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb 364436976763 slip: Fix memory leak in slip_open error path b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() b392b2d28e58 net: gemini: add missed free_netdev 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). 5fa89b3526c5 ax88172a: fix information leak on short answers 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL 0593a806b430 x86/entry/32: Use %ss segment where required 26ce03ac3327 x86/entry/32: Fix IRET exception f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit 41cb303e1436 x86/pti/32: Size initial_page_table correctly 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV 37880a369c68 x86/speculation: Fix redundant MDS mitigation message 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status c77d64c158c6 x86/insn: Fix awk regexp warnings 41bbdde13b43 x86: Use CONFIG_PREEMPTION 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value 8ccce28352fe x86/mm, tracing: Fix CR2 corruption 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap 7801660649a0 x86/entry/64: Simplify idtentry a little 5d305a697f40 x86/entry/32: Simplify common_exception 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption e4a8155be9bd x86/ldt: Initialize the context lock for init_mm f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() 22334402db00 x86/stackframe/32: Provide consistent pt_regs ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path ce394d5e28c6 x86/asm: Pin sensitive CR0 bits b3327106585c x86/asm: Pin sensitive CR4 bits e3534ce1de0c Documentation/x86: Fix path to entry_32.S 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 5391e05..79da8c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index 986dd6e..d88cb5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 358c0ad..59cc08e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:43 +0000 Subject: [oe-commits] [openembedded-core] 05/14: devsrc: fix objtool generation for v5.4+ In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.DD71B2328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df413f65bda97223732c1dac323d4a524b23f67c Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:57 2020 -0500 devsrc: fix objtool generation for v5.4+ commit 6ec14aa7a58a1c2fb303692f8cb1ff82d9abd10a [objtool: Silence build output] was added to -stable in v5.4.19. This change was meant to ensure that build output was truly silent when required. But the trailing "cd -" in the tools script was ensuring that a success return code was always returned from the sync script. As such, some missing files for x86 were being masked. We add those files to ensure that objtool can be regenerated as required Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 2fa4be6..2888236 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -200,6 +200,7 @@ do_install() { cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/ + cp -a --parents arch/x86/tools/gen-insn-attr-x86.awk $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/ # 4.18 + have unified the purgatory files, so we ignore any errors if @@ -215,6 +216,10 @@ do_install() { cp -a --parents arch/x86/boot/string.c $kerneldir/build/ cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ + + # objtool requires these files + cp -a --parents arch/x86/lib/inat.c $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/x86/lib/insn.c $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "mips" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:48 +0000 Subject: [oe-commits] [openembedded-core] 10/14: qemu: bump default reference kernel to v5.4 In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.14D012328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e08fdee1343bc3ae8db4828dffa641deba4660e6 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:02 2020 -0500 qemu: bump default reference kernel to v5.4 Now that the 5.4 recipes are available, we bump the default versions to use them. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarmv5.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index da56cc3..a727147 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.2%" +PREFERRED_VERSION_linux-yocto ??= "5.4%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index fb4789f..7f72048 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -PREFERRED_VERSION_linux-yocto ??= "5.2%" +PREFERRED_VERSION_linux-yocto ??= "5.4%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:49 +0000 Subject: [oe-commits] [openembedded-core] 11/14: musl: Update to final 1.2.0 release In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.1C9302328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6ed18bbdaba59c6697a50d4fe503c26bbbbbd12f Author: Khem Raj AuthorDate: Fri Feb 21 08:34:20 2020 -0800 musl: Update to final 1.2.0 release Detailed log [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=a662220df547e5c2446518e74440a7d834f9ebe6..040c1d16b468c50c04fc94edff521f1637708328 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index b6ec6fe..afc8446 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,9 +4,9 @@ require musl.inc inherit linuxloader -SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" +SRCREV = "040c1d16b468c50c04fc94edff521f1637708328" -BASEVER = "1.1.24" +BASEVER = "1.2.0" PV = "${BASEVER}+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:45 +0000 Subject: [oe-commits] [openembedded-core] 07/14: linux-yocto: perf: Make perf able to build with latest libbfd In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.EEFCC2328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c4b513d7bbba4cee271bb6462126d0d98d940ef4 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:59 2020 -0500 linux-yocto: perf: Make perf able to build with latest libbfd Khem pointed out that we need to backport the following change to get perf building with the latest binutils: commit 0ada120c883d4f1f6 upstream: [ Subject: perf: Make perf able to build with latest libbfd libbfd has changed the bfd_section_* macros to inline functions bfd_section_ since 2019-09-18. See below two commits: o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html This fix make perf able to build with both old and new libbfd. Signed-off-by: Changbin Du Acked-by: Jiri Olsa Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du at gmail.com Signed-off-by: Arnaldo Carvalho de Melo ] Reported-by: Khem Raj Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 94a8e05..2a35e33 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" +SRCREV_machine ?= "97cb5fe4e4fa529a5b8165c4f84182d2d4751b39" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 622f5e6..463451f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" -SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuarm ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" +SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index feb8978..5dd7b68 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" -SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" -SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" -SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuarm ?= "aa91aac123d12d9d4f420862238a437781fe3825" +SRCREV_machine_qemuarm64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemumips ?= "6cb162ab5262318fc52a7cbef86afcf48c6b2449" +SRCREV_machine_qemuppc ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemuriscv64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemux86 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemux86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemumips64 ?= "fcbec8b4f0f2f24a31ce5c6e6439c69f7512fb31" +SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:50 +0000 Subject: [oe-commits] [openembedded-core] 12/14: alsa-utils: upgrade 1.2.1 -> 1.2.2 In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.26EC22328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f0abfadfa33bfe45c15fb391239af4e9e80c4152 Author: Praveen Muthusamy AuthorDate: Thu Feb 20 23:55:37 2020 +0530 alsa-utils: upgrade 1.2.1 -> 1.2.2 Signed-off-by: Praveen Muthusamy Signed-off-by: Richard Purdie --- .../alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb index 9144af6..8bbc5d3 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb @@ -21,8 +21,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "c4628bae7632937eac2de4cf2a3de82e" -SRC_URI[sha256sum] = "0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d" +SRC_URI[md5sum] = "00612234ff4722c8f7f8f7a83ff9bc63" +SRC_URI[sha256sum] = "44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:47 +0000 Subject: [oe-commits] [openembedded-core] 09/14: linux-yocto: drop 4.19 recipes In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.0CEF32328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a3646f2e54f82572fe96a8258f36ebeb0d8dce80 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:01 2020 -0500 linux-yocto: drop 4.19 recipes 5.4 is the next LTS kernel, so we drop the 4.19 recipes from master. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 44 ------------------- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 32 -------------- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 50 ---------------------- 3 files changed, 126 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb deleted file mode 100644 index b6e0a1e..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v4.19/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "2fbf678238302f33b3aec5a2cba829f260744f24" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.19.87" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb deleted file mode 100644 index e2626ab..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v4.19/standard/tiny/base" -KBRANCH_qemuarm ?= "v4.19/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.19.87" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine_qemuarm ?= "bd239fb802a15c2759ea456dd1f09f5e106fc88a" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb deleted file mode 100644 index c6e482a..0000000 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ /dev/null @@ -1,50 +0,0 @@ -KBRANCH ?= "v4.19/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.19/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.19/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.19/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.19/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.19/standard/base" -KBRANCH_qemux86-64 ?= "v4.19/standard/base" -KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "19fa1657d1d82d01647c6f73a2bbf39305505294" -SRCREV_machine_qemuarm64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips ?= "8fb7ab96b84852ee3d9e1d9d9e7bc35e1249b653" -SRCREV_machine_qemuppc ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86-64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips64 ?= "c8a036abd7d469013dddab15a23e0d2dde1d0000" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.87" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:44 +0000 Subject: [oe-commits] [openembedded-core] 06/14: linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175438.E71DC2328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 51339af715756ed0f959fe71e4554c616e4db150 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:58 2020 -0500 linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix Bumping the SRCREVs to pickup the VDSO fix by Victor Kamensky. We need it to avoid segfaults in SDK testing as well as the standard mips image test cases. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index ab93f1b..94a8e05 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 097357d..622f5e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 0b2a230..feb8978 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" -SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" -SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" +SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" +SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:51 +0000 Subject: [oe-commits] [openembedded-core] 13/14: psplash: add systemd support In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.2F5052328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e04ec1062318e95b61707a579847bf2418ea15dc Author: Stefan Agner AuthorDate: Wed Jan 22 14:20:24 2020 +0000 psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++--- .../psplash/files/psplash-start.service | 10 ++++++ .../psplash/files/psplash-systemd.service | 10 ++++++ meta/recipes-core/psplash/psplash_git.bb | 38 +++++++++++++--------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866..f58e043 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000..9de8f63 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000..e14f420 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1..6ff0393 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -66,7 +68,11 @@ python __anonymous() { S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -97,8 +103,17 @@ python do_compile () { } do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,8 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." - -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:46 +0000 Subject: [oe-commits] [openembedded-core] 08/14: linux-yocto/5.4: update to -rt11 In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.028CC2328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c4a6530ef1176f8703dfaab89e326d812add1e6f Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:00 2020 -0500 linux-yocto/5.4: update to -rt11 Integrating the -rt11 changes into the linux-yocto-rt branches: e3a0470f1ebe (HEAD -> v5.4/standard/preempt-rt/base, origin/v5.4/standard/preempt-rt/base) v5.4.19-rt11 2748be173948 bpf/stackmap: Don't trylock mmap_sem with PREEMPT_RT and interrupts disabled d721d73cb752 bpf, lpm: Make locking RT friendly dc53d4c7fad3 bpf: Prepare hashtab locking for PREEMPT_RT a13a53a8ae75 bpf: Factor out hashtab bucket lock operations 96a25d8a5a2d bpf: Use migrate_disable() in sys_bpf() bb8a96d7e701 bpf: Use migrate_disable() in hashtab code 615cc5998661 bpf: Use migrate_disable/enable in array macros and cgroup/lirc code. c3a06a1ab3d4 bpf/tests: Use migrate disable instead of preempt disable 0717741a61e6 trace/bpf: Use migrate disable in trace_call_bpf() b528161bf4e0 bpf: Use BPF_PROG_RUN_PIN_ON_CPU() at simple call sites. a3b5b903f04f bpf: Replace cant_sleep() with cant_migrate() dd708fd4fb18 bpf: Provide BPF_PROG_RUN_PIN_ON_CPU() macro 6ccad68939c7 bpf: Don't iterate over possible CPUs with interrupts disabled 055b62ad0b2c perf/bpf: Remove preempt disable around BPF invocation 7848f4a45054 bpf/tracing: Remove redundant preempt_disable() in __bpf_trace_run() caf8a5d6b42f bpf: Update locking comment in hashtab code 2ddd1653369d sched: Provide cant_migrate() 37b6c8361d28 sched: Provide migrate_disable/enable() inlines 2a1c4980a1e6 drm/i915/gt: use a LOCAL_IRQ_LOCK in __timeline_mark_lock() 84a119be5c68 v5.4.19-rt10 bb5e8418fb66 v5.4.17-rt9 bf976f5d86e7 locallock: Include header for the `current' macro 7a00b04683bd mm/memcontrol: Move misplaced local_unlock_irqrestore() b647f8807169 sched: migrate_enable: Remove __schedule() call 2b321530c794 sched: migrate_enable: Use per-cpu cpu_stop_work 22b448083286 locking: Percpu-rwsem rewrite f5d550cc9950 v5.4.17-rt8 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 2a35e33..37282b2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97cb5fe4e4fa529a5b8165c4f84182d2d4751b39" +SRCREV_machine ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 17:54:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 17:54:52 +0000 Subject: [oe-commits] [openembedded-core] 14/14: binutils: Upgrade to 2.34 release In-Reply-To: <158230767827.1169.12631719693480290082@git.openembedded.org> References: <158230767827.1169.12631719693480290082@git.openembedded.org> Message-ID: <20200221175439.7F08B2328C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1e41c1f2a2e7bd438c8c062efd6904fe17015bb2 Author: Khem Raj AuthorDate: Thu Feb 20 09:13:40 2020 -0800 binutils: Upgrade to 2.34 release Details of changelog [1] Removing bfd/ld patch to enable PE targets, instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch rpaths are no longer emitted into elfedit/readelf therefore no need of chrpath anymore Instead of pre-generating configure scripts and house them in libtool patch, generate them during configure. This also ensures that we do not patch configure directly but rather the sources which generate it Package newly added libctf library [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 75 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 41 + ...=> 0005-Point-scripts-location-to-libdir.patch} | 10 +- ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- 28 files changed, 7396 insertions(+), 21590 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 82530f5..e957e3a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8..eaaa5ed 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa5..5b4a339 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -13,17 +13,12 @@ LICENSE = "GPLv3" DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" -# -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath -# -DEPENDS_append_class-target = " chrpath-replacement-native" -EXTRANATIVEPATH_append_class-target = " chrpath-native" - inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ + ${libdir}/libctf.so \ + ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" # Rather than duplicating multiple entries for these, make one @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do + cd ${S}/$d + autoconf + rm -rf autom4te.cache + done + cd ${S} + gnu-configize) + oe_runconf # # must prime config.cache to ensure the build of libiberty @@ -123,10 +129,6 @@ do_configure () { done } -do_compile_append_class-target() { - chrpath -d ${B}/binutils/elfedit - chrpath -d ${B}/binutils/readelf -} do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461b..14e8421 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,6 +1,6 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 +Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4..91de94b 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From 6d79f81336e7cbe727b5a51134f5d314a455379d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d1..8b59ba5 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From d057b215f114f6158b4010ab44a19cae9dcc8386 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 4a6b107..0000000 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH] configure: widen the regexp for SH architectures - -gprof needs to know about uclibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure | 2 +- - gprof/configure | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 ---- a/configure -+++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000..d10a144 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,41 @@ +From f7ad8a44c10f01e03680f093fd7af71c9f5e8606 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH] configure: widen the regexp for SH architectures + +gprof needs to know about uclibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 91dc42f6c7..7c1b747e7c 100755 +--- a/configure ++++ b/configure +@@ -3915,7 +3915,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4bd869a63a..7187b34dfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1159,7 +1159,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3..3ba0ba6 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 08b088b7dd3d9707ed66948a7271ffb438eeddf5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch similarity index 51% rename from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename to meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 214ae06..d920729 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 +From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -10,21 +10,23 @@ Upstream-Status: Pending Signed-off-by: Chris Chimelis Signed-off-by: Khem Raj --- - ld/emultempl/elf32.em | 4 ++++ + ld/ldelf.c | 4 ++++ 1 file changed, 4 insertions(+) ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment < -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH] Use libtool 2.4 - -get libtool sysroot support - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - bfd/configure | 1322 ++++++++++++++----- - bfd/configure.ac | 2 +- - binutils/configure | 1320 ++++++++++++++----- - gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1321 ++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------ - libtool.m4 | 1080 +++++++++++----- - ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- - ltoptions.m4 | 2 +- - ltversion.m4 | 12 +- - lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 ++++++++++++++----- - opcodes/configure.ac | 2 +- - zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) - ---- a/bfd/configure -+++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -822,6 +825,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-mmap try using mmap for BFD input files if available - --with-separate-debug-dir=DIR - Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6808,6 +6894,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6900,6 +7158,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7262,8 +7580,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7351,7 +7682,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7426,6 +7757,20 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7445,6 +7790,41 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - - - # Check whether --enable-libtool-lock was given. -@@ -7653,6 +8033,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8380,7 +8879,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8469,7 +8969,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9470,7 +9983,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9588,8 +10102,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9607,8 +10121,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9654,8 +10168,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9785,7 +10299,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9798,22 +10318,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9838,22 +10371,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10102,23 +10685,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10932,7 +11587,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11728,7 +12383,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= - if test "$enable_shared" = "yes"; then - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18422,12 +19127,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/binutils/configure -+++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -807,6 +810,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6572,6 +6658,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6664,6 +6922,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7115,7 +7446,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7190,6 +7521,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -7211,6 +7554,43 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8175,7 +8674,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8264,7 +8764,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9265,7 +9778,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9383,8 +9897,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9402,8 +9916,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9449,8 +9963,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9580,7 +10094,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9593,22 +10113,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9633,22 +10166,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9897,23 +10480,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10727,7 +11382,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11523,7 +12178,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17159,12 +17864,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gas/configure -+++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -799,6 +802,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-cpu=CPU default cpu variant is CPU (currently only supported - on ARC) - --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6392,6 +6478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6484,6 +6742,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6935,7 +7266,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7010,6 +7341,19 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7030,6 +7374,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7237,6 +7617,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7995,7 +8494,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8084,7 +8584,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9085,7 +9598,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9203,8 +9717,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9222,8 +9736,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9269,8 +9783,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9400,7 +9914,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9413,22 +9933,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9453,22 +9986,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9717,23 +10300,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10547,7 +11202,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11343,7 +11998,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16049,8 +16714,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16081,7 +16753,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16117,6 +16788,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16890,7 +17562,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17158,12 +17863,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gprof/configure -+++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -780,6 +783,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5124,8 +5130,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --linux-uclibc*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -- ;; -- - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6244,6 +6325,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6276,8 +6525,8 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6336,6 +6589,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6698,8 +7011,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6776,6 +7090,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6787,7 +7113,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6824,8 +7150,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6862,6 +7188,17 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ - - - -@@ -6883,6 +7220,44 @@ fi - - - -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7089,6 +7464,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7652,6 +8144,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7847,7 +8341,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7936,7 +8431,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8234,8 +8729,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8520,13 +9019,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8587,6 +9090,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8937,7 +9445,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9036,12 +9545,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9055,8 +9564,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9074,8 +9583,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9121,8 +9630,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9252,7 +9761,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9265,22 +9780,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9305,22 +9833,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9569,23 +10147,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10399,7 +11049,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11239,10 +11889,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11345,10 +11995,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13435,8 +14095,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13467,7 +14134,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13503,6 +14169,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14268,7 +14935,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14536,12 +15236,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/ld/configure -+++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -816,6 +819,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-lib-path=dir1:dir2... set default LIB_PATH - --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -7075,6 +7161,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7167,6 +7425,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7618,7 +7949,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7693,6 +8024,13 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - - - -@@ -7714,6 +8052,48 @@ fi - - - -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8551,6 +9050,16 @@ done - - - -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+ -+ -+ - - - # Set options -@@ -8679,7 +9188,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8768,7 +9278,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9769,7 +10292,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9887,8 +10411,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9906,8 +10430,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9953,8 +10477,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10084,7 +10608,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10097,22 +10627,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10137,22 +10680,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10401,23 +10994,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11231,7 +11896,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -12027,7 +12692,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12884,22 +13557,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12925,22 +13611,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: - }; - _LT_EOF - -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -13815,6 +14572,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -13850,7 +14608,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -14476,6 +15246,7 @@ fi - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -14891,7 +15726,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15350,6 +16185,7 @@ fi - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi - compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' - GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' - archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har - hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' - inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' - link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' - always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' - exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' - file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' - compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ - reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19773,12 +20659,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -199,7 +205,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -746,15 +752,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_XSI_SHELLFNS -+ _LT_PROG_REPLACE_SHELLFNS - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -980,6 +983,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - -@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - - AC_MSG_CHECKING([how to print strings]) - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_libtool_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2342,7 +2483,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2950,6 +3091,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -3167,6 +3314,21 @@ tpf*) - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3403,8 +3630,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t at _DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t at _DLSYM_CONST -+#else -+# define LT@&t at _DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3484,7 +3724,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t at _DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3551,6 +3791,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4529,8 +4801,8 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4548,8 +4820,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4595,8 +4867,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4726,7 +4998,7 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else -@@ -4737,7 +5009,7 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4852,7 +5167,7 @@ _LT_EOF - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -4876,10 +5191,10 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4926,16 +5241,31 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { - }; - _LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6586,6 +7008,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF --esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,10 +1,9 @@ --# Generated from ltmain.m4sh. - --# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -38,7 +37,6 @@ - # -n, --dry-run display commands without modifying any files - # --features display basic configuration information and exit - # --mode=MODE use operation mode MODE --# --no-finish let install mode avoid finish commands - # --preserve-dup-deps don't remove duplicate dependency libraries - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent -@@ -71,17 +69,19 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# $progname: (GNU libtool) 2.4 - # automake: $automake_version - # autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.7a --TIMESTAMP=" 1.3134 2009-11-29" --package_revision=1.3134 -+VERSION=2.4 -+TIMESTAMP="" -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -106,9 +106,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -121,15 +118,13 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -- -- -- -- -- - # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh - # is ksh but when the shell is invoked as "sh" and the current value of - # the _XPG environment variable is not equal to 1 (one), the special -@@ -140,7 +135,7 @@ progpath="$0" - - - : ${CP="cp -f"} --: ${ECHO=$as_echo} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -149,7 +144,7 @@ progpath="$0" - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -169,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -183,17 +199,31 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation - --# Generated shell functions inserted here. - - # These SED scripts presuppose an absolute path with a trailing slash. - pathcar='s,^/\([^/]*\).*$,\1,' -@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -404,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -430,14 +469,14 @@ func_echo_all () - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -656,19 +695,35 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -+ $opt_debug -+ - $SED -n '/(C)/!b go - :more - /\./!{ - N -- s/\n# // -+ s/\n# / / - b more - } - :go -@@ -685,7 +740,9 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/^# *-h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ -@@ -701,7 +758,10 @@ func_usage () - # unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -714,7 +774,11 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret -@@ -726,12 +790,39 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: - - - -@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_finish=: --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -850,130 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac -+ -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- --no-finish) opt_finish=false ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- opt_verbose=false -+ opt_preserve_dup_deps=: - ;; -- -- --no-quiet|--no-silent) -- preserve_args="$preserve_args $opt" -- opt_silent=false -+ --features) -+ opt_features=: -+func_features - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -- opt_verbose=: -+func_append preserve_args " $opt" - ;; -- -- --no-verbose) preserve_args="$preserve_args $opt" -+ --no-verbose) - opt_verbose=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --help-all) opt_help=': help-all' ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -@@ -981,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval "std_shrext=\"$shrext_cmds\"" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1149,7 +1311,7 @@ func_execute_cmds () - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1172,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1184,8 +1377,7 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1204,8 +1396,7 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1274,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1314,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1340,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1364,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1496,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval "srcfile=\"$fix_srcfile_path\"" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1526,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1573,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1622,13 +2290,13 @@ compiler." - } - - $opt_help || { -- test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -@@ -1819,13 +2487,13 @@ if $opt_help; then - else - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done -@@ -1854,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1882,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1907,10 +2578,10 @@ func_mode_execute () - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. -- if eval test -z \"\$$shlibpath_var\"; then -- eval $shlibpath_var=\$dir -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" - else -- eval $shlibpath_var=\$dir:\$$shlibpath_var -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - -@@ -1939,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1972,22 +2642,59 @@ func_mode_execute () - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi - -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1997,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -2006,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval "flag=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2077,7 +2786,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; -@@ -2097,7 +2806,7 @@ func_mode_install () - do - arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -2135,11 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi -- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2151,7 +2860,7 @@ func_mode_install () - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" -- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - -@@ -2209,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2226,23 +2938,30 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2315,7 +3034,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2503,7 +3222,7 @@ func_mode_install () - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - -- if test -n "$current_libdirs" && $opt_finish; then -+ if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -@@ -2512,7 +3231,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2559,6 +3278,18 @@ extern \"C\" { - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2570,21 +3301,22 @@ extern \"C\" { - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { -- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - -@@ -2593,23 +3325,23 @@ extern \"C\" { - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols -- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$export_symbols" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { -- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" -- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$nlist" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } -@@ -2620,10 +3352,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- $ECHO ": $name " >> "$nlist" -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2661,26 +3435,9 @@ typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- echo >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2796,9 +3553,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- win32_nmres=`$NM -f posix -A "$1" | -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2827,6 +3586,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2917,7 +3801,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +3816,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -@@ -3014,7 +3898,110 @@ func_fallback_echo () - _LTECHO_EOF' - } - ECHO=\"$qECHO\" -- fi\ -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -@@ -3078,7 +4065,7 @@ _LTECHO_EOF' - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" -@@ -3102,6 +4089,18 @@ _LTECHO_EOF' - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -3116,35 +4115,10 @@ _LTECHO_EOF' - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -@@ -3158,166 +4132,6 @@ fi\ - } - - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_result=`cygpath -w "$1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result= -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -- --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_pathlist_tmp1=$func_stripname_result -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- func_to_host_pathlist_result=` -- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_append func_to_host_pathlist_result ";$func_to_host_path_result" -- fi -- fi -- fi -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result"; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_append func_to_host_pathlist_result ";" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -- - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout - # Must ONLY be called from within func_mode_link because -@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined LT_DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); - void lt_update_exe_path (const char *name, const char *value); -@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); - EOF - - cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3706,7 +4529,9 @@ EOF - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3728,7 +4553,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3762,8 +4587,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3780,8 +4605,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4222,7 +5078,7 @@ EOF - func_win32_import_lib_p () - { - $opt_debug -- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -@@ -4401,9 +5257,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4427,7 +5283,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4446,7 +5302,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4475,7 +5331,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4487,7 +5343,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4557,12 +5413,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4574,28 +5430,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4686,15 +5542,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4706,10 +5563,16 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in -@@ -4718,12 +5581,12 @@ func_mode_link () - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4747,7 +5610,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4758,9 +5621,6 @@ func_mode_link () - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -- *-*-linux*) -- test "X$arg" = "X-lc" && continue -- ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -@@ -4770,7 +5630,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4782,8 +5642,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4791,12 +5651,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4863,13 +5723,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4922,8 +5786,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4938,9 +5802,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4968,24 +5832,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4997,7 +5864,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -5028,7 +5895,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -5040,7 +5907,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -5085,24 +5952,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -5127,7 +5995,7 @@ func_mode_link () - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval "arg=\"$export_dynamic_flag_spec\"" -+ eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi -@@ -5144,11 +6012,13 @@ func_mode_link () - else - shlib_search_path= - fi -- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" -- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -5169,12 +6039,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -5187,9 +6057,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5256,8 +6126,9 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library -@@ -5267,7 +6138,7 @@ func_mode_link () - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5288,11 +6159,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5377,7 +6248,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5390,7 +6261,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5404,7 +6276,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5415,17 +6288,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5488,11 +6365,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5538,7 +6415,7 @@ func_mode_link () - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -@@ -5546,8 +6423,8 @@ func_mode_link () - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5558,20 +6435,20 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv -@@ -5579,9 +6456,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5598,9 +6481,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5622,14 +6505,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5637,12 +6520,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5653,20 +6536,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5684,7 +6593,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5697,7 +6606,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5708,12 +6618,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5728,7 +6638,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5740,7 +6650,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5749,7 +6659,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5774,12 +6684,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5814,7 +6724,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5823,7 +6733,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5835,7 +6745,7 @@ func_mode_link () - shift - realname="$1" - shift -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" -@@ -5848,7 +6758,7 @@ func_mode_link () - versuffix="-$major" - ;; - esac -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -5877,7 +6787,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5933,7 +6843,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5955,7 +6865,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5969,13 +6879,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5989,7 +6899,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6001,12 +6911,12 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6083,27 +6993,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -6113,8 +7029,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -6130,7 +7048,7 @@ func_mode_link () - case $host in - *-*-darwin*) - depdepl= -- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp -@@ -6141,8 +7059,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -6152,7 +7070,7 @@ func_mode_link () - ;; - esac - else -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -@@ -6192,7 +7110,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6205,7 +7123,7 @@ func_mode_link () - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -- eval tmp_libs=\$$var -+ eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so -@@ -6250,13 +7168,13 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done -- eval $var=\$tmp_libs -+ eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs -@@ -6269,7 +7187,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6310,7 +7228,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6319,8 +7237,8 @@ func_mode_link () - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ -@@ -6330,8 +7248,8 @@ func_mode_link () - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result -@@ -6346,7 +7264,7 @@ func_mode_link () - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6544,7 +7462,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6612,10 +7530,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6631,7 +7549,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6642,7 +7560,7 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -@@ -6659,10 +7577,11 @@ func_mode_link () - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6676,7 +7595,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6686,7 +7605,7 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - -@@ -6698,7 +7617,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6715,7 +7634,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6764,18 +7683,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6789,7 +7708,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6807,18 +7726,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6840,7 +7759,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6857,15 +7776,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6885,10 +7816,10 @@ EOF - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6913,7 +7844,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6929,20 +7860,20 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6967,7 +7898,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7071,7 +8002,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7081,10 +8012,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -7101,10 +8032,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -7113,18 +8046,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- dep_rpath="$dep_rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -7133,40 +8066,38 @@ EOF - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done -- eval $runpath_var=\$rpath\$$runpath_var -- export $runpath_var -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then -- eval $shlibpath_var=\$shlibpath\$$shlibpath_var -- export $shlibpath_var -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. -- eval "shared_ext=\"$shrext_cmds\"" -- eval "library_names=\"$library_names_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -7178,7 +8109,7 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -@@ -7189,7 +8120,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7220,13 +8151,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7248,7 +8211,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7260,7 +8223,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7270,7 +8233,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7286,43 +8249,43 @@ EOF - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval "flag=\"$thread_safe_flag_spec\"" -- linker_flags="$linker_flags $flag" -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval "test_cmds=\"$module_expsym_cmds\"" -+ eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else -- eval "test_cmds=\"$module_cmds\"" -+ eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval "test_cmds=\"$archive_expsym_cmds\"" -+ eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else -- eval "test_cmds=\"$archive_cmds\"" -+ eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi -@@ -7366,10 +8329,13 @@ EOF - echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output -- delfiles="$delfiles $output" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7383,15 +8349,17 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext -- eval "test_cmds=\"$reload_cmds\"" -+ eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -7411,12 +8379,12 @@ EOF - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist -- eval "concat_cmds=\"$reload_cmds\"" -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 -@@ -7433,11 +8401,11 @@ EOF - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7450,9 +8418,9 @@ EOF - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - -@@ -7471,7 +8439,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7492,7 +8460,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7504,7 +8472,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7515,7 +8483,7 @@ EOF - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the -@@ -7539,23 +8507,23 @@ EOF - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. -- eval "cmds=\"\$cmds~\$RM $delfiles\"" -+ eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" -@@ -7564,7 +8532,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7576,8 +8544,8 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -@@ -7656,17 +8624,20 @@ EOF - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -@@ -7690,7 +8661,7 @@ EOF - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || echo timestamp > $libobj || exit $? -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - -@@ -7740,8 +8711,8 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi -@@ -7761,7 +8732,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7771,17 +8742,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7789,7 +8760,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7808,18 +8779,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7828,12 +8799,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7842,7 +8813,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - -@@ -7859,18 +8830,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7878,7 +8849,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - -@@ -7921,6 +8892,12 @@ EOF - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7943,7 +8920,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7951,7 +8928,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7966,6 +8943,13 @@ EOF - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7999,6 +8983,12 @@ EOF - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -8096,7 +9086,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -8104,10 +9094,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -8118,10 +9108,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -8139,7 +9129,7 @@ EOF - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -8163,18 +9153,28 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -- eval "cmds=\"$old_archive_cmds\"" -+ eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8189,7 +9189,7 @@ EOF - do - last_oldobj=$obj - done -- eval "test_cmds=\"$old_archive_cmds\"" -+ eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -8208,7 +9208,7 @@ EOF - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi -@@ -8216,9 +9216,9 @@ EOF - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then -- eval "cmds=\"\$concat_cmds\"" -+ eval cmds=\"\$concat_cmds\" - else -- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi -@@ -8268,12 +9268,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8284,12 +9295,14 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8303,10 +9316,11 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8318,7 +9332,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8327,7 +9341,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi -@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8432,9 +9446,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8443,24 +9457,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8486,18 +9499,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8525,19 +9537,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8547,7 +9559,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8556,7 +9568,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8564,12 +9576,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8577,7 +9589,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8589,16 +9600,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" ---- a/ltoptions.m4 -+++ b/ltoptions.m4 -@@ -8,7 +8,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ---- a/ltversion.m4 -+++ b/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3134 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.7a]) --m4_define([LT_PACKAGE_REVISION], [1.3134]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.7a' --macro_revision='1.3134' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 -@@ -7,7 +7,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -680,6 +680,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -798,6 +801,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5403,8 +5409,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6518,6 +6604,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6610,6 +6868,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6972,8 +7290,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7061,7 +7392,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7136,6 +7467,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7157,6 +7496,47 @@ fi - - - -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7363,6 +7743,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8091,7 +8590,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8180,7 +8680,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9181,7 +9694,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9299,8 +9813,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9318,8 +9832,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9365,8 +9879,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9496,7 +10010,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9509,22 +10029,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9549,22 +10082,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9813,23 +10396,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10643,7 +11298,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11439,7 +12094,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then - # since libbfd may not pull in the entirety of libiberty. - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14979,12 +15684,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -170,7 +170,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/zlib/configure -+++ b/zlib/configure -@@ -646,8 +646,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -774,6 +777,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_host_shared - ' -@@ -1428,6 +1432,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -4147,8 +4153,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5054,6 +5060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5070,6 +5150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5238,7 +5323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -5392,6 +5478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5484,6 +5743,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -5846,8 +6165,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -5935,7 +6267,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6010,6 +6342,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -6031,6 +6375,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -6241,6 +6621,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7269,7 +7768,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7358,7 +7858,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8359,7 +8872,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -8477,8 +8991,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -8496,8 +9010,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8543,8 +9057,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8674,7 +9188,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -8997,26 +9580,39 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- if test x$gcc_no_link = xyes; then -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -9830,7 +10485,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -10644,7 +11299,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -13322,12 +14027,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch new file mode 100644 index 0000000..c71e19e --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -0,0 +1,7115 @@ +From 3a2e7ec956568c503a678385ebee17098337feab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH] Use libtool 2.4 + +get libtool sysroot support + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + bfd/configure.ac | 2 +- + libtool.m4 | 1080 +++++++++++------ + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- + ltoptions.m4 | 2 +- + ltversion.m4 | 12 +- + lt~obsolete.m4 | 2 +- + 6 files changed, 2717 insertions(+), 1306 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -296,7 +296,7 @@ changequote(,)dnl + x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` + changequote([,])dnl + if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" + fi + + case "${host}" in +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -199,7 +205,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -746,15 +752,12 @@ _LT_EOF + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -980,6 +983,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + +@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + + AC_MSG_CHECKING([how to print strings]) + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) + ])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1623,7 +1705,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1667,10 +1749,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2342,7 +2483,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -2950,6 +3091,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -3016,7 +3162,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -3167,6 +3314,21 @@ tpf*) + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + + # LT_LIB_M + # -------- +@@ -3403,8 +3630,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3473,6 +3701,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t at _DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t at _DLSYM_CONST ++#else ++# define LT@&t at _DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3484,7 +3724,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t at _DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3551,6 +3791,13 @@ else + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4172,9 +4432,11 @@ case $host_os in + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + + # + # Check to make sure the PIC flag actually works. +@@ -4193,6 +4455,8 @@ fi + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. +@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4411,7 +4682,8 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4510,12 +4782,12 @@ _LT_EOF + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4529,8 +4801,8 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4548,8 +4820,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4595,8 +4867,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4726,7 +4998,7 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else +@@ -4737,7 +5009,7 @@ _LT_EOF + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -4781,20 +5053,63 @@ _LT_EOF + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4828,7 +5143,7 @@ _LT_EOF + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4836,7 +5151,7 @@ _LT_EOF + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4852,7 +5167,7 @@ _LT_EOF + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -4876,10 +5191,10 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4926,16 +5241,31 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -5020,7 +5350,7 @@ _LT_EOF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +@@ -5039,9 +5369,9 @@ _LT_EOF + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6445,6 +6825,29 @@ AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6453,6 +6856,7 @@ AC_LANG_POP + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6503,6 +6907,13 @@ public class foo { + }; + _LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6586,6 +7008,7 @@ else + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6622,7 +7045,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP +@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6992,7 +7423,8 @@ fi + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + +@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -7042,7 +7476,8 @@ fi + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; +- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh. + +-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -38,7 +37,6 @@ + # -n, --dry-run display commands without modifying any files + # --features display basic configuration information and exit + # --mode=MODE use operation mode MODE +-# --no-finish let install mode avoid finish commands + # --preserve-dup-deps don't remove duplicate dependency libraries + # --quiet, --silent don't print informational messages + # --no-quiet, --no-silent +@@ -71,17 +69,19 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -106,9 +106,6 @@ _LTECHO_EOF' + } + + # NLS nuisances: We save the old values to restore during execute mode. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). + lt_user_locale= + lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +@@ -121,15 +118,13 @@ do + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done ++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL + + $lt_unset CDPATH + + +- +- +- +- +- + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special +@@ -140,7 +135,7 @@ progpath="$0" + + + : ${CP="cp -f"} +-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} + : ${EGREP="/bin/grep -E"} + : ${FGREP="/bin/grep -F"} + : ${GREP="/bin/grep"} +@@ -149,7 +144,7 @@ progpath="$0" + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -169,6 +164,27 @@ IFS=" $lt_nl" + dirname="s,/[^/]*$,," + basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: +@@ -183,17 +199,31 @@ basename="s,^.*/,," + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + +-# Generated shell functions inserted here. + + # These SED scripts presuppose an absolute path with a trailing slash. + pathcar='s,^/\([^/]*\).*$,\1,' +@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ + # Re-`\' parameter expansions in output of double_quote_subst that were + # `\'-ed in input to the same. If an odd number of `\' preceded a '$' + # in input to double_quote_subst, that '$' was protected from expansion. +@@ -404,7 +443,7 @@ opt_warning=: + # name if it has been set yet. + func_echo () + { +- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + } + + # func_verbose arg... +@@ -430,14 +469,14 @@ func_echo_all () + # Echo program name prefixed message to standard error. + func_error () + { +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + } + + # func_warning arg... + # Echo program name prefixed warning message to standard error. + func_warning () + { +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +@@ -656,19 +695,35 @@ func_show_eval_locale () + fi + } + +- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} + + + # func_version + # Echo version message to standard output and exit. + func_version () + { ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ + N +- s/\n# // ++ s/\n# / / + b more + } + :go +@@ -685,7 +740,9 @@ func_version () + # Echo short help message to standard output and exit. + func_usage () + { +- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ +@@ -701,7 +758,10 @@ func_usage () + # unless 'noexit' is passed as argument. + func_help () + { ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* +@@ -714,7 +774,11 @@ func_help () + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p +- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret +@@ -726,12 +790,39 @@ func_help () + # exit_cmd. + func_missing_arg () + { +- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1." + exit_cmd=exit + } + +-exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + +@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" + magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-# $mode is unset + nonopt= +-execute_dlfiles= + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + extracted_archives= + extracted_serial=0 + +-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +- + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ + # func_fatal_configuration arg... + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. +@@ -850,130 +979,204 @@ func_enable_tag () + esac + } + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () + { ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift +- + case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" +- opt_debug='set -x' + $opt_debug + ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; +- + --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=: + ;; +- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false +- opt_verbose=: ++func_append preserve_args " $opt" + ;; +- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) +@@ -981,82 +1184,44 @@ func_enable_tag () + opt_duplicate_compiler_generated_deps=: + ;; + *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + +- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + +- # Darwin sucks +- eval "std_shrext=\"$shrext_cmds\"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} + ++## ----------- ## ++## Main. ## ++## ----------- ## + + # func_lalib_p file + # True iff FILE is a libtool `.la' library or `.lo' object file. +@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () + # temporary ltwrapper_script. + func_ltwrapper_scriptname () + { +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + } + + # func_ltwrapper_p file +@@ -1149,7 +1311,7 @@ func_execute_cmds () + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1172,6 +1334,37 @@ func_source () + } + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ + # func_infer_tag arg + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. +@@ -1184,8 +1377,7 @@ func_infer_tag () + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1204,8 +1396,7 @@ func_infer_tag () + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1274,6 +1465,486 @@ EOF + } + } + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +@@ -1314,12 +1985,12 @@ func_mode_compile () + ;; + + -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" ++ func_append later " $arg" + continue + ;; + +@@ -1340,15 +2011,14 @@ func_mode_compile () + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + +@@ -1364,8 +2034,7 @@ func_mode_compile () + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in +@@ -1496,17 +2165,16 @@ compiler." + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + +- if test -n "$fix_srcfile_path"; then +- eval "srcfile=\"$fix_srcfile_path\"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + +@@ -1526,7 +2194,7 @@ compiler." + + if test -z "$output_obj"; then + # Place PIC objects in $objdir +- command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ +@@ -1573,11 +2241,11 @@ compiler." + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then +- command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. +- command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +@@ -1622,13 +2290,13 @@ compiler." + } + + $opt_help || { +- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + } + + func_mode_help () + { + # We need to display help for each of the modes. +- case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." + ;; + + *) +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + +@@ -1819,13 +2487,13 @@ if $opt_help; then + else + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done +@@ -1854,13 +2522,16 @@ func_mode_execute () + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" +@@ -1882,7 +2553,7 @@ func_mode_execute () + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +@@ -1907,10 +2578,10 @@ func_mode_execute () + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. +- if eval test -z \"\$$shlibpath_var\"; then +- eval $shlibpath_var=\$dir ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" + else +- eval $shlibpath_var=\$dir:\$$shlibpath_var ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + +@@ -1939,8 +2610,7 @@ func_mode_execute () + ;; + esac + # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then +@@ -1972,22 +2642,59 @@ func_mode_execute () + fi + } + +-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { + $opt_debug +- libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +@@ -1997,7 +2704,7 @@ func_mode_finish () + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done +@@ -2006,53 +2713,55 @@ func_mode_finish () + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag=\"$hardcode_libdir_flag_spec\"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + +- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS + } + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... +@@ -2077,7 +2786,7 @@ func_mode_install () + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +@@ -2097,7 +2806,7 @@ func_mode_install () + do + arg2= + if test -n "$dest"; then +- files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi +@@ -2135,11 +2844,11 @@ func_mode_install () + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi +- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +@@ -2151,7 +2860,7 @@ func_mode_install () + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" +- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +@@ -2209,10 +2918,13 @@ func_mode_install () + case $file in + *.$libext) + # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" +@@ -2226,23 +2938,30 @@ func_mode_install () + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" +- dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +@@ -2315,7 +3034,7 @@ func_mode_install () + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) +@@ -2503,7 +3222,7 @@ func_mode_install () + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + +- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +@@ -2512,7 +3231,7 @@ func_mode_install () + fi + } + +-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -2559,6 +3278,18 @@ extern \"C\" { + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + /* External symbol declarations for the compiler. */\ + " + +@@ -2570,21 +3301,22 @@ extern \"C\" { + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { +- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + +@@ -2593,23 +3325,23 @@ extern \"C\" { + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols +- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { +- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } +@@ -2620,10 +3352,52 @@ extern \"C\" { + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" +- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { +@@ -2661,26 +3435,9 @@ typedef struct { + const char *name; + void *address; + } lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = + {\ + { \"$my_originator\", (void *) 0 }," +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + +@@ -2796,9 +3553,11 @@ func_win32_libid () + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static +- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ +@@ -2827,6 +3586,131 @@ func_win32_libid () + $ECHO "$win32_libid_type" + } + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + + # func_extract_an_archive dir oldlib +@@ -2917,7 +3801,7 @@ func_extract_archives () + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ +@@ -2932,7 +3816,7 @@ func_extract_archives () + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +@@ -3014,7 +3898,110 @@ func_fallback_echo () + _LTECHO_EOF' + } + ECHO=\"$qECHO\" +- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=\$0 ++ shift ++ for lt_opt ++ do ++ case \"\$lt_opt\" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` ++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. ++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` ++ cat \"\$lt_dump_D/\$lt_dump_F\" ++ exit 0 ++ ;; ++ --lt-*) ++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n \"\$lt_option_debug\"; then ++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from \$@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case \$lt_wr_arg in ++ --lt-*) ;; ++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core \${1+\"\$@\"} ++} ++ ++ # Parse options ++ func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` +@@ -3078,7 +4065,7 @@ _LTECHO_EOF' + + # relink executable if necessary + if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" +@@ -3102,6 +4089,18 @@ _LTECHO_EOF' + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ +@@ -3116,35 +4115,10 @@ _LTECHO_EOF' + " + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 ++ func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. +@@ -3158,166 +4132,6 @@ fi\ + } + + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +- + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout + # Must ONLY be called from within func_mode_link because +@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. + */ + EOF + cat <<"EOF" +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1; + #else +-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0; + #endif + +-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + + void *xmalloc (size_t num); + char *xstrdup (const char *string); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); + int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s); + void lt_setenv (const char *name, const char *value); + char *lt_extend_str (const char *orig_value, const char *add, int to_end); + void lt_update_exe_path (const char *name, const char *value); +@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); + EOF + + cat <"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero)); + for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i])); + } + + EOF +@@ -3706,7 +4529,9 @@ EOF + if (rval == -1) + { + /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target \"%s\": %s\n", ++ lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +@@ -3728,7 +4553,7 @@ xmalloc (size_t num) + { + void *p = (void *) malloc (num); + if (!p) +- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted"); + + return p; + } +@@ -3762,8 +4587,8 @@ check_executable (const char *path) + { + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3780,8 +4605,8 @@ make_executable (const char *path) + int rval = 0; + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) + int tmp_len; + char *concat_name; + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; +@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); +@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) +@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) + } + else + { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file \"%s\": %s", ++ tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); +@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { +- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); + #endif +@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) + return str; + } + ++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++ + static void +-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode, + const char *message, va_list ap) + { +- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, + } + + void +-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...) + { + va_list ap; + va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); + } + ++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++ + void + lt_setenv (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value)); + { + #ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) + void + lt_update_exe_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) + void + lt_update_lib_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4222,7 +5078,7 @@ EOF + func_win32_import_lib_p () + { + $opt_debug +- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +@@ -4401,9 +5257,9 @@ func_mode_link () + ;; + *) + if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg" + else +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg" + fi + prev= + continue +@@ -4427,7 +5283,7 @@ func_mode_link () + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; +@@ -4446,7 +5302,7 @@ func_mode_link () + moreargs= + for fil in `cat "$save_arg"` + do +-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + +@@ -4475,7 +5331,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -4487,7 +5343,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -4557,12 +5413,12 @@ func_mode_link () + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;; + esac + fi + prev= +@@ -4574,28 +5430,28 @@ func_mode_link () + continue + ;; + weak) +- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) +- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" +@@ -4686,15 +5542,16 @@ func_mode_link () + ;; + + -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -4706,10 +5563,16 @@ func_mode_link () + ;; + esac + case "$deplibs " in +- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;; + *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir" + ;; + esac + case $host in +@@ -4718,12 +5581,12 @@ func_mode_link () + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -4747,7 +5610,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) +@@ -4758,9 +5621,6 @@ func_mode_link () + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; +- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -4770,7 +5630,7 @@ func_mode_link () + ;; + esac + fi +- deplibs="$deplibs $arg" ++ func_append deplibs " $arg" + continue + ;; + +@@ -4782,8 +5642,8 @@ func_mode_link () + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler +@@ -4791,12 +5651,12 @@ func_mode_link () + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; +@@ -4863,13 +5723,17 @@ func_mode_link () + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + continue + ;; +@@ -4922,8 +5786,8 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4938,9 +5802,9 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4968,24 +5832,27 @@ func_mode_link () + arg="$func_quote_for_eval_result" + ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + continue + ;; + +@@ -4997,7 +5864,7 @@ func_mode_link () + + *.$objext) + # A standard object. +- objs="$objs $arg" ++ func_append objs " $arg" + ;; + + *.lo) +@@ -5028,7 +5895,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -5040,7 +5907,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -5085,24 +5952,25 @@ func_mode_link () + + *.$libext) + # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + ++ func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else +- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; +@@ -5127,7 +5995,7 @@ func_mode_link () + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval "arg=\"$export_dynamic_flag_spec\"" ++ eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi +@@ -5144,11 +6012,13 @@ func_mode_link () + else + shlib_search_path= + fi +- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" +- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" ++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + +@@ -5169,12 +6039,12 @@ func_mode_link () + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- libs="$libs $deplib" ++ func_append libs " $deplib" + done + + if test "$linkmode" = lib; then +@@ -5187,9 +6057,9 @@ func_mode_link () + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac +- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= +@@ -5256,8 +6126,9 @@ func_mode_link () + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= ++ func_resolve_sysroot "$lib" + case $lib in +- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library +@@ -5267,7 +6138,7 @@ func_mode_link () + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;; + esac + done + done +@@ -5288,11 +6159,11 @@ func_mode_link () + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5377,7 +6248,7 @@ func_mode_link () + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5390,7 +6261,8 @@ func_mode_link () + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then +@@ -5404,7 +6276,8 @@ func_mode_link () + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" +@@ -5415,17 +6288,21 @@ func_mode_link () + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; +- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" +@@ -5488,11 +6365,11 @@ func_mode_link () + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib" + fi + fi + continue +@@ -5538,7 +6415,7 @@ func_mode_link () + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi +@@ -5546,8 +6423,8 @@ func_mode_link () + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then +@@ -5558,20 +6435,20 @@ func_mode_link () + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv +@@ -5579,9 +6456,15 @@ func_mode_link () + + # Get the name of the library we link against. + linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi +@@ -5598,9 +6481,9 @@ func_mode_link () + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs" + else +- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen +@@ -5622,14 +6505,14 @@ func_mode_link () + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -5637,12 +6520,12 @@ func_mode_link () + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" +@@ -5653,20 +6536,46 @@ func_mode_link () + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then +@@ -5684,7 +6593,7 @@ func_mode_link () + + + if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no +@@ -5697,7 +6606,8 @@ func_mode_link () + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? +@@ -5708,12 +6618,12 @@ func_mode_link () + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... +@@ -5728,7 +6638,7 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;; + esac + fi + +@@ -5740,7 +6650,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5749,7 +6659,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5774,12 +6684,12 @@ func_mode_link () + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; +@@ -5814,7 +6724,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5823,7 +6733,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5835,7 +6745,7 @@ func_mode_link () + shift + realname="$1" + shift +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" +@@ -5848,7 +6758,7 @@ func_mode_link () + versuffix="-$major" + ;; + esac +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -5877,7 +6787,7 @@ func_mode_link () + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= +@@ -5933,7 +6843,7 @@ func_mode_link () + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -5955,7 +6865,7 @@ func_mode_link () + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then +@@ -5969,13 +6879,13 @@ func_mode_link () + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + +- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= +@@ -5989,7 +6899,7 @@ func_mode_link () + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +@@ -6001,12 +6911,12 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -6083,27 +6993,33 @@ func_mode_link () + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";; + esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + +- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then +@@ -6113,8 +7029,10 @@ func_mode_link () + case $deplib in + -L*) path="$deplib" ;; + *.la) ++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +@@ -6130,7 +7048,7 @@ func_mode_link () + case $host in + *-*-darwin*) + depdepl= +- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp +@@ -6141,8 +7059,8 @@ func_mode_link () + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi +@@ -6152,7 +7070,7 @@ func_mode_link () + ;; + esac + else +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +@@ -6192,7 +7110,7 @@ func_mode_link () + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= +@@ -6205,7 +7123,7 @@ func_mode_link () + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +- eval tmp_libs=\$$var ++ eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so +@@ -6250,13 +7168,13 @@ func_mode_link () + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + done +- eval $var=\$tmp_libs ++ eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs +@@ -6269,7 +7187,7 @@ func_mode_link () + ;; + esac + if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs +@@ -6310,7 +7228,7 @@ func_mode_link () + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" +- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs" + ;; + + lib) +@@ -6319,8 +7237,8 @@ func_mode_link () + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ +@@ -6330,8 +7248,8 @@ func_mode_link () + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result +@@ -6346,7 +7264,7 @@ func_mode_link () + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" ++ func_append libobjs " $objs" + fi + fi + +@@ -6544,7 +7462,7 @@ func_mode_link () + done + + # Make executables depend on our current version. +- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0" + ;; + + qnx) +@@ -6612,10 +7530,10 @@ func_mode_link () + fi + + func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + +- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -6631,7 +7549,7 @@ func_mode_link () + continue + fi + fi +- removelist="$removelist $p" ++ func_append removelist " $p" + ;; + *) ;; + esac +@@ -6642,7 +7560,7 @@ func_mode_link () + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` +@@ -6659,10 +7577,11 @@ func_mode_link () + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +@@ -6676,7 +7595,7 @@ func_mode_link () + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;; + esac + done + +@@ -6686,7 +7605,7 @@ func_mode_link () + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;; + esac + done + +@@ -6698,7 +7617,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. +@@ -6715,7 +7634,7 @@ func_mode_link () + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" ++ func_append deplibs " -lc" + fi + ;; + esac +@@ -6764,18 +7683,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6789,7 +7708,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6807,18 +7726,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6840,7 +7759,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6857,15 +7776,27 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | +@@ -6885,10 +7816,10 @@ EOF + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6913,7 +7844,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -6929,20 +7860,20 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6967,7 +7898,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -7071,7 +8002,7 @@ EOF + *) + case " $deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7081,10 +8012,10 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" +@@ -7101,10 +8032,12 @@ EOF + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -7113,18 +8046,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- dep_rpath="$dep_rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done +@@ -7133,40 +8066,38 @@ EOF + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else +- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done +- eval $runpath_var=\$rpath\$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then +- eval $shlibpath_var=\$shlibpath\$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. +- eval "shared_ext=\"$shrext_cmds\"" +- eval "library_names=\"$library_names_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -7178,7 +8109,7 @@ EOF + linknames= + for link + do +- linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic +@@ -7189,7 +8120,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= +@@ -7220,13 +8151,45 @@ EOF + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. +@@ -7248,7 +8211,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +@@ -7260,7 +8223,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7270,7 +8233,7 @@ EOF + case " $convenience " in + *" $test_deplib "*) ;; + *) +- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done +@@ -7286,43 +8249,43 @@ EOF + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval "flag=\"$thread_safe_flag_spec\"" +- linker_flags="$linker_flags $flag" ++ eval flag=\"$thread_safe_flag_spec\" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval "test_cmds=\"$module_expsym_cmds\"" ++ eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else +- eval "test_cmds=\"$module_cmds\"" ++ eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval "test_cmds=\"$archive_expsym_cmds\"" ++ eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else +- eval "test_cmds=\"$archive_cmds\"" ++ eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi +@@ -7366,10 +8329,13 @@ EOF + echo 'INPUT (' > $output + for obj in $save_libobjs + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output +- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" +@@ -7383,15 +8349,17 @@ EOF + fi + for obj + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext +- eval "test_cmds=\"$reload_cmds\"" ++ eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -7411,12 +8379,12 @@ EOF + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist +- eval "concat_cmds=\"$reload_cmds\"" ++ eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 +@@ -7433,11 +8401,11 @@ EOF + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi +- delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= +@@ -7450,9 +8418,9 @@ EOF + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + +@@ -7471,7 +8439,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7492,7 +8460,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then +@@ -7504,7 +8472,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7515,7 +8483,7 @@ EOF + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the +@@ -7539,23 +8507,23 @@ EOF + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. +- eval "cmds=\"\$cmds~\$RM $delfiles\"" ++ eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" +@@ -7564,7 +8532,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7576,8 +8544,8 @@ EOF + IFS="$save_ifs" + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then +@@ -7656,17 +8624,20 @@ EOF + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +@@ -7690,7 +8661,7 @@ EOF + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + +@@ -7740,8 +8711,8 @@ EOF + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi +@@ -7761,7 +8732,7 @@ EOF + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7771,17 +8742,17 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -7789,7 +8760,7 @@ EOF + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi +@@ -7808,18 +8779,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in +@@ -7828,12 +8799,12 @@ EOF + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -7842,7 +8813,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + +@@ -7859,18 +8830,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done +@@ -7878,7 +8849,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + +@@ -7921,6 +8892,12 @@ EOF + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' +@@ -7943,7 +8920,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7951,7 +8928,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7966,6 +8943,13 @@ EOF + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -7999,6 +8983,12 @@ EOF + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + +@@ -8096,7 +9086,7 @@ EOF + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" +@@ -8104,10 +9094,10 @@ EOF + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. +@@ -8118,10 +9108,10 @@ EOF + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have +@@ -8139,7 +9129,7 @@ EOF + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= +@@ -8163,18 +9153,28 @@ EOF + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; +- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi +- eval "cmds=\"$old_archive_cmds\"" ++ eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." +@@ -8189,7 +9189,7 @@ EOF + do + last_oldobj=$obj + done +- eval "test_cmds=\"$old_archive_cmds\"" ++ eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -8208,7 +9208,7 @@ EOF + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi +@@ -8216,9 +9216,9 @@ EOF + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then +- eval "cmds=\"\$concat_cmds\"" ++ eval cmds=\"\$concat_cmds\" + else +- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi +@@ -8268,12 +9268,23 @@ EOF + *.la) + func_basename "$deplib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -8284,12 +9295,14 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; +- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" +@@ -8303,10 +9316,11 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +@@ -8318,7 +9332,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= +@@ -8327,7 +9341,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi +@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" + exit $EXIT_SUCCESS + } + +-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +@@ -8432,9 +9446,9 @@ func_mode_uninstall () + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + +@@ -8443,24 +9457,23 @@ func_mode_uninstall () + + rmdirs= + +- origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then +- objdir="$origobjdir" ++ odir="$objdir" + else +- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" +- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + +- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in +- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + +@@ -8486,18 +9499,17 @@ func_mode_uninstall () + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done +- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$mode" in ++ case "$opt_mode" in + clean) +- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; +- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then +@@ -8525,19 +9537,19 @@ func_mode_uninstall () + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then +- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then +- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) +@@ -8547,7 +9559,7 @@ func_mode_uninstall () + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe +- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. +@@ -8556,7 +9568,7 @@ func_mode_uninstall () + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename +@@ -8564,12 +9576,12 @@ func_mode_uninstall () + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then +- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then +- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi +@@ -8577,7 +9589,6 @@ func_mode_uninstall () + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done +- objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do +@@ -8589,16 +9600,16 @@ func_mode_uninstall () + exit $exit_status + } + +-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +-test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 87% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a19505..b0e94ab 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From e36a4e05f900bbe6a8d744a93f3a407bc55c96f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc37..11a8110 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index 811134a503..f8c17c19ae 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -15788,6 +15791,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 96% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278..f4f1a06 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From 70f3f2d9e912ea777fa113e02cdbc3465a66e40d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50db..c49b8e8 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From 2182791a453f34bee6968b3e72848608cf7d7abe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,24 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 81% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752..c32867a 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From a0237ec2d1e58bd35c236df39dd5a06504c6d2ed Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle binutils/readelf.c | 1 + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ + gas/configure.ac | 3 +++ include/elf/mips.h | 1 + include/opcode/mips.h | 6 ++++++ ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 14 files changed, 62 insertions(+), 21 deletions(-) + 15 files changed, 65 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..59d6d11215 100755 --- a/gas/configure +++ b/gas/configure -@@ -13377,6 +13377,9 @@ _ACEOF +@@ -12722,6 +12722,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) -+ mips_cpu=xlp -+ ;; ++ mips_cpu=xlp ++ ;; mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/gas/configure.ac b/gas/configure.ac +index 6f32e55a1a..11c2e0d273 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -325,6 +325,9 @@ changequote([,])dnl + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 + ;; ++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;; + mipstx39 | mipstx39el) + mips_cpu=r3900 + ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763..463de80 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From ef4ad1cb9ff1b5a871ffa792a71b3ad6d14eb3dc Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b050..6acde1f 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 2f7f2389764ef1d699f6ad32057314024b7e84e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61..0000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 97% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d..a794719 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From 392d474a72d37b669f53ab9f0fa913b958af93f6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 91% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf7..bfc9346 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -49,9 +49,9 @@ do_install_class-native () { # Split out libbfd-*.so so including perf doesn't include extra stuff PACKAGE_BEFORE_PN += "libbfd" -FILES_libbfd = "${libdir}/libbfd-*.so" +FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 19:13:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 19:13:02 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (9d32796 -> d6ab644) Message-ID: <158231238237.32135.4795275913397270153@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 9d32796 oprofile: Fix build with bfd 2.34+ new cff61d2 ostree: upgrade 2019.6 -> 2020.2 new d6ab644 oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9d32796) \ N -- N -- N refs/heads/master-next (d6ab644) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../ostree/{ostree_2019.6.bb => ostree_2020.2.bb} | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) rename meta-oe/recipes-extended/ostree/{ostree_2019.6.bb => ostree_2020.2.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 19:13:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 19:13:04 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158231238237.32135.4795275913397270153@git.openembedded.org> References: <158231238237.32135.4795275913397270153@git.openembedded.org> Message-ID: <20200221191302.C699E2328C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d6ab644b7d708cdba7243f661c8ddb1f77d07a0b Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 19:13:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 19:13:03 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: ostree: upgrade 2019.6 -> 2020.2 In-Reply-To: <158231238237.32135.4795275913397270153@git.openembedded.org> References: <158231238237.32135.4795275913397270153@git.openembedded.org> Message-ID: <20200221191302.B6F262328C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cff61d2be224fb2a4ba68ded77abb57dea2e29c9 Author: Alex Kiernan AuthorDate: Fri Feb 21 18:18:32 2020 +0000 ostree: upgrade 2019.6 -> 2020.2 Also expose glib and gpgme in PACKAGECONFIG (which were always on). Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- .../ostree/{ostree_2019.6.bb => ostree_2020.2.bb} | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb b/meta-oe/recipes-extended/ostree/ostree_2020.2.bb similarity index 88% rename from meta-oe/recipes-extended/ostree/ostree_2019.6.bb rename to meta-oe/recipes-extended/ostree/ostree_2020.2.bb index bcf511b..78f4cf5 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2020.2.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = " \ glib-2.0 \ - gpgme \ e2fsprogs \ libcap \ zlib \ @@ -26,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "43706202f7de2ce0c829a46caab350ae1656f6ad" +SRCREV = "c6085ebd5e27da35f43165eb614190665468f13a" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" @@ -36,11 +35,11 @@ inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconf # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems -# -# If running with ptest, both soup (for trivial-httpd) and xattr are required PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ + glib \ + gpgme \ soup \ " @@ -49,6 +48,7 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG_class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ builtin-grub2-mkconfig \ + gpgme \ soup \ " @@ -56,8 +56,10 @@ PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[glib] = "--with-crypto=glib" PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" +PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme" PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" @@ -144,9 +146,21 @@ RDEPENDS_${PN} = " \ RDEPENDS_${PN}-dracut = "bash" RDEPENDS_${PN}-mkinitcpio = "bash" RDEPENDS_${PN}_class-target = " \ - gnupg \ + ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ ${PN}-switchroot \ " + +# +# Note that to get ptest to pass you also need: +# +# xattr in DISTRO_FEATURES +# static ostree-prepare-root (PACKAGECONFIG_append_pn-ostree = " static") +# meta-python in your layers +# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") +# busybox built statically +# /var/tmp as a real filesystem (not a tmpfs) +# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") +# RDEPENDS_${PN}-ptest += " \ attr \ bash \ @@ -157,7 +171,10 @@ RDEPENDS_${PN}-ptest += " \ grep \ python3-core \ python3-multiprocessing \ + strace \ tar \ + util-linux \ + xz \ ${PN}-trivial-httpd \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ @@ -165,7 +182,6 @@ RDEPENDS_${PN}-ptest += " \ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" RRECOMMENDS_${PN} += "kernel-module-overlay" -RRECOMMENDS_${PN}-ptest += "strace" SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:53 +0000 Subject: [oe-commits] [meta-openembedded] 02/07: sshfs-fuse: 3.6.0 -> 3.7.0 In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.1658B2328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 172be3fded149103d0d559eb8bbc3a0da4f80235 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:12 2020 -0800 sshfs-fuse: 3.6.0 -> 3.7.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../sshfs-fuse/{sshfs-fuse_3.6.0.bb => sshfs-fuse_3.7.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb similarity index 88% rename from meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb rename to meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb index 2515d07..bf9c34d 100644 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/libfuse/sshfs" -SRCREV = "a1e5f12c530ccf59434a7d59a34a049f160b3559" +SRCREV = "a7e1038203c856cc7e052d439d1da49fe131339f" S = "${WORKDIR}/git" inherit meson -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:52 +0000 Subject: [oe-commits] [meta-openembedded] 01/07: meta-oe: onig: avoid using 'install' with both -D and -t options In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.0C46F2328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7513625706f28ef7bed57fb679d755ae0398a087 Author: Mark Asselstine AuthorDate: Fri Feb 21 10:20:56 2020 -0500 meta-oe: onig: avoid using 'install' with both -D and -t options Older versions of 'install' (prior to 8.23) do not allow the -D and -t options to be used together. (see coreutils commit 15d092f94a3a [install: allow options -D and -t to be used together]). On build hosts such as CentOS7, which has install v8.22, we therefor see a failure: install: failed to access ?...onig/6.9.4-r0/image/usr/lib64/onig/ptest/tests/?: No such file or directory We definitely don't want to avoid using useful features of tools but throughout meta-openembedded the mkdir approach is used so let's stick to it and avoid causing undo issues at the expense of one extra line of code. Signed-off-by: Mark Asselstine Signed-off-by: Khem Raj --- meta-oe/recipes-support/onig/onig_6.9.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb index cfa86f0..50d9f52 100644 --- a/meta-oe/recipes-support/onig/onig_6.9.4.bb +++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb @@ -28,5 +28,6 @@ do_compile_ptest() { } do_install_ptest() { - install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:54 +0000 Subject: [oe-commits] [meta-openembedded] 03/07: crash: upgrade 7.2.7 -> 7.2.8 In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.1F21E2328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e10d2bdede30d5cb3a59830a1195695d2bb674fd Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:13 2020 -0800 crash: upgrade 7.2.7 -> 7.2.8 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/crash/{crash_7.2.7.bb => crash_7.2.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.7.bb b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb similarity index 98% rename from meta-oe/recipes-kernel/crash/crash_7.2.7.bb rename to meta-oe/recipes-kernel/crash/crash_7.2.8.bb index 8098d09..61cc71f 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.7.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb @@ -26,7 +26,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRCREV = "5b0e3777ccbb571678791903e93446ccd0aba03a" +SRCREV = "24f4801f8c8871a2e3e660fe9fa8fdd86bb29876" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:55 +0000 Subject: [oe-commits] [meta-openembedded] 04/07: kpatch: upgrade 0.8.0 -> 0.9.0 In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.276D12328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 247b9dff37092d96b7964b00a843d422bb732a81 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:14 2020 -0800 kpatch: upgrade 0.8.0 -> 0.9.0 refresh the following patch: 0002-kpatch-build-allow-overriding-of-distro-name.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch | 6 +++--- meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch index 603a147..0cc3684 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch +++ b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch @@ -48,10 +48,10 @@ index 39933fc..c0258a2 100755 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -571,7 +576,7 @@ fi +@@ -613,7 +613,7 @@ fi # Don't check external file. - # shellcheck disable=SC1091 - source /etc/os-release + # shellcheck disable=SC1090 + [[ -f "$RELEASE_FILE" ]] && source "$RELEASE_FILE" -DISTRO="$ID" +DISTRO="${DISTRO:-${ID}}" if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb index 6326a25..59dbc93 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb +++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb @@ -2,9 +2,9 @@ require kpatch.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "2a29bc7dea9a7da12705c7b50315eee1acdd9156" +SRCREV = "fd8209aa00525f3e6092eaccbc34f7ce13c4ebc9" -PV = "0.8.0" +PV = "0.9.0" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:51 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (d6ab644 -> 774d8d2) Message-ID: <158232371188.25696.7626312568294810041@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard d6ab644 oprofile: Fix build with bfd 2.34+ discard cff61d2 ostree: upgrade 2019.6 -> 2020.2 discard ff9fdba uftrace: upgrade 0.9.3 -> 0.9.4 discard 468547e kpatch: upgrade 0.8.0 -> 0.9.0 discard 5935d68 crash: upgrade 7.2.7 -> 7.2.8 discard 764e279 sshfs-fuse: 3.6.0 -> 3.7.0 discard a9fa588 meta-oe: onig: avoid using 'install' with both -D and -t options discard 7ed78ec Ply: Add recipe for git version new 7513625 meta-oe: onig: avoid using 'install' with both -D and -t options new 172be3f sshfs-fuse: 3.6.0 -> 3.7.0 new e10d2bd crash: upgrade 7.2.7 -> 7.2.8 new 247b9df kpatch: upgrade 0.8.0 -> 0.9.0 new aa90c09 uftrace: upgrade 0.9.3 -> 0.9.4 new 4e8fb9d ostree: upgrade 2019.6 -> 2020.2 new 774d8d2 oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d6ab644) \ N -- N -- N refs/heads/master-next (774d8d2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-devtools/ply/ply_git.bb | 38 --------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta-oe/recipes-devtools/ply/ply_git.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:56 +0000 Subject: [oe-commits] [meta-openembedded] 05/07: uftrace: upgrade 0.9.3 -> 0.9.4 In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.31BDB2328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit aa90c0920e9fd0857dc94a9d5bdb5e310ece3ca5 Author: Wang Mingyu AuthorDate: Fri Feb 21 07:24:15 2020 -0800 uftrace: upgrade 0.9.3 -> 0.9.4 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-devtools/uftrace/{uftrace_0.9.3.bb => uftrace_0.9.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.3.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb similarity index 94% rename from meta-oe/recipes-devtools/uftrace/uftrace_0.9.3.bb rename to meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb index dba607c..cfe461b 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.3.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb @@ -10,8 +10,8 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -# v0.9.3 -SRCREV = "e77780e7524c0a97f25313b205837191bbe9712a" +# v0.9.4 +SRCREV = "5e422c0ec87b41d14e9ce8527983406718ef64e0" SRC_URI = "git://github.com/namhyung/${BPN} \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:57 +0000 Subject: [oe-commits] [meta-openembedded] 06/07: ostree: upgrade 2019.6 -> 2020.2 In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.3ADE82328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4e8fb9dfceaedc5e0b80f6fc61f127b632e100e5 Author: Alex Kiernan AuthorDate: Fri Feb 21 18:18:32 2020 +0000 ostree: upgrade 2019.6 -> 2020.2 Also expose glib and gpgme in PACKAGECONFIG (which were always on). Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- .../ostree/{ostree_2019.6.bb => ostree_2020.2.bb} | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb b/meta-oe/recipes-extended/ostree/ostree_2020.2.bb similarity index 88% rename from meta-oe/recipes-extended/ostree/ostree_2019.6.bb rename to meta-oe/recipes-extended/ostree/ostree_2020.2.bb index bcf511b..78f4cf5 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2020.2.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = " \ glib-2.0 \ - gpgme \ e2fsprogs \ libcap \ zlib \ @@ -26,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "43706202f7de2ce0c829a46caab350ae1656f6ad" +SRCREV = "c6085ebd5e27da35f43165eb614190665468f13a" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" @@ -36,11 +35,11 @@ inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconf # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems -# -# If running with ptest, both soup (for trivial-httpd) and xattr are required PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ + glib \ + gpgme \ soup \ " @@ -49,6 +48,7 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG_class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ builtin-grub2-mkconfig \ + gpgme \ soup \ " @@ -56,8 +56,10 @@ PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[glib] = "--with-crypto=glib" PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" +PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme" PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" @@ -144,9 +146,21 @@ RDEPENDS_${PN} = " \ RDEPENDS_${PN}-dracut = "bash" RDEPENDS_${PN}-mkinitcpio = "bash" RDEPENDS_${PN}_class-target = " \ - gnupg \ + ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ ${PN}-switchroot \ " + +# +# Note that to get ptest to pass you also need: +# +# xattr in DISTRO_FEATURES +# static ostree-prepare-root (PACKAGECONFIG_append_pn-ostree = " static") +# meta-python in your layers +# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") +# busybox built statically +# /var/tmp as a real filesystem (not a tmpfs) +# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") +# RDEPENDS_${PN}-ptest += " \ attr \ bash \ @@ -157,7 +171,10 @@ RDEPENDS_${PN}-ptest += " \ grep \ python3-core \ python3-multiprocessing \ + strace \ tar \ + util-linux \ + xz \ ${PN}-trivial-httpd \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ @@ -165,7 +182,6 @@ RDEPENDS_${PN}-ptest += " \ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" RRECOMMENDS_${PN} += "kernel-module-overlay" -RRECOMMENDS_${PN}-ptest += "strace" SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:21:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:21:58 +0000 Subject: [oe-commits] [meta-openembedded] 07/07: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158232371188.25696.7626312568294810041@git.openembedded.org> References: <158232371188.25696.7626312568294810041@git.openembedded.org> Message-ID: <20200221222152.45E9C2328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 774d8d2ba376b0fcb8868ce7519f96d4e09d1092 Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:25:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:25:56 +0000 Subject: [oe-commits] [openembedded-core] 01/03: jquery: fix upstream version check In-Reply-To: <158232395577.26792.8299717675236440829@git.openembedded.org> References: <158232395577.26792.8299717675236440829@git.openembedded.org> Message-ID: <20200221222556.404A62328C4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ad8ade3483eddc464a6ecf23d2617aba02588b71 Author: Alexander Kanavin AuthorDate: Fri Feb 21 21:15:42 2020 +0100 jquery: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb index e1080ae..1bf6ef5 100644 --- a/meta/recipes-devtools/jquery/jquery_3.4.1.bb +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -14,6 +14,8 @@ SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4 SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" +UPSTREAM_CHECK_REGEX = "jquery-(?P\d+(\.\d+)+)\.js" + inherit allarch do_install() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:25:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:25:57 +0000 Subject: [oe-commits] [openembedded-core] 02/03: oeqa/logparser: correctly set test result markers In-Reply-To: <158232395577.26792.8299717675236440829@git.openembedded.org> References: <158232395577.26792.8299717675236440829@git.openembedded.org> Message-ID: <20200221222556.4BF7E2328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e108c1ca30c593d786c42ccd0dd591c456e8bdcf Author: Alexander Kanavin AuthorDate: Fri Feb 21 21:15:43 2020 +0100 oeqa/logparser: correctly set test result markers I spotted this by noticing ptests started to unexpectedly pass, which shouldn't happen yet. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 5403721..60e16d5 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -26,7 +26,7 @@ class PtestParser(object): section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") # Cache markers so we don't take the re.search() hit all the time. - markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + markers = ("PASS:", "FAIL:", "SKIP:", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") def newsection(): return { 'name': "No-section", 'log': [] } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:25:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:25:55 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1e41c1f -> 64f5024) Message-ID: <158232395577.26792.8299717675236440829@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 1e41c1f binutils: Upgrade to 2.34 release new ad8ade3 jquery: fix upstream version check new e108c1c oeqa/logparser: correctly set test result markers new 64f5024 toolchain-shar-extract: ignore timestamp on decompress This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1e41c1f) \ N -- N -- N refs/heads/master-next (64f5024) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- meta/files/toolchain-shar-extract.sh | 2 +- meta/lib/oeqa/utils/logparser.py | 2 +- .../{binutils-2.34.inc => binutils-2.33.inc} | 37 +- ...ian_2.34.bb => binutils-cross-canadian_2.33.bb} | 0 ...te_2.34.bb => binutils-cross-testsuite_2.33.bb} | 0 ...nutils-cross_2.34.bb => binutils-cross_2.33.bb} | 0 ...-crosssdk_2.34.bb => binutils-crosssdk_2.33.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 + ...=> 0004-Point-scripts-location-to-libdir.patch} | 10 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 41 - ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 +++++++++++++++++++ .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 ------- ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0011-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0013-Detect-64-bit-MIPS-targets.patch} | 4 +- ...tch => 0014-sync-with-OE-libtool-changes.patch} | 2 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 + .../binutils/binutils/CVE-2019-17450.patch | 94 + .../binutils/binutils/CVE-2019-17451.patch | 46 + ...ld.so.conf.patch => nativesdk-relocation.patch} | 75 +- .../{binutils_2.34.bb => binutils_2.33.bb} | 4 +- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 2 + 31 files changed, 21594 insertions(+), 7398 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.34.inc => binutils-2.33.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.34.bb => binutils-cross-canadian_2.33.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.34.bb => binutils-cross-testsuite_2.33.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.34.bb => binutils-cross_2.33.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.34.bb => binutils-crosssdk_2.33.bb} (100%) create mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0005-Point-scripts-location-to-libdir.patch => 0004-Point-scripts-location-to-libdir.patch} (83%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) create mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0009-warn-for-uses-of-system-directories-when-cross-linki.patch => 0008-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0011-Change-default-emulation-for-mips64-linux.patch => 0010-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0012-Add-support-for-Netlogic-XLP.patch => 0011-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0014-Detect-64-bit-MIPS-targets.patch => 0013-Detect-64-bit-MIPS-targets.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0015-sync-with-OE-libtool-changes.patch => 0014-sync-with-OE-libtool-changes.patch} (97%) create mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/binutils/{0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch => nativesdk-relocation.patch} (56%) rename meta/recipes-devtools/binutils/{binutils_2.34.bb => binutils_2.33.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 22:25:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 22:25:58 +0000 Subject: [oe-commits] [openembedded-core] 03/03: toolchain-shar-extract: ignore timestamp on decompress In-Reply-To: <158232395577.26792.8299717675236440829@git.openembedded.org> References: <158232395577.26792.8299717675236440829@git.openembedded.org> Message-ID: <20200221222556.5645E2328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 64f502418dec34eca7d5192310cfcdfb9388cfd1 Author: Jeremy Puhlman AuthorDate: Fri Feb 21 12:20:15 2020 -0800 toolchain-shar-extract: ignore timestamp on decompress Installing on centos7, which the extended version of the buildtools tarball is supposed to fix and with reproducable builds turned on, all the time stamps are for epoch. This results in the following output for every file: tar: ./sysroots/x86_64-pokysdk-linux/usr/include/c++/9.2.0/cstdalign: implausibly old time stamp 1969-12-31 16:00:00 tar: ./sysroots/x86_64-pokysdk-linux/usr/lib/libstdc++.so.6: implausibly old time stamp 1969-12-31 16:00:00 Ignore the timestamps during the uncompession step. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ccc4f4e..4c4b4de 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -249,7 +249,7 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:17 +0000 Subject: [oe-commits] [openembedded-core] 02/09: jquery: fix upstream version check In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.253872328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ecffa858269b32975e13da2bc770475d386dd509 Author: Alexander Kanavin AuthorDate: Fri Feb 21 21:15:42 2020 +0100 jquery: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb index e1080ae..1bf6ef5 100644 --- a/meta/recipes-devtools/jquery/jquery_3.4.1.bb +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -14,6 +14,8 @@ SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4 SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" +UPSTREAM_CHECK_REGEX = "jquery-(?P\d+(\.\d+)+)\.js" + inherit allarch do_install() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:18 +0000 Subject: [oe-commits] [openembedded-core] 03/09: oeqa/logparser: correctly set test result markers In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.314552328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a8ad24f9e066b23d802c20b4268bda791f1111ec Author: Alexander Kanavin AuthorDate: Fri Feb 21 21:15:43 2020 +0100 oeqa/logparser: correctly set test result markers I spotted this by noticing ptests started to unexpectedly pass, which shouldn't happen yet. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 5403721..60e16d5 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -26,7 +26,7 @@ class PtestParser(object): section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") # Cache markers so we don't take the re.search() hit all the time. - markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + markers = ("PASS:", "FAIL:", "SKIP:", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") def newsection(): return { 'name': "No-section", 'log': [] } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:15 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (64f5024 -> 9b7ba2d) Message-ID: <158232685559.6795.12289634758075578644@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 64f5024 toolchain-shar-extract: ignore timestamp on decompress discard e108c1c oeqa/logparser: correctly set test result markers discard ad8ade3 jquery: fix upstream version check discard e04ec10 psplash: add systemd support discard f0abfad alsa-utils: upgrade 1.2.1 -> 1.2.2 new 155cf8c psplash: add systemd support new ecffa85 jquery: fix upstream version check new a8ad24f oeqa/logparser: correctly set test result markers new e4647e5 toolchain-shar-extract: ignore timestamp on decompress new 02c06ae libxcrypt: Upgrade to 4.4.14 release new 474ea3d ninja: upgrade 1.9.0 -> 1.10.0 new 5058325 go: Upgrade to 1.13.8 minor release new 6d0a2c2 gmp: Upgrade to 6.2.0 new 9b7ba2d binutils: Upgrade to 2.34 release This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (64f5024) \ N -- N -- N refs/heads/master-next (9b7ba2d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- ...compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} | 0 .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 75 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 41 + ...=> 0005-Point-scripts-location-to-libdir.patch} | 10 +- ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- meta/recipes-devtools/go/go-1.13.inc | 7 +- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 - .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +- ...cripts_1.2.2.bb => alsa-utils-scripts_1.2.1.bb} | 0 .../{alsa-utils_1.2.2.bb => alsa-utils_1.2.1.bb} | 4 +- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 - ...user-provided-flags-to-the-auto-detected-.patch | 0 ...re.ac-Believe-the-cflags-from-environment.patch | 16 +- .../gmp/{gmp-6.1.2 => gmp}/use-includedir.patch | 3 + .../gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} | 5 +- 41 files changed, 7417 insertions(+), 21676 deletions(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (91%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (97%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (91%) delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.2.bb => alsa-utils-scripts_1.2.1.bb} (100%) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.2.bb => alsa-utils_1.2.1.bb} (97%) delete mode 100644 meta/recipes-support/gmp/gmp-6.1.2/amd64.patch rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch (100%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-confiure.ac-Believe-the-cflags-from-environment.patch (80%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/use-includedir.patch (83%) rename meta/recipes-support/gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} (86%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:16 +0000 Subject: [oe-commits] [openembedded-core] 01/09: psplash: add systemd support In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.1A4D52328C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 155cf8c7ff8d36689a6a3d931cbde59f65eab9f5 Author: Stefan Agner AuthorDate: Wed Jan 22 14:20:24 2020 +0000 psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++--- .../psplash/files/psplash-start.service | 10 ++++++ .../psplash/files/psplash-systemd.service | 10 ++++++ meta/recipes-core/psplash/psplash_git.bb | 38 +++++++++++++--------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866..f58e043 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000..9de8f63 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000..e14f420 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1..6ff0393 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -66,7 +68,11 @@ python __anonymous() { S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -97,8 +103,17 @@ python do_compile () { } do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,8 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." - -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:19 +0000 Subject: [oe-commits] [openembedded-core] 04/09: toolchain-shar-extract: ignore timestamp on decompress In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.3D5D02328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e4647e5b9145409aa14430be96e395f179493c8e Author: Jeremy Puhlman AuthorDate: Fri Feb 21 12:20:15 2020 -0800 toolchain-shar-extract: ignore timestamp on decompress Installing on centos7, which the extended version of the buildtools tarball is supposed to fix and with reproducable builds turned on, all the time stamps are for epoch. This results in the following output for every file: tar: ./sysroots/x86_64-pokysdk-linux/usr/include/c++/9.2.0/cstdalign: implausibly old time stamp 1969-12-31 16:00:00 tar: ./sysroots/x86_64-pokysdk-linux/usr/lib/libstdc++.so.6: implausibly old time stamp 1969-12-31 16:00:00 Ignore the timestamps during the uncompession step. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ccc4f4e..4c4b4de 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -249,7 +249,7 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:20 +0000 Subject: [oe-commits] [openembedded-core] 05/09: libxcrypt: Upgrade to 4.4.14 release In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.48BB22328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 02c06aefbf0014d3e009b748dc098f21dfabea57 Author: Khem Raj AuthorDate: Fri Feb 21 14:45:34 2020 -0800 libxcrypt: Upgrade to 4.4.14 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 59744c0..416205c 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" +SRCREV = "5c43f7d56a31667bcdaa334bbb4edafb75672872" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:22 +0000 Subject: [oe-commits] [openembedded-core] 07/09: go: Upgrade to 1.13.8 minor release In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.61A562328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 50583253014dc4b9f477e256080b64ca015d67f4 Author: Khem Raj AuthorDate: Fri Feb 21 14:45:36 2020 -0800 go: Upgrade to 1.13.8 minor release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/go/go-1.13.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.13.inc index 39dbd74..7780ace 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.13.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.13" -GO_MINOR = ".5" +GO_MINOR = ".8" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,6 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "ecd1729313608d3ef352ea4fd9ea42cd" -SRC_URI[main.sha256sum] = "27d356e2a0b30d9983b60a788cf225da5f914066b37a6b4f69d457ba55a626ff" - +SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" +SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:23 +0000 Subject: [oe-commits] [openembedded-core] 08/09: gmp: Upgrade to 6.2.0 In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.6D7842328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6d0a2c209bdc37c56b079b55baa2a108a0fede50 Author: Khem Raj AuthorDate: Fri Feb 21 14:45:37 2020 -0800 gmp: Upgrade to 6.2.0 Drop amd64 patch, the bsfq has been replaced with bsfl for count_trailing_zeros Forward port rest of patches to 6.2.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 ------------------ ...the-user-provided-flags-to-the-auto-detected-.patch | 0 ...nfiure.ac-Believe-the-cflags-from-environment.patch | 16 ++++++++-------- .../gmp/{gmp-6.1.2 => gmp}/use-includedir.patch | 3 +++ .../recipes-support/gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} | 5 ++--- 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch deleted file mode 100644 index 3935589..0000000 --- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Index: gmp-6.1.2/longlong.h -=================================================================== ---- gmp-6.1.2.orig/longlong.h -+++ gmp-6.1.2/longlong.h -@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype - count is only an int. */ - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ -+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ -+ (count) = __cbtmp; \ - } while (0) - #endif /* __amd64__ */ - diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch similarity index 100% rename from meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch rename to meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch similarity index 80% rename from meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch rename to meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 1e47924..56564db 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,11 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -Index: gmp-6.1.2/configure.ac -=================================================================== ---- gmp-6.1.2.orig/configure.ac -+++ gmp-6.1.2/configure.ac -@@ -604,15 +604,6 @@ case $host in - any_32_testlist="sizeof-long-4" - any_64_testlist="sizeof-long-8" +--- a/configure.ac ++++ b/configure.ac +@@ -625,17 +625,6 @@ case $host in + any_32_testlist="sizeof-void*-4" + any_64_testlist="sizeof-void*-8" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -33,12 +31,14 @@ Index: gmp-6.1.2/configure.ac - gcc_cflags_fpmode="-mfloat-abi=softfp" ;; - *-*-*eabihf) - gcc_cflags_fpmode="-mfloat-abi=hard" ;; +- *-*-mingw*) +- limb_64=longlong ;; - esac - # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -746,8 +737,6 @@ case $host in +@@ -780,8 +769,6 @@ case $host in ;; *) path="arm" diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch similarity index 83% rename from meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch rename to meta/recipes-support/gmp/gmp/use-includedir.patch index 6b089cf..d27317c 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/meta/recipes-support/gmp/gmp/use-includedir.patch @@ -1,4 +1,7 @@ +exec includedir should be pointing to general yocto includdir + Upstream-Status: Pending +Signed-off-by: Khem Raj Index: gmp-6.1.2/Makefile.am =================================================================== diff --git a/meta/recipes-support/gmp/gmp_6.1.2.bb b/meta/recipes-support/gmp/gmp_6.2.0.bb similarity index 86% rename from meta/recipes-support/gmp/gmp_6.1.2.bb rename to meta/recipes-support/gmp/gmp_6.2.0.bb index c745dbb..a19c74f 100644 --- a/meta/recipes-support/gmp/gmp_6.1.2.bb +++ b/meta/recipes-support/gmp/gmp_6.2.0.bb @@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ REVISION = "" SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://amd64.patch \ file://use-includedir.patch \ file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ " -SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" -SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" +SRC_URI[md5sum] = "c24161e0dd44cae78cd5f67193492a21" +SRC_URI[sha256sum] = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea" acpaths = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:21 +0000 Subject: [oe-commits] [openembedded-core] 06/09: ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.53F0D2328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 474ea3dc45e617e4e590f0b0cf332667a5cae0d8 Author: Upgrade Helper AuthorDate: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 ---------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch deleted file mode 100644 index 7fd7791..0000000 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -Date: Mon, 24 Dec 2018 03:13:16 +0200 -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 - -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward -compatibility macro. Should help avoid hardcoding platform detection. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/disk_interface.cc b/src/disk_interface.cc -index d4c2fb0..dc297c4 100644 ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { - // that it doesn't exist. - if (st.st_mtime == 0) - return 1; --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) -+#if defined(_AIX) -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; -+#elif defined(__APPLE__) - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + - st.st_mtimespec.tv_nsec); --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar -- // For bionic, C and POSIX API is always enabled. -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; --#elif defined(_AIX) -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; - #else - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; - #endif --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb similarity index 87% rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8..bdc6365 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 21 23:14:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 21 Feb 2020 23:14:24 +0000 Subject: [oe-commits] [openembedded-core] 09/09: binutils: Upgrade to 2.34 release In-Reply-To: <158232685559.6795.12289634758075578644@git.openembedded.org> References: <158232685559.6795.12289634758075578644@git.openembedded.org> Message-ID: <20200221231416.A74F42328CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9b7ba2dd2c7131129e35595f0d9553fd7e97faad Author: Khem Raj AuthorDate: Thu Feb 20 09:13:40 2020 -0800 binutils: Upgrade to 2.34 release Details of changelog [1] Removing bfd/ld patch to enable PE targets, instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch rpaths are no longer emitted into elfedit/readelf therefore no need of chrpath anymore Instead of pre-generating configure scripts and house them in libtool patch, generate them during configure. This also ensures that we do not patch configure directly but rather the sources which generate it Package newly added libctf library [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 75 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 41 + ...=> 0005-Point-scripts-location-to-libdir.patch} | 10 +- ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- 28 files changed, 7396 insertions(+), 21590 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 82530f5..e957e3a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8..eaaa5ed 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa5..5b4a339 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -13,17 +13,12 @@ LICENSE = "GPLv3" DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" -# -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath -# -DEPENDS_append_class-target = " chrpath-replacement-native" -EXTRANATIVEPATH_append_class-target = " chrpath-native" - inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ + ${libdir}/libctf.so \ + ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" # Rather than duplicating multiple entries for these, make one @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do + cd ${S}/$d + autoconf + rm -rf autom4te.cache + done + cd ${S} + gnu-configize) + oe_runconf # # must prime config.cache to ensure the build of libiberty @@ -123,10 +129,6 @@ do_configure () { done } -do_compile_append_class-target() { - chrpath -d ${B}/binutils/elfedit - chrpath -d ${B}/binutils/readelf -} do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461b..14e8421 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,6 +1,6 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 +Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4..91de94b 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From 6d79f81336e7cbe727b5a51134f5d314a455379d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d1..8b59ba5 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From d057b215f114f6158b4010ab44a19cae9dcc8386 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 4a6b107..0000000 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH] configure: widen the regexp for SH architectures - -gprof needs to know about uclibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure | 2 +- - gprof/configure | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 ---- a/configure -+++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000..d10a144 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,41 @@ +From f7ad8a44c10f01e03680f093fd7af71c9f5e8606 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH] configure: widen the regexp for SH architectures + +gprof needs to know about uclibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 91dc42f6c7..7c1b747e7c 100755 +--- a/configure ++++ b/configure +@@ -3915,7 +3915,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4bd869a63a..7187b34dfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1159,7 +1159,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3..3ba0ba6 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 08b088b7dd3d9707ed66948a7271ffb438eeddf5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch similarity index 51% rename from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename to meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 214ae06..d920729 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 +From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -10,21 +10,23 @@ Upstream-Status: Pending Signed-off-by: Chris Chimelis Signed-off-by: Khem Raj --- - ld/emultempl/elf32.em | 4 ++++ + ld/ldelf.c | 4 ++++ 1 file changed, 4 insertions(+) ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment < -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH] Use libtool 2.4 - -get libtool sysroot support - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - bfd/configure | 1322 ++++++++++++++----- - bfd/configure.ac | 2 +- - binutils/configure | 1320 ++++++++++++++----- - gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1321 ++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------ - libtool.m4 | 1080 +++++++++++----- - ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- - ltoptions.m4 | 2 +- - ltversion.m4 | 12 +- - lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 ++++++++++++++----- - opcodes/configure.ac | 2 +- - zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) - ---- a/bfd/configure -+++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -822,6 +825,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-mmap try using mmap for BFD input files if available - --with-separate-debug-dir=DIR - Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6808,6 +6894,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6900,6 +7158,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7262,8 +7580,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7351,7 +7682,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7426,6 +7757,20 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7445,6 +7790,41 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - - - # Check whether --enable-libtool-lock was given. -@@ -7653,6 +8033,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8380,7 +8879,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8469,7 +8969,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9470,7 +9983,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9588,8 +10102,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9607,8 +10121,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9654,8 +10168,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9785,7 +10299,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9798,22 +10318,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9838,22 +10371,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10102,23 +10685,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10932,7 +11587,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11728,7 +12383,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= - if test "$enable_shared" = "yes"; then - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18422,12 +19127,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/binutils/configure -+++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -807,6 +810,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6572,6 +6658,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6664,6 +6922,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7115,7 +7446,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7190,6 +7521,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -7211,6 +7554,43 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8175,7 +8674,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8264,7 +8764,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9265,7 +9778,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9383,8 +9897,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9402,8 +9916,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9449,8 +9963,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9580,7 +10094,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9593,22 +10113,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9633,22 +10166,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9897,23 +10480,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10727,7 +11382,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11523,7 +12178,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17159,12 +17864,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gas/configure -+++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -799,6 +802,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-cpu=CPU default cpu variant is CPU (currently only supported - on ARC) - --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6392,6 +6478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6484,6 +6742,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6935,7 +7266,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7010,6 +7341,19 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7030,6 +7374,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7237,6 +7617,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7995,7 +8494,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8084,7 +8584,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9085,7 +9598,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9203,8 +9717,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9222,8 +9736,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9269,8 +9783,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9400,7 +9914,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9413,22 +9933,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9453,22 +9986,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9717,23 +10300,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10547,7 +11202,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11343,7 +11998,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16049,8 +16714,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16081,7 +16753,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16117,6 +16788,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16890,7 +17562,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17158,12 +17863,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gprof/configure -+++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -780,6 +783,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5124,8 +5130,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --linux-uclibc*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -- ;; -- - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6244,6 +6325,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6276,8 +6525,8 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6336,6 +6589,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6698,8 +7011,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6776,6 +7090,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6787,7 +7113,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6824,8 +7150,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6862,6 +7188,17 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ - - - -@@ -6883,6 +7220,44 @@ fi - - - -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7089,6 +7464,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7652,6 +8144,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7847,7 +8341,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7936,7 +8431,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8234,8 +8729,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8520,13 +9019,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8587,6 +9090,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8937,7 +9445,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9036,12 +9545,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9055,8 +9564,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9074,8 +9583,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9121,8 +9630,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9252,7 +9761,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9265,22 +9780,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9305,22 +9833,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9569,23 +10147,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10399,7 +11049,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11239,10 +11889,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11345,10 +11995,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13435,8 +14095,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13467,7 +14134,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13503,6 +14169,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14268,7 +14935,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14536,12 +15236,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/ld/configure -+++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -816,6 +819,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-lib-path=dir1:dir2... set default LIB_PATH - --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -7075,6 +7161,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7167,6 +7425,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7618,7 +7949,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7693,6 +8024,13 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - - - -@@ -7714,6 +8052,48 @@ fi - - - -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8551,6 +9050,16 @@ done - - - -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+ -+ -+ - - - # Set options -@@ -8679,7 +9188,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8768,7 +9278,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9769,7 +10292,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9887,8 +10411,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9906,8 +10430,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9953,8 +10477,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10084,7 +10608,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10097,22 +10627,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10137,22 +10680,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10401,23 +10994,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11231,7 +11896,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -12027,7 +12692,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12884,22 +13557,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12925,22 +13611,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: - }; - _LT_EOF - -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -13815,6 +14572,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -13850,7 +14608,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -14476,6 +15246,7 @@ fi - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -14891,7 +15726,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15350,6 +16185,7 @@ fi - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi - compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' - GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' - archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har - hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' - inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' - link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' - always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' - exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' - file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' - compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ - reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19773,12 +20659,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -199,7 +205,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -746,15 +752,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_XSI_SHELLFNS -+ _LT_PROG_REPLACE_SHELLFNS - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -980,6 +983,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - -@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - - AC_MSG_CHECKING([how to print strings]) - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_libtool_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2342,7 +2483,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2950,6 +3091,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -3167,6 +3314,21 @@ tpf*) - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3403,8 +3630,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t at _DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t at _DLSYM_CONST -+#else -+# define LT@&t at _DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3484,7 +3724,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t at _DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3551,6 +3791,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4529,8 +4801,8 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4548,8 +4820,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4595,8 +4867,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4726,7 +4998,7 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else -@@ -4737,7 +5009,7 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4852,7 +5167,7 @@ _LT_EOF - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -4876,10 +5191,10 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4926,16 +5241,31 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { - }; - _LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6586,6 +7008,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF --esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,10 +1,9 @@ --# Generated from ltmain.m4sh. - --# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -38,7 +37,6 @@ - # -n, --dry-run display commands without modifying any files - # --features display basic configuration information and exit - # --mode=MODE use operation mode MODE --# --no-finish let install mode avoid finish commands - # --preserve-dup-deps don't remove duplicate dependency libraries - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent -@@ -71,17 +69,19 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# $progname: (GNU libtool) 2.4 - # automake: $automake_version - # autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.7a --TIMESTAMP=" 1.3134 2009-11-29" --package_revision=1.3134 -+VERSION=2.4 -+TIMESTAMP="" -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -106,9 +106,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -121,15 +118,13 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -- -- -- -- -- - # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh - # is ksh but when the shell is invoked as "sh" and the current value of - # the _XPG environment variable is not equal to 1 (one), the special -@@ -140,7 +135,7 @@ progpath="$0" - - - : ${CP="cp -f"} --: ${ECHO=$as_echo} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -149,7 +144,7 @@ progpath="$0" - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -169,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -183,17 +199,31 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation - --# Generated shell functions inserted here. - - # These SED scripts presuppose an absolute path with a trailing slash. - pathcar='s,^/\([^/]*\).*$,\1,' -@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -404,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -430,14 +469,14 @@ func_echo_all () - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -656,19 +695,35 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -+ $opt_debug -+ - $SED -n '/(C)/!b go - :more - /\./!{ - N -- s/\n# // -+ s/\n# / / - b more - } - :go -@@ -685,7 +740,9 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/^# *-h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ -@@ -701,7 +758,10 @@ func_usage () - # unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -714,7 +774,11 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret -@@ -726,12 +790,39 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: - - - -@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_finish=: --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -850,130 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac -+ -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- --no-finish) opt_finish=false ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- opt_verbose=false -+ opt_preserve_dup_deps=: - ;; -- -- --no-quiet|--no-silent) -- preserve_args="$preserve_args $opt" -- opt_silent=false -+ --features) -+ opt_features=: -+func_features - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -- opt_verbose=: -+func_append preserve_args " $opt" - ;; -- -- --no-verbose) preserve_args="$preserve_args $opt" -+ --no-verbose) - opt_verbose=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --help-all) opt_help=': help-all' ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -@@ -981,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval "std_shrext=\"$shrext_cmds\"" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1149,7 +1311,7 @@ func_execute_cmds () - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1172,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1184,8 +1377,7 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1204,8 +1396,7 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1274,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1314,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1340,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1364,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1496,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval "srcfile=\"$fix_srcfile_path\"" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1526,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1573,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1622,13 +2290,13 @@ compiler." - } - - $opt_help || { -- test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -@@ -1819,13 +2487,13 @@ if $opt_help; then - else - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done -@@ -1854,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1882,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1907,10 +2578,10 @@ func_mode_execute () - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. -- if eval test -z \"\$$shlibpath_var\"; then -- eval $shlibpath_var=\$dir -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" - else -- eval $shlibpath_var=\$dir:\$$shlibpath_var -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - -@@ -1939,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1972,22 +2642,59 @@ func_mode_execute () - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi - -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1997,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -2006,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval "flag=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2077,7 +2786,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; -@@ -2097,7 +2806,7 @@ func_mode_install () - do - arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -2135,11 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi -- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2151,7 +2860,7 @@ func_mode_install () - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" -- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - -@@ -2209,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2226,23 +2938,30 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2315,7 +3034,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2503,7 +3222,7 @@ func_mode_install () - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - -- if test -n "$current_libdirs" && $opt_finish; then -+ if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -@@ -2512,7 +3231,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2559,6 +3278,18 @@ extern \"C\" { - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2570,21 +3301,22 @@ extern \"C\" { - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { -- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - -@@ -2593,23 +3325,23 @@ extern \"C\" { - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols -- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$export_symbols" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { -- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" -- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$nlist" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } -@@ -2620,10 +3352,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- $ECHO ": $name " >> "$nlist" -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2661,26 +3435,9 @@ typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- echo >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2796,9 +3553,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- win32_nmres=`$NM -f posix -A "$1" | -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2827,6 +3586,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2917,7 +3801,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +3816,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -@@ -3014,7 +3898,110 @@ func_fallback_echo () - _LTECHO_EOF' - } - ECHO=\"$qECHO\" -- fi\ -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -@@ -3078,7 +4065,7 @@ _LTECHO_EOF' - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" -@@ -3102,6 +4089,18 @@ _LTECHO_EOF' - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -3116,35 +4115,10 @@ _LTECHO_EOF' - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -@@ -3158,166 +4132,6 @@ fi\ - } - - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_result=`cygpath -w "$1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result= -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -- --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_pathlist_tmp1=$func_stripname_result -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- func_to_host_pathlist_result=` -- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_append func_to_host_pathlist_result ";$func_to_host_path_result" -- fi -- fi -- fi -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result"; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_append func_to_host_pathlist_result ";" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -- - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout - # Must ONLY be called from within func_mode_link because -@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined LT_DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); - void lt_update_exe_path (const char *name, const char *value); -@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); - EOF - - cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3706,7 +4529,9 @@ EOF - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3728,7 +4553,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3762,8 +4587,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3780,8 +4605,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4222,7 +5078,7 @@ EOF - func_win32_import_lib_p () - { - $opt_debug -- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -@@ -4401,9 +5257,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4427,7 +5283,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4446,7 +5302,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4475,7 +5331,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4487,7 +5343,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4557,12 +5413,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4574,28 +5430,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4686,15 +5542,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4706,10 +5563,16 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in -@@ -4718,12 +5581,12 @@ func_mode_link () - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4747,7 +5610,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4758,9 +5621,6 @@ func_mode_link () - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -- *-*-linux*) -- test "X$arg" = "X-lc" && continue -- ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -@@ -4770,7 +5630,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4782,8 +5642,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4791,12 +5651,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4863,13 +5723,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4922,8 +5786,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4938,9 +5802,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4968,24 +5832,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4997,7 +5864,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -5028,7 +5895,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -5040,7 +5907,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -5085,24 +5952,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -5127,7 +5995,7 @@ func_mode_link () - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval "arg=\"$export_dynamic_flag_spec\"" -+ eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi -@@ -5144,11 +6012,13 @@ func_mode_link () - else - shlib_search_path= - fi -- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" -- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -5169,12 +6039,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -5187,9 +6057,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5256,8 +6126,9 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library -@@ -5267,7 +6138,7 @@ func_mode_link () - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5288,11 +6159,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5377,7 +6248,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5390,7 +6261,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5404,7 +6276,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5415,17 +6288,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5488,11 +6365,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5538,7 +6415,7 @@ func_mode_link () - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -@@ -5546,8 +6423,8 @@ func_mode_link () - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5558,20 +6435,20 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv -@@ -5579,9 +6456,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5598,9 +6481,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5622,14 +6505,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5637,12 +6520,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5653,20 +6536,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5684,7 +6593,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5697,7 +6606,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5708,12 +6618,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5728,7 +6638,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5740,7 +6650,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5749,7 +6659,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5774,12 +6684,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5814,7 +6724,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5823,7 +6733,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5835,7 +6745,7 @@ func_mode_link () - shift - realname="$1" - shift -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" -@@ -5848,7 +6758,7 @@ func_mode_link () - versuffix="-$major" - ;; - esac -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -5877,7 +6787,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5933,7 +6843,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5955,7 +6865,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5969,13 +6879,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5989,7 +6899,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6001,12 +6911,12 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6083,27 +6993,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -6113,8 +7029,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -6130,7 +7048,7 @@ func_mode_link () - case $host in - *-*-darwin*) - depdepl= -- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp -@@ -6141,8 +7059,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -6152,7 +7070,7 @@ func_mode_link () - ;; - esac - else -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -@@ -6192,7 +7110,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6205,7 +7123,7 @@ func_mode_link () - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -- eval tmp_libs=\$$var -+ eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so -@@ -6250,13 +7168,13 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done -- eval $var=\$tmp_libs -+ eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs -@@ -6269,7 +7187,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6310,7 +7228,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6319,8 +7237,8 @@ func_mode_link () - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ -@@ -6330,8 +7248,8 @@ func_mode_link () - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result -@@ -6346,7 +7264,7 @@ func_mode_link () - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6544,7 +7462,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6612,10 +7530,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6631,7 +7549,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6642,7 +7560,7 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -@@ -6659,10 +7577,11 @@ func_mode_link () - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6676,7 +7595,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6686,7 +7605,7 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - -@@ -6698,7 +7617,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6715,7 +7634,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6764,18 +7683,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6789,7 +7708,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6807,18 +7726,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6840,7 +7759,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6857,15 +7776,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6885,10 +7816,10 @@ EOF - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6913,7 +7844,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6929,20 +7860,20 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6967,7 +7898,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7071,7 +8002,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7081,10 +8012,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -7101,10 +8032,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -7113,18 +8046,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- dep_rpath="$dep_rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -7133,40 +8066,38 @@ EOF - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done -- eval $runpath_var=\$rpath\$$runpath_var -- export $runpath_var -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then -- eval $shlibpath_var=\$shlibpath\$$shlibpath_var -- export $shlibpath_var -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. -- eval "shared_ext=\"$shrext_cmds\"" -- eval "library_names=\"$library_names_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -7178,7 +8109,7 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -@@ -7189,7 +8120,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7220,13 +8151,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7248,7 +8211,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7260,7 +8223,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7270,7 +8233,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7286,43 +8249,43 @@ EOF - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval "flag=\"$thread_safe_flag_spec\"" -- linker_flags="$linker_flags $flag" -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval "test_cmds=\"$module_expsym_cmds\"" -+ eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else -- eval "test_cmds=\"$module_cmds\"" -+ eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval "test_cmds=\"$archive_expsym_cmds\"" -+ eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else -- eval "test_cmds=\"$archive_cmds\"" -+ eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi -@@ -7366,10 +8329,13 @@ EOF - echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output -- delfiles="$delfiles $output" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7383,15 +8349,17 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext -- eval "test_cmds=\"$reload_cmds\"" -+ eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -7411,12 +8379,12 @@ EOF - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist -- eval "concat_cmds=\"$reload_cmds\"" -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 -@@ -7433,11 +8401,11 @@ EOF - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7450,9 +8418,9 @@ EOF - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - -@@ -7471,7 +8439,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7492,7 +8460,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7504,7 +8472,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7515,7 +8483,7 @@ EOF - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the -@@ -7539,23 +8507,23 @@ EOF - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. -- eval "cmds=\"\$cmds~\$RM $delfiles\"" -+ eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" -@@ -7564,7 +8532,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7576,8 +8544,8 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -@@ -7656,17 +8624,20 @@ EOF - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -@@ -7690,7 +8661,7 @@ EOF - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || echo timestamp > $libobj || exit $? -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - -@@ -7740,8 +8711,8 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi -@@ -7761,7 +8732,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7771,17 +8742,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7789,7 +8760,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7808,18 +8779,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7828,12 +8799,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7842,7 +8813,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - -@@ -7859,18 +8830,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7878,7 +8849,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - -@@ -7921,6 +8892,12 @@ EOF - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7943,7 +8920,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7951,7 +8928,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7966,6 +8943,13 @@ EOF - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7999,6 +8983,12 @@ EOF - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -8096,7 +9086,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -8104,10 +9094,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -8118,10 +9108,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -8139,7 +9129,7 @@ EOF - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -8163,18 +9153,28 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -- eval "cmds=\"$old_archive_cmds\"" -+ eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8189,7 +9189,7 @@ EOF - do - last_oldobj=$obj - done -- eval "test_cmds=\"$old_archive_cmds\"" -+ eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -8208,7 +9208,7 @@ EOF - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi -@@ -8216,9 +9216,9 @@ EOF - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then -- eval "cmds=\"\$concat_cmds\"" -+ eval cmds=\"\$concat_cmds\" - else -- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi -@@ -8268,12 +9268,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8284,12 +9295,14 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8303,10 +9316,11 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8318,7 +9332,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8327,7 +9341,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi -@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8432,9 +9446,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8443,24 +9457,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8486,18 +9499,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8525,19 +9537,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8547,7 +9559,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8556,7 +9568,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8564,12 +9576,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8577,7 +9589,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8589,16 +9600,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" ---- a/ltoptions.m4 -+++ b/ltoptions.m4 -@@ -8,7 +8,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ---- a/ltversion.m4 -+++ b/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3134 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.7a]) --m4_define([LT_PACKAGE_REVISION], [1.3134]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.7a' --macro_revision='1.3134' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 -@@ -7,7 +7,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -680,6 +680,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -798,6 +801,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5403,8 +5409,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6518,6 +6604,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6610,6 +6868,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6972,8 +7290,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7061,7 +7392,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7136,6 +7467,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7157,6 +7496,47 @@ fi - - - -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7363,6 +7743,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8091,7 +8590,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8180,7 +8680,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9181,7 +9694,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9299,8 +9813,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9318,8 +9832,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9365,8 +9879,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9496,7 +10010,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9509,22 +10029,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9549,22 +10082,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9813,23 +10396,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10643,7 +11298,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11439,7 +12094,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then - # since libbfd may not pull in the entirety of libiberty. - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14979,12 +15684,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -170,7 +170,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/zlib/configure -+++ b/zlib/configure -@@ -646,8 +646,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -774,6 +777,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_host_shared - ' -@@ -1428,6 +1432,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -4147,8 +4153,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5054,6 +5060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5070,6 +5150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5238,7 +5323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -5392,6 +5478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5484,6 +5743,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -5846,8 +6165,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -5935,7 +6267,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6010,6 +6342,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -6031,6 +6375,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -6241,6 +6621,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7269,7 +7768,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7358,7 +7858,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8359,7 +8872,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -8477,8 +8991,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -8496,8 +9010,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8543,8 +9057,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8674,7 +9188,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -8997,26 +9580,39 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- if test x$gcc_no_link = xyes; then -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -9830,7 +10485,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -10644,7 +11299,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -13322,12 +14027,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch new file mode 100644 index 0000000..c71e19e --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -0,0 +1,7115 @@ +From 3a2e7ec956568c503a678385ebee17098337feab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH] Use libtool 2.4 + +get libtool sysroot support + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + bfd/configure.ac | 2 +- + libtool.m4 | 1080 +++++++++++------ + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- + ltoptions.m4 | 2 +- + ltversion.m4 | 12 +- + lt~obsolete.m4 | 2 +- + 6 files changed, 2717 insertions(+), 1306 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -296,7 +296,7 @@ changequote(,)dnl + x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` + changequote([,])dnl + if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" + fi + + case "${host}" in +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -199,7 +205,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -746,15 +752,12 @@ _LT_EOF + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -980,6 +983,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + +@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + + AC_MSG_CHECKING([how to print strings]) + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) + ])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1623,7 +1705,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1667,10 +1749,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2342,7 +2483,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -2950,6 +3091,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -3016,7 +3162,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -3167,6 +3314,21 @@ tpf*) + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + + # LT_LIB_M + # -------- +@@ -3403,8 +3630,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3473,6 +3701,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t at _DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t at _DLSYM_CONST ++#else ++# define LT@&t at _DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3484,7 +3724,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t at _DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3551,6 +3791,13 @@ else + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4172,9 +4432,11 @@ case $host_os in + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + + # + # Check to make sure the PIC flag actually works. +@@ -4193,6 +4455,8 @@ fi + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. +@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4411,7 +4682,8 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4510,12 +4782,12 @@ _LT_EOF + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4529,8 +4801,8 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4548,8 +4820,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4595,8 +4867,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4726,7 +4998,7 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else +@@ -4737,7 +5009,7 @@ _LT_EOF + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -4781,20 +5053,63 @@ _LT_EOF + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4828,7 +5143,7 @@ _LT_EOF + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4836,7 +5151,7 @@ _LT_EOF + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4852,7 +5167,7 @@ _LT_EOF + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -4876,10 +5191,10 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4926,16 +5241,31 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -5020,7 +5350,7 @@ _LT_EOF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +@@ -5039,9 +5369,9 @@ _LT_EOF + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6445,6 +6825,29 @@ AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6453,6 +6856,7 @@ AC_LANG_POP + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6503,6 +6907,13 @@ public class foo { + }; + _LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6586,6 +7008,7 @@ else + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6622,7 +7045,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP +@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6992,7 +7423,8 @@ fi + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + +@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -7042,7 +7476,8 @@ fi + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; +- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh. + +-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -38,7 +37,6 @@ + # -n, --dry-run display commands without modifying any files + # --features display basic configuration information and exit + # --mode=MODE use operation mode MODE +-# --no-finish let install mode avoid finish commands + # --preserve-dup-deps don't remove duplicate dependency libraries + # --quiet, --silent don't print informational messages + # --no-quiet, --no-silent +@@ -71,17 +69,19 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -106,9 +106,6 @@ _LTECHO_EOF' + } + + # NLS nuisances: We save the old values to restore during execute mode. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). + lt_user_locale= + lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +@@ -121,15 +118,13 @@ do + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done ++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL + + $lt_unset CDPATH + + +- +- +- +- +- + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special +@@ -140,7 +135,7 @@ progpath="$0" + + + : ${CP="cp -f"} +-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} + : ${EGREP="/bin/grep -E"} + : ${FGREP="/bin/grep -F"} + : ${GREP="/bin/grep"} +@@ -149,7 +144,7 @@ progpath="$0" + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -169,6 +164,27 @@ IFS=" $lt_nl" + dirname="s,/[^/]*$,," + basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: +@@ -183,17 +199,31 @@ basename="s,^.*/,," + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + +-# Generated shell functions inserted here. + + # These SED scripts presuppose an absolute path with a trailing slash. + pathcar='s,^/\([^/]*\).*$,\1,' +@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ + # Re-`\' parameter expansions in output of double_quote_subst that were + # `\'-ed in input to the same. If an odd number of `\' preceded a '$' + # in input to double_quote_subst, that '$' was protected from expansion. +@@ -404,7 +443,7 @@ opt_warning=: + # name if it has been set yet. + func_echo () + { +- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + } + + # func_verbose arg... +@@ -430,14 +469,14 @@ func_echo_all () + # Echo program name prefixed message to standard error. + func_error () + { +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + } + + # func_warning arg... + # Echo program name prefixed warning message to standard error. + func_warning () + { +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +@@ -656,19 +695,35 @@ func_show_eval_locale () + fi + } + +- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} + + + # func_version + # Echo version message to standard output and exit. + func_version () + { ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ + N +- s/\n# // ++ s/\n# / / + b more + } + :go +@@ -685,7 +740,9 @@ func_version () + # Echo short help message to standard output and exit. + func_usage () + { +- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ +@@ -701,7 +758,10 @@ func_usage () + # unless 'noexit' is passed as argument. + func_help () + { ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* +@@ -714,7 +774,11 @@ func_help () + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p +- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret +@@ -726,12 +790,39 @@ func_help () + # exit_cmd. + func_missing_arg () + { +- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1." + exit_cmd=exit + } + +-exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + +@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" + magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-# $mode is unset + nonopt= +-execute_dlfiles= + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + extracted_archives= + extracted_serial=0 + +-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +- + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ + # func_fatal_configuration arg... + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. +@@ -850,130 +979,204 @@ func_enable_tag () + esac + } + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () + { ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift +- + case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" +- opt_debug='set -x' + $opt_debug + ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; +- + --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=: + ;; +- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false +- opt_verbose=: ++func_append preserve_args " $opt" + ;; +- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) +@@ -981,82 +1184,44 @@ func_enable_tag () + opt_duplicate_compiler_generated_deps=: + ;; + *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + +- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + +- # Darwin sucks +- eval "std_shrext=\"$shrext_cmds\"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} + ++## ----------- ## ++## Main. ## ++## ----------- ## + + # func_lalib_p file + # True iff FILE is a libtool `.la' library or `.lo' object file. +@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () + # temporary ltwrapper_script. + func_ltwrapper_scriptname () + { +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + } + + # func_ltwrapper_p file +@@ -1149,7 +1311,7 @@ func_execute_cmds () + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1172,6 +1334,37 @@ func_source () + } + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ + # func_infer_tag arg + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. +@@ -1184,8 +1377,7 @@ func_infer_tag () + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1204,8 +1396,7 @@ func_infer_tag () + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1274,6 +1465,486 @@ EOF + } + } + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +@@ -1314,12 +1985,12 @@ func_mode_compile () + ;; + + -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" ++ func_append later " $arg" + continue + ;; + +@@ -1340,15 +2011,14 @@ func_mode_compile () + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + +@@ -1364,8 +2034,7 @@ func_mode_compile () + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in +@@ -1496,17 +2165,16 @@ compiler." + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + +- if test -n "$fix_srcfile_path"; then +- eval "srcfile=\"$fix_srcfile_path\"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + +@@ -1526,7 +2194,7 @@ compiler." + + if test -z "$output_obj"; then + # Place PIC objects in $objdir +- command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ +@@ -1573,11 +2241,11 @@ compiler." + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then +- command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. +- command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +@@ -1622,13 +2290,13 @@ compiler." + } + + $opt_help || { +- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + } + + func_mode_help () + { + # We need to display help for each of the modes. +- case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." + ;; + + *) +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + +@@ -1819,13 +2487,13 @@ if $opt_help; then + else + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done +@@ -1854,13 +2522,16 @@ func_mode_execute () + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" +@@ -1882,7 +2553,7 @@ func_mode_execute () + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +@@ -1907,10 +2578,10 @@ func_mode_execute () + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. +- if eval test -z \"\$$shlibpath_var\"; then +- eval $shlibpath_var=\$dir ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" + else +- eval $shlibpath_var=\$dir:\$$shlibpath_var ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + +@@ -1939,8 +2610,7 @@ func_mode_execute () + ;; + esac + # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then +@@ -1972,22 +2642,59 @@ func_mode_execute () + fi + } + +-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { + $opt_debug +- libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +@@ -1997,7 +2704,7 @@ func_mode_finish () + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done +@@ -2006,53 +2713,55 @@ func_mode_finish () + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag=\"$hardcode_libdir_flag_spec\"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + +- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS + } + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... +@@ -2077,7 +2786,7 @@ func_mode_install () + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +@@ -2097,7 +2806,7 @@ func_mode_install () + do + arg2= + if test -n "$dest"; then +- files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi +@@ -2135,11 +2844,11 @@ func_mode_install () + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi +- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +@@ -2151,7 +2860,7 @@ func_mode_install () + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" +- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +@@ -2209,10 +2918,13 @@ func_mode_install () + case $file in + *.$libext) + # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" +@@ -2226,23 +2938,30 @@ func_mode_install () + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" +- dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +@@ -2315,7 +3034,7 @@ func_mode_install () + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) +@@ -2503,7 +3222,7 @@ func_mode_install () + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + +- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +@@ -2512,7 +3231,7 @@ func_mode_install () + fi + } + +-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -2559,6 +3278,18 @@ extern \"C\" { + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + /* External symbol declarations for the compiler. */\ + " + +@@ -2570,21 +3301,22 @@ extern \"C\" { + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { +- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + +@@ -2593,23 +3325,23 @@ extern \"C\" { + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols +- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { +- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } +@@ -2620,10 +3352,52 @@ extern \"C\" { + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" +- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { +@@ -2661,26 +3435,9 @@ typedef struct { + const char *name; + void *address; + } lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = + {\ + { \"$my_originator\", (void *) 0 }," +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + +@@ -2796,9 +3553,11 @@ func_win32_libid () + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static +- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ +@@ -2827,6 +3586,131 @@ func_win32_libid () + $ECHO "$win32_libid_type" + } + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + + # func_extract_an_archive dir oldlib +@@ -2917,7 +3801,7 @@ func_extract_archives () + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ +@@ -2932,7 +3816,7 @@ func_extract_archives () + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +@@ -3014,7 +3898,110 @@ func_fallback_echo () + _LTECHO_EOF' + } + ECHO=\"$qECHO\" +- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=\$0 ++ shift ++ for lt_opt ++ do ++ case \"\$lt_opt\" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` ++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. ++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` ++ cat \"\$lt_dump_D/\$lt_dump_F\" ++ exit 0 ++ ;; ++ --lt-*) ++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n \"\$lt_option_debug\"; then ++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from \$@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case \$lt_wr_arg in ++ --lt-*) ;; ++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core \${1+\"\$@\"} ++} ++ ++ # Parse options ++ func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` +@@ -3078,7 +4065,7 @@ _LTECHO_EOF' + + # relink executable if necessary + if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" +@@ -3102,6 +4089,18 @@ _LTECHO_EOF' + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ +@@ -3116,35 +4115,10 @@ _LTECHO_EOF' + " + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 ++ func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. +@@ -3158,166 +4132,6 @@ fi\ + } + + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +- + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout + # Must ONLY be called from within func_mode_link because +@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. + */ + EOF + cat <<"EOF" +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1; + #else +-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0; + #endif + +-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + + void *xmalloc (size_t num); + char *xstrdup (const char *string); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); + int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s); + void lt_setenv (const char *name, const char *value); + char *lt_extend_str (const char *orig_value, const char *add, int to_end); + void lt_update_exe_path (const char *name, const char *value); +@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); + EOF + + cat <"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero)); + for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i])); + } + + EOF +@@ -3706,7 +4529,9 @@ EOF + if (rval == -1) + { + /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target \"%s\": %s\n", ++ lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +@@ -3728,7 +4553,7 @@ xmalloc (size_t num) + { + void *p = (void *) malloc (num); + if (!p) +- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted"); + + return p; + } +@@ -3762,8 +4587,8 @@ check_executable (const char *path) + { + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3780,8 +4605,8 @@ make_executable (const char *path) + int rval = 0; + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) + int tmp_len; + char *concat_name; + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; +@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); +@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) +@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) + } + else + { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file \"%s\": %s", ++ tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); +@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { +- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); + #endif +@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) + return str; + } + ++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++ + static void +-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode, + const char *message, va_list ap) + { +- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, + } + + void +-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...) + { + va_list ap; + va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); + } + ++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++ + void + lt_setenv (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value)); + { + #ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) + void + lt_update_exe_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) + void + lt_update_lib_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4222,7 +5078,7 @@ EOF + func_win32_import_lib_p () + { + $opt_debug +- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +@@ -4401,9 +5257,9 @@ func_mode_link () + ;; + *) + if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg" + else +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg" + fi + prev= + continue +@@ -4427,7 +5283,7 @@ func_mode_link () + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; +@@ -4446,7 +5302,7 @@ func_mode_link () + moreargs= + for fil in `cat "$save_arg"` + do +-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + +@@ -4475,7 +5331,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -4487,7 +5343,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -4557,12 +5413,12 @@ func_mode_link () + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;; + esac + fi + prev= +@@ -4574,28 +5430,28 @@ func_mode_link () + continue + ;; + weak) +- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) +- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" +@@ -4686,15 +5542,16 @@ func_mode_link () + ;; + + -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -4706,10 +5563,16 @@ func_mode_link () + ;; + esac + case "$deplibs " in +- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;; + *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir" + ;; + esac + case $host in +@@ -4718,12 +5581,12 @@ func_mode_link () + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -4747,7 +5610,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) +@@ -4758,9 +5621,6 @@ func_mode_link () + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; +- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -4770,7 +5630,7 @@ func_mode_link () + ;; + esac + fi +- deplibs="$deplibs $arg" ++ func_append deplibs " $arg" + continue + ;; + +@@ -4782,8 +5642,8 @@ func_mode_link () + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler +@@ -4791,12 +5651,12 @@ func_mode_link () + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; +@@ -4863,13 +5723,17 @@ func_mode_link () + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + continue + ;; +@@ -4922,8 +5786,8 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4938,9 +5802,9 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4968,24 +5832,27 @@ func_mode_link () + arg="$func_quote_for_eval_result" + ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + continue + ;; + +@@ -4997,7 +5864,7 @@ func_mode_link () + + *.$objext) + # A standard object. +- objs="$objs $arg" ++ func_append objs " $arg" + ;; + + *.lo) +@@ -5028,7 +5895,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -5040,7 +5907,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -5085,24 +5952,25 @@ func_mode_link () + + *.$libext) + # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + ++ func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else +- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; +@@ -5127,7 +5995,7 @@ func_mode_link () + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval "arg=\"$export_dynamic_flag_spec\"" ++ eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi +@@ -5144,11 +6012,13 @@ func_mode_link () + else + shlib_search_path= + fi +- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" +- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" ++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + +@@ -5169,12 +6039,12 @@ func_mode_link () + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- libs="$libs $deplib" ++ func_append libs " $deplib" + done + + if test "$linkmode" = lib; then +@@ -5187,9 +6057,9 @@ func_mode_link () + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac +- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= +@@ -5256,8 +6126,9 @@ func_mode_link () + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= ++ func_resolve_sysroot "$lib" + case $lib in +- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library +@@ -5267,7 +6138,7 @@ func_mode_link () + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;; + esac + done + done +@@ -5288,11 +6159,11 @@ func_mode_link () + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5377,7 +6248,7 @@ func_mode_link () + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5390,7 +6261,8 @@ func_mode_link () + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then +@@ -5404,7 +6276,8 @@ func_mode_link () + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" +@@ -5415,17 +6288,21 @@ func_mode_link () + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; +- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" +@@ -5488,11 +6365,11 @@ func_mode_link () + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib" + fi + fi + continue +@@ -5538,7 +6415,7 @@ func_mode_link () + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi +@@ -5546,8 +6423,8 @@ func_mode_link () + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then +@@ -5558,20 +6435,20 @@ func_mode_link () + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv +@@ -5579,9 +6456,15 @@ func_mode_link () + + # Get the name of the library we link against. + linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi +@@ -5598,9 +6481,9 @@ func_mode_link () + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs" + else +- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen +@@ -5622,14 +6505,14 @@ func_mode_link () + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -5637,12 +6520,12 @@ func_mode_link () + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" +@@ -5653,20 +6536,46 @@ func_mode_link () + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then +@@ -5684,7 +6593,7 @@ func_mode_link () + + + if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no +@@ -5697,7 +6606,8 @@ func_mode_link () + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? +@@ -5708,12 +6618,12 @@ func_mode_link () + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... +@@ -5728,7 +6638,7 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;; + esac + fi + +@@ -5740,7 +6650,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5749,7 +6659,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5774,12 +6684,12 @@ func_mode_link () + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; +@@ -5814,7 +6724,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5823,7 +6733,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5835,7 +6745,7 @@ func_mode_link () + shift + realname="$1" + shift +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" +@@ -5848,7 +6758,7 @@ func_mode_link () + versuffix="-$major" + ;; + esac +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -5877,7 +6787,7 @@ func_mode_link () + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= +@@ -5933,7 +6843,7 @@ func_mode_link () + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -5955,7 +6865,7 @@ func_mode_link () + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then +@@ -5969,13 +6879,13 @@ func_mode_link () + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + +- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= +@@ -5989,7 +6899,7 @@ func_mode_link () + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +@@ -6001,12 +6911,12 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -6083,27 +6993,33 @@ func_mode_link () + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";; + esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + +- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then +@@ -6113,8 +7029,10 @@ func_mode_link () + case $deplib in + -L*) path="$deplib" ;; + *.la) ++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +@@ -6130,7 +7048,7 @@ func_mode_link () + case $host in + *-*-darwin*) + depdepl= +- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp +@@ -6141,8 +7059,8 @@ func_mode_link () + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi +@@ -6152,7 +7070,7 @@ func_mode_link () + ;; + esac + else +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +@@ -6192,7 +7110,7 @@ func_mode_link () + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= +@@ -6205,7 +7123,7 @@ func_mode_link () + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +- eval tmp_libs=\$$var ++ eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so +@@ -6250,13 +7168,13 @@ func_mode_link () + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + done +- eval $var=\$tmp_libs ++ eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs +@@ -6269,7 +7187,7 @@ func_mode_link () + ;; + esac + if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs +@@ -6310,7 +7228,7 @@ func_mode_link () + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" +- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs" + ;; + + lib) +@@ -6319,8 +7237,8 @@ func_mode_link () + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ +@@ -6330,8 +7248,8 @@ func_mode_link () + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result +@@ -6346,7 +7264,7 @@ func_mode_link () + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" ++ func_append libobjs " $objs" + fi + fi + +@@ -6544,7 +7462,7 @@ func_mode_link () + done + + # Make executables depend on our current version. +- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0" + ;; + + qnx) +@@ -6612,10 +7530,10 @@ func_mode_link () + fi + + func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + +- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -6631,7 +7549,7 @@ func_mode_link () + continue + fi + fi +- removelist="$removelist $p" ++ func_append removelist " $p" + ;; + *) ;; + esac +@@ -6642,7 +7560,7 @@ func_mode_link () + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` +@@ -6659,10 +7577,11 @@ func_mode_link () + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +@@ -6676,7 +7595,7 @@ func_mode_link () + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;; + esac + done + +@@ -6686,7 +7605,7 @@ func_mode_link () + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;; + esac + done + +@@ -6698,7 +7617,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. +@@ -6715,7 +7634,7 @@ func_mode_link () + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" ++ func_append deplibs " -lc" + fi + ;; + esac +@@ -6764,18 +7683,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6789,7 +7708,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6807,18 +7726,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6840,7 +7759,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6857,15 +7776,27 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | +@@ -6885,10 +7816,10 @@ EOF + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6913,7 +7844,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -6929,20 +7860,20 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6967,7 +7898,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -7071,7 +8002,7 @@ EOF + *) + case " $deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7081,10 +8012,10 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" +@@ -7101,10 +8032,12 @@ EOF + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -7113,18 +8046,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- dep_rpath="$dep_rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done +@@ -7133,40 +8066,38 @@ EOF + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else +- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done +- eval $runpath_var=\$rpath\$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then +- eval $shlibpath_var=\$shlibpath\$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. +- eval "shared_ext=\"$shrext_cmds\"" +- eval "library_names=\"$library_names_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -7178,7 +8109,7 @@ EOF + linknames= + for link + do +- linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic +@@ -7189,7 +8120,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= +@@ -7220,13 +8151,45 @@ EOF + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. +@@ -7248,7 +8211,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +@@ -7260,7 +8223,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7270,7 +8233,7 @@ EOF + case " $convenience " in + *" $test_deplib "*) ;; + *) +- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done +@@ -7286,43 +8249,43 @@ EOF + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval "flag=\"$thread_safe_flag_spec\"" +- linker_flags="$linker_flags $flag" ++ eval flag=\"$thread_safe_flag_spec\" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval "test_cmds=\"$module_expsym_cmds\"" ++ eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else +- eval "test_cmds=\"$module_cmds\"" ++ eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval "test_cmds=\"$archive_expsym_cmds\"" ++ eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else +- eval "test_cmds=\"$archive_cmds\"" ++ eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi +@@ -7366,10 +8329,13 @@ EOF + echo 'INPUT (' > $output + for obj in $save_libobjs + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output +- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" +@@ -7383,15 +8349,17 @@ EOF + fi + for obj + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext +- eval "test_cmds=\"$reload_cmds\"" ++ eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -7411,12 +8379,12 @@ EOF + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist +- eval "concat_cmds=\"$reload_cmds\"" ++ eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 +@@ -7433,11 +8401,11 @@ EOF + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi +- delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= +@@ -7450,9 +8418,9 @@ EOF + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + +@@ -7471,7 +8439,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7492,7 +8460,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then +@@ -7504,7 +8472,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7515,7 +8483,7 @@ EOF + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the +@@ -7539,23 +8507,23 @@ EOF + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. +- eval "cmds=\"\$cmds~\$RM $delfiles\"" ++ eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" +@@ -7564,7 +8532,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7576,8 +8544,8 @@ EOF + IFS="$save_ifs" + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then +@@ -7656,17 +8624,20 @@ EOF + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +@@ -7690,7 +8661,7 @@ EOF + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + +@@ -7740,8 +8711,8 @@ EOF + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi +@@ -7761,7 +8732,7 @@ EOF + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7771,17 +8742,17 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -7789,7 +8760,7 @@ EOF + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi +@@ -7808,18 +8779,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in +@@ -7828,12 +8799,12 @@ EOF + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -7842,7 +8813,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + +@@ -7859,18 +8830,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done +@@ -7878,7 +8849,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + +@@ -7921,6 +8892,12 @@ EOF + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' +@@ -7943,7 +8920,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7951,7 +8928,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7966,6 +8943,13 @@ EOF + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -7999,6 +8983,12 @@ EOF + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + +@@ -8096,7 +9086,7 @@ EOF + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" +@@ -8104,10 +9094,10 @@ EOF + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. +@@ -8118,10 +9108,10 @@ EOF + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have +@@ -8139,7 +9129,7 @@ EOF + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= +@@ -8163,18 +9153,28 @@ EOF + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; +- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi +- eval "cmds=\"$old_archive_cmds\"" ++ eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." +@@ -8189,7 +9189,7 @@ EOF + do + last_oldobj=$obj + done +- eval "test_cmds=\"$old_archive_cmds\"" ++ eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -8208,7 +9208,7 @@ EOF + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi +@@ -8216,9 +9216,9 @@ EOF + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then +- eval "cmds=\"\$concat_cmds\"" ++ eval cmds=\"\$concat_cmds\" + else +- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi +@@ -8268,12 +9268,23 @@ EOF + *.la) + func_basename "$deplib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -8284,12 +9295,14 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; +- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" +@@ -8303,10 +9316,11 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +@@ -8318,7 +9332,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= +@@ -8327,7 +9341,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi +@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" + exit $EXIT_SUCCESS + } + +-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +@@ -8432,9 +9446,9 @@ func_mode_uninstall () + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + +@@ -8443,24 +9457,23 @@ func_mode_uninstall () + + rmdirs= + +- origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then +- objdir="$origobjdir" ++ odir="$objdir" + else +- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" +- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + +- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in +- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + +@@ -8486,18 +9499,17 @@ func_mode_uninstall () + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done +- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$mode" in ++ case "$opt_mode" in + clean) +- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; +- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then +@@ -8525,19 +9537,19 @@ func_mode_uninstall () + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then +- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then +- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) +@@ -8547,7 +9559,7 @@ func_mode_uninstall () + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe +- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. +@@ -8556,7 +9568,7 @@ func_mode_uninstall () + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename +@@ -8564,12 +9576,12 @@ func_mode_uninstall () + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then +- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then +- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi +@@ -8577,7 +9589,6 @@ func_mode_uninstall () + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done +- objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do +@@ -8589,16 +9600,16 @@ func_mode_uninstall () + exit $exit_status + } + +-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +-test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 87% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a19505..b0e94ab 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From e36a4e05f900bbe6a8d744a93f3a407bc55c96f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc37..11a8110 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index 811134a503..f8c17c19ae 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -15788,6 +15791,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 96% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278..f4f1a06 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From 70f3f2d9e912ea777fa113e02cdbc3465a66e40d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50db..c49b8e8 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From 2182791a453f34bee6968b3e72848608cf7d7abe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,24 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 81% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752..c32867a 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From a0237ec2d1e58bd35c236df39dd5a06504c6d2ed Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle binutils/readelf.c | 1 + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ + gas/configure.ac | 3 +++ include/elf/mips.h | 1 + include/opcode/mips.h | 6 ++++++ ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 14 files changed, 62 insertions(+), 21 deletions(-) + 15 files changed, 65 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..59d6d11215 100755 --- a/gas/configure +++ b/gas/configure -@@ -13377,6 +13377,9 @@ _ACEOF +@@ -12722,6 +12722,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) -+ mips_cpu=xlp -+ ;; ++ mips_cpu=xlp ++ ;; mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/gas/configure.ac b/gas/configure.ac +index 6f32e55a1a..11c2e0d273 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -325,6 +325,9 @@ changequote([,])dnl + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 + ;; ++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;; + mipstx39 | mipstx39el) + mips_cpu=r3900 + ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763..463de80 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From ef4ad1cb9ff1b5a871ffa792a71b3ad6d14eb3dc Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b050..6acde1f 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 2f7f2389764ef1d699f6ad32057314024b7e84e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61..0000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 97% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d..a794719 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From 392d474a72d37b669f53ab9f0fa913b958af93f6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 91% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf7..bfc9346 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -49,9 +49,9 @@ do_install_class-native () { # Split out libbfd-*.so so including perf doesn't include extra stuff PACKAGE_BEFORE_PN += "libbfd" -FILES_libbfd = "${libdir}/libbfd-*.so" +FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 01:21:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 01:21:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (774d8d2 -> ef377ab) Message-ID: <158233447022.32318.10356120999267456935@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 774d8d2 oprofile: Fix build with bfd 2.34+ new 2b36db7 mbedtls: upgrade 2.16.3 -> 2.16.5 new ef377ab oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (774d8d2) \ N -- N -- N refs/heads/master-next (ef377ab) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../mbedtls/{mbedtls_2.16.3.bb => mbedtls_2.16.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-networking/recipes-connectivity/mbedtls/{mbedtls_2.16.3.bb => mbedtls_2.16.5.bb} (92%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 01:21:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 01:21:11 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: mbedtls: upgrade 2.16.3 -> 2.16.5 In-Reply-To: <158233447022.32318.10356120999267456935@git.openembedded.org> References: <158233447022.32318.10356120999267456935@git.openembedded.org> Message-ID: <20200222012110.912CC2328CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2b36db7f5fae1351a9b344f6e6aafb802c274baa Author: Pierre-Jean Texier AuthorDate: Fri Feb 21 22:01:31 2020 +0000 mbedtls: upgrade 2.16.3 -> 2.16.5 Mbed TLS 2.16.5 is a maintenance release of the Mbed TLS 2.16 branch, and provides security fixes and bug fixes, see: https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.5-and-2.7.14-released Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../mbedtls/{mbedtls_2.16.3.bb => mbedtls_2.16.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.5.bb similarity index 92% rename from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb rename to meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.5.bb index 99c1867..8dcfe91 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.3.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.5.bb @@ -23,8 +23,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=302d50a6369f5f22efdb674db908167a" SECTION = "libs" SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-apache.tgz" -SRC_URI[md5sum] = "90ce7c7a001d2514410280706b3ab1a7" -SRC_URI[sha256sum] = "ec1bee6d82090ed6ea2690784ea4b294ab576a65d428da9fe8750f932d2da661" +SRC_URI[md5sum] = "339f0505323b29851ef3128a53d2de20" +SRC_URI[sha256sum] = "65b4c6cec83e048fd1c675e9a29a394ea30ad0371d37b5742453f74084e7b04d" inherit cmake -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 01:21:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 01:21:12 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158233447022.32318.10356120999267456935@git.openembedded.org> References: <158233447022.32318.10356120999267456935@git.openembedded.org> Message-ID: <20200222012110.9ED002328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ef377ab16a8ae43fae91e0db1080e5f1eb556f91 Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 02:49:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 02:49:28 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: dnfdragora: Inherit mime-xdg In-Reply-To: <158233976784.11232.12554465906784741045@git.openembedded.org> References: <158233976784.11232.12554465906784741045@git.openembedded.org> Message-ID: <20200222024927.F3B6C2328D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6b6a18d75c71dc8b26e1de8b3f7d81a8c6e7a526 Author: Khem Raj AuthorDate: Fri Feb 21 18:47:59 2020 -0800 dnfdragora: Inherit mime-xdg FIxes QA warning WARNING: dnfdragora-1.0.1+gitAUTOINC+4fef4ce889-r0 do_package_qa: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb index 3f2dc30..7a51a4a 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -15,7 +15,7 @@ SRCREV = "4fef4ce889b8e4fa03191d414f63bfd50796152a" S = "${WORKDIR}/git" -inherit cmake gettext pkgconfig python3-dir python3native distutils3-base +inherit cmake gettext pkgconfig python3-dir python3native distutils3-base mime-xdg DEPENDS += "dnf python3 " #DEPENDS_class-nativesdk += "nativesdk-python3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 02:49:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 02:49:27 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (ef377ab -> 3c41223) Message-ID: <158233976784.11232.12554465906784741045@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard ef377ab oprofile: Fix build with bfd 2.34+ new 6b6a18d dnfdragora: Inherit mime-xdg new 3c41223 oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ef377ab) \ N -- N -- N refs/heads/master-next (3c41223) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 02:49:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 02:49:29 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158233976784.11232.12554465906784741045@git.openembedded.org> References: <158233976784.11232.12554465906784741045@git.openembedded.org> Message-ID: <20200222024928.083C82328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3c41223ed45518389721c956e0795e7d8662c8ad Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 10:31:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 10:31:38 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: binutils fixup Message-ID: <158236749804.1349.3031825892247120288@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 6fc7897 binutils fixup 6fc7897 is described below commit 6fc789750b2a3d72ce6340d7585fd7bcf7111a48 Author: Richard Purdie AuthorDate: Sat Feb 22 10:30:27 2020 +0000 binutils fixup Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 5b4a339..6ed40a1 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -75,9 +75,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --enable-deterministic-archives \ --enable-plugins \ ${LDGOLD} \ + ${EXTRA_TARGETS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" -EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS = "" +EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS_class-native = "" LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:03:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:03:33 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6fc7897 -> 695c752) Message-ID: <158238021333.22206.11094452621295994910@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 6fc7897 binutils fixup new dada717 binutils: Fix x86_64 override usage new 695c752 psplash: Add missing dependency to systemd service This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6fc7897) \ N -- N -- N refs/heads/master-next (695c752) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/psplash/files/psplash-systemd.service | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:03:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:03:34 +0000 Subject: [oe-commits] [openembedded-core] 01/02: binutils: Fix x86_64 override usage In-Reply-To: <158238021333.22206.11094452621295994910@git.openembedded.org> References: <158238021333.22206.11094452621295994910@git.openembedded.org> Message-ID: <20200222140333.754D72328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dada7170f22ff4fe79b2a8b1056ab1ce223b1653 Author: Richard Purdie AuthorDate: Sat Feb 22 10:30:27 2020 +0000 binutils: Fix x86_64 override usage This override was applying to binutils-native meaning it would behave differently depending upon the host it was building on. This is not a good idea and we have tests to detect it which failed: oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash binutils-native already enables all targets so we can avoid issues by not setting this option in the native case. Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 5b4a339..6ed40a1 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -75,9 +75,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --enable-deterministic-archives \ --enable-plugins \ ${LDGOLD} \ + ${EXTRA_TARGETS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" -EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS = "" +EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS_class-native = "" LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:03:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:03:35 +0000 Subject: [oe-commits] [openembedded-core] 02/02: psplash: Add missing dependency to systemd service In-Reply-To: <158238021333.22206.11094452621295994910@git.openembedded.org> References: <158238021333.22206.11094452621295994910@git.openembedded.org> Message-ID: <20200222140333.7EA512328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 695c75207dd6b1988863cc9fe2120a6dc521a837 Author: Richard Purdie AuthorDate: Sat Feb 22 13:55:25 2020 +0000 psplash: Add missing dependency to systemd service Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f420..e6de450 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,7 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:08:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:08:37 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (695c752 -> 314baf6) Message-ID: <158238051716.23413.3918812099409677758@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 695c752 psplash: Add missing dependency to systemd service new a747f66 perf: Correct the substitution of python shebangs new 314baf6 webkitgtk: enable gobject-introspection for armv7a The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-kernel/perf/perf.bb | 7 ++----- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:08:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:08:38 +0000 Subject: [oe-commits] [openembedded-core] 01/02: perf: Correct the substitution of python shebangs In-Reply-To: <158238051716.23413.3918812099409677758@git.openembedded.org> References: <158238051716.23413.3918812099409677758@git.openembedded.org> Message-ID: <20200222140837.538F92328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a747f662a45063fd42e72ae45f9029a2e1283704 Author: He Zhe AuthorDate: Sat Feb 22 11:37:24 2020 +0800 perf: Correct the substitution of python shebangs To make the native python3 always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..10a5b88 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` `find ${S}/scripts/ -name 'bpf_helpers_doc.py'`; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:08:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:08:39 +0000 Subject: [oe-commits] [openembedded-core] 02/02: webkitgtk: enable gobject-introspection for armv7a In-Reply-To: <158238051716.23413.3918812099409677758@git.openembedded.org> References: <158238051716.23413.3918812099409677758@git.openembedded.org> Message-ID: <20200222140837.5D36D2328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 314baf6aafe7a529798a0544de1da75b21e6572d Author: Andreas M?ller AuthorDate: Sat Feb 22 12:26:27 2020 +0100 webkitgtk: enable gobject-introspection for armv7a Tested with cortex-a9 machine * before this patch -> no gir * after: gir was built without issues Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a1dba73..a48a976 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -124,9 +124,5 @@ 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" - # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:54:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:54:17 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3c41223 -> fb802f5) Message-ID: <158238325782.1126.3071243595864434528@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 3c41223 oprofile: Fix build with bfd 2.34+ new 17dab2c ipmiutil: gzip man pages with out timestamp new fb802f5 oprofile: Fix build with bfd 2.34+ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3c41223) \ N -- N -- N refs/heads/master-next (fb802f5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...ess-times-from-changing-resulting-gzip-md.patch | 25 ++++++++++++++++++++++ meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:54:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:54:18 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: ipmiutil: gzip man pages with out timestamp In-Reply-To: <158238325782.1126.3071243595864434528@git.openembedded.org> References: <158238325782.1126.3071243595864434528@git.openembedded.org> Message-ID: <20200222145418.2CF8F2328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 17dab2cdd413902041eb7cddf105c4fcf01cbd0d Author: Jeremy Puhlman AuthorDate: Fri Feb 21 21:29:35 2020 -0800 ipmiutil: gzip man pages with out timestamp A timestamp was getting encoded into the gzip header. This causes multilib conflicts when installed together, and would likely fail reproducablity tests. Signed-off-by: Khem Raj --- ...ess-times-from-changing-resulting-gzip-md.patch | 25 ++++++++++++++++++++++ meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb | 1 + 2 files changed, 26 insertions(+) diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch new file mode 100644 index 0000000..82d0e99 --- /dev/null +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch @@ -0,0 +1,25 @@ +From da668e5bf1a721797361ab866d09913ee8e157c4 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 04:37:04 +0000 +Subject: [PATCH] Prevent access times from changing resulting gzip md5sum + +Upstream-Status: Pending +https://sourceforge.net/p/ipmiutil/support-requests/40/attachment/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch +--- + doc/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index b792762..2c52ce6 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -59,5 +59,5 @@ install: + ${INSTALL_DATA_SH} iuser.8 ${manto} + ${INSTALL_DATA_SH} iseltime.8 ${manto} + ${INSTALL_DATA_SH} bmclanpet.mib ${datato} +- cd ${manto}; gzip -f *.8 ++ cd ${manto}; gzip -Tf *.8 + +-- +2.13.3 + diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb index 3e26340..d0f3688 100644 --- a/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb @@ -21,6 +21,7 @@ PARALLEL_MAKE = "" SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \ file://fix_systemd_path.patch \ + file://0001-Prevent-access-times-from-changing-resulting-gzip-md.patch \ " SRC_URI[md5sum] = "292d6df25cad678bb27e5c8cdc6748f9" SRC_URI[sha256sum] = "58ccdbd5755d7dd72478756715af09e9c73330dfad2b91dbf03d2ac504b301a3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 14:54:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 14:54:19 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158238325782.1126.3071243595864434528@git.openembedded.org> References: <158238325782.1126.3071243595864434528@git.openembedded.org> Message-ID: <20200222145418.38D4E2328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fb802f54fcaf82659810601de174478fe031a94c Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 15:03:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 15:03:29 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (314baf6 -> b9fcc16) Message-ID: <158238380928.3644.7219617641700114813@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 314baf6 webkitgtk: enable gobject-introspection for armv7a discard a747f66 perf: Correct the substitution of python shebangs discard 695c752 psplash: Add missing dependency to systemd service new 3b55a93 psplash: Fix systemd service dependencies new 3da604a perf: Correct the substitution of python shebangs new b9fcc16 webkitgtk: enable gobject-introspection for armv7a This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (314baf6) \ N -- N -- N refs/heads/master-next (b9fcc16) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/psplash/files/psplash-start.service | 2 +- meta/recipes-core/psplash/files/psplash-systemd.service | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 15:03:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 15:03:30 +0000 Subject: [oe-commits] [openembedded-core] 01/03: psplash: Fix systemd service dependencies In-Reply-To: <158238380928.3644.7219617641700114813@git.openembedded.org> References: <158238380928.3644.7219617641700114813@git.openembedded.org> Message-ID: <20200222150329.6B5BE2328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b55a930d61d78178471dd08c357e0e197d04c3d Author: Richard Purdie AuthorDate: Sat Feb 22 13:55:25 2020 +0000 psplash: Fix systemd service dependencies Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Also, psplash-systemd requires psplash-start, not the other way around as the splash creates the fifo which the other then needs to open. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 2 +- meta/recipes-core/psplash/files/psplash-systemd.service | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index 9de8f63..af9d5d6 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -1,7 +1,7 @@ [Unit] Description=Start psplash boot splash screen DefaultDependencies=no -Requires=psplash-systemd.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f420..249aa54 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,8 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 15:03:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 15:03:31 +0000 Subject: [oe-commits] [openembedded-core] 02/03: perf: Correct the substitution of python shebangs In-Reply-To: <158238380928.3644.7219617641700114813@git.openembedded.org> References: <158238380928.3644.7219617641700114813@git.openembedded.org> Message-ID: <20200222150329.77DDA2328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3da604a0256d8f36916d1a12938be374fd272a8b Author: He Zhe AuthorDate: Sat Feb 22 11:37:24 2020 +0800 perf: Correct the substitution of python shebangs To make the native python3 always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..10a5b88 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` `find ${S}/scripts/ -name 'bpf_helpers_doc.py'`; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 15:03:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 15:03:32 +0000 Subject: [oe-commits] [openembedded-core] 03/03: webkitgtk: enable gobject-introspection for armv7a In-Reply-To: <158238380928.3644.7219617641700114813@git.openembedded.org> References: <158238380928.3644.7219617641700114813@git.openembedded.org> Message-ID: <20200222150329.854302328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b9fcc164bfa4c38e7dbcdf81539dc60db7d8a4a6 Author: Andreas M?ller AuthorDate: Sat Feb 22 12:26:27 2020 +0100 webkitgtk: enable gobject-introspection for armv7a Tested with cortex-a9 machine * before this patch -> no gir * after: gir was built without issues Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a1dba73..a48a976 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -124,9 +124,5 @@ 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" - # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 18:11:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 18:11:35 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b9fcc16 -> df0a770) Message-ID: <158239509589.20182.3949456091708513345@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from b9fcc16 webkitgtk: enable gobject-introspection for armv7a new 81b1399 wayland: add a patch to address build errors due to incorrect deps new df0a770 libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...-add-missing-dependencies-on-protocol-hea.patch | 115 +++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 4 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 4 +- 4 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 18:11:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 18:11:36 +0000 Subject: [oe-commits] [openembedded-core] 01/02: wayland: add a patch to address build errors due to incorrect deps In-Reply-To: <158239509589.20182.3949456091708513345@git.openembedded.org> References: <158239509589.20182.3949456091708513345@git.openembedded.org> Message-ID: <20200222181136.3AF192328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 81b1399a29744f2b15edfc4ece62b832d613d00c Author: Alexander Kanavin AuthorDate: Sat Feb 22 16:30:18 2020 +0100 wayland: add a patch to address build errors due to incorrect deps Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-add-missing-dependencies-on-protocol-hea.patch | 115 +++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + 2 files changed, 116 insertions(+) diff --git a/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch new file mode 100644 index 0000000..61de0e0 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch @@ -0,0 +1,115 @@ +From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Sat, 15 Feb 2020 02:03:45 +0000 +Subject: [PATCH] meson/tests: add missing dependencies on protocol headers + +In file included from ../tests/connection-test.c:43: +In file included from ../tests/test-compositor.h:30: +../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found + #include "wayland-client-protocol.h" + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from ../tests/display-test.c:45: +In file included from ../src/wayland-server.h:104: +src/wayland-server-protocol.h:4454:2: error: unterminated /* comment + /** + ^ +In file included from ../tests/cpp-compile-test.cpp:2: +In file included from src/wayland-server-protocol.h:8: +In file included from ../src/wayland-server.h:104: +src/wayland-server-protocol.h:3:2: error: unterminated conditional directive + #ifndef WAYLAND_SERVER_PROTOCOL_H + ^ +../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h! + #error including wayland-server-protocol.h did not include wayland-server.h! + ^ +In file included from ../tests/headers-protocol-test.c:26: +In file included from src/wayland-client-protocol.h:8: +In file included from ../src/wayland-client.h:40: +src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive + #ifndef WL_SHM_FORMAT_ENUM + ^ +In file included from ../tests/protocol-logger-test.c:34: +In file included from ../src/wayland-client.h:40: +src/wayland-client-protocol.h:2613:1: error: unterminated /* comment +/** +^ +../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface' + res = wl_resource_create(client, &wl_seat_interface, 4, 0); + ^ +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + tests/meson.build | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index c28a2a3..f1af7b4 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -69,7 +69,7 @@ test( + executable( + 'cpp-compile-test', + 'cpp-compile-test.cpp', +- wayland_server_protocol_core_h, ++ wayland_server_protocol_h, + include_directories: src_inc + ) + ) +@@ -91,17 +91,25 @@ tests = { + 'array-test': [], + 'client-test': [ wayland_server_protocol_h ], + 'display-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + tests_server_protocol_h, + tests_client_protocol_c, + tests_protocol_c, + ], +- 'connection-test': [ wayland_server_protocol_h ], ++ 'connection-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, ++ ], + 'event-loop-test': [ wayland_server_protocol_h ], + 'fixed-test': [], + 'interface-test': [ wayland_client_protocol_h ], + 'list-test': [], + 'map-test': [], +- 'sanity-test' : [ wayland_server_protocol_h ], ++ 'sanity-test' : [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, ++ ], + 'socket-test': [ + wayland_client_protocol_h, + wayland_server_protocol_h, +@@ -116,7 +124,7 @@ tests = { + files('../src/wayland-server.c'), + wayland_server_protocol_h, + ], +- 'resources-test': [ wayland_server_protocol_core_h ], ++ 'resources-test': [ wayland_server_protocol_h ], + 'message-test': [ + wayland_client_protocol_h, + wayland_server_protocol_h, +@@ -126,14 +134,16 @@ tests = { + wayland_server_protocol_h, + ], + 'protocol-logger-test': [ +- wayland_server_protocol_core_h, +- wayland_client_protocol_core_h, ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + ], + 'headers-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + 'headers-protocol-test.c', +- 'headers-protocol-core-test.c', +- wayland_server_protocol_core_h, + wayland_client_protocol_core_h, ++ wayland_server_protocol_core_h, ++ 'headers-protocol-core-test.c', + ], + 'os-wrappers-test': [], + } diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 6a6e749..5dc3116 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -16,6 +16,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ + file://0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 18:11:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 18:11:37 +0000 Subject: [oe-commits] [openembedded-core] 02/02: libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES In-Reply-To: <158239509589.20182.3949456091708513345@git.openembedded.org> References: <158239509589.20182.3949456091708513345@git.openembedded.org> Message-ID: <20200222181136.48EF72328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df0a77087b844ccafb542091a99344335522eb8f Author: Martin Jansa AuthorDate: Sat Feb 22 18:49:01 2020 +0100 libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES * requires virtual/egl which isn't available without opengl in DISTRO_FEATURES as shown in world builds without it: ERROR: Nothing PROVIDES 'virtual/egl' (but openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb, openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it) $ bitbake libwpe NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb DEPENDS on or otherwise requires it). Close matches: virtual/kernel virtual/make virtual/perf ERROR: Required build target 'libwpe' has no buildable providers. Missing or unbuildable dependency chain was: ['libwpe', 'virtual/egl'] $ bitbake wpebackend-fdo NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it). Close matches: virtual/kernel virtual/make virtual/perf ERROR: Required build target 'wpebackend-fdo' has no buildable providers. Missing or unbuildable dependency chain was: ['wpebackend-fdo', 'virtual/egl'] $ bitbake webkitgtk ERROR: Nothing PROVIDES 'webkitgtk' webkitgtk was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 4 +++- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb index 346ca9b..12499ff 100644 --- a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -9,7 +9,9 @@ DEPENDS = "virtual/egl libxkbcommon" # Workaround build issue with RPi userland EGL libraries. CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" -inherit cmake +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb index 7db5806..cd2f7fa 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -8,7 +8,9 @@ DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" DEPENDS_append_class-target = " wayland-native" -inherit cmake +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 18:11:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 18:11:49 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: lib/bb/utils.py: Preserve ownership of symlink Message-ID: <158239510944.20528.11795181362399673941@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new 799cf68 lib/bb/utils.py: Preserve ownership of symlink 799cf68 is described below commit 799cf6854b7c52407ee8639fabdb27262eb5f8ca Author: Daisuke Yamane AuthorDate: Sat Feb 22 06:17:14 2020 +0000 lib/bb/utils.py: Preserve ownership of symlink Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13806 Uncomment lchown() to preserve ownership of symlink. Signed-off-by: Daisuke Yamane Signed-off-by: Richard Purdie --- lib/bb/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 47805d0..5f5767c 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -864,7 +864,7 @@ def copyfile(src, dest, newmtime = None, sstat = None): if destexists and not stat.S_ISDIR(dstat[stat.ST_MODE]): os.unlink(dest) os.symlink(target, dest) - #os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) + os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) return os.lstat(dest) except Exception as e: logger.warning("copyfile: failed to create symlink %s to %s (%s)" % (dest, target, e)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:56 +0000 Subject: [oe-commits] [openembedded-core] 04/22: linux-yocto: fix PV In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.1BA862328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e597fe76a710cc6bb833ee50c235c5c565eb23fa Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:56 2020 -0500 linux-yocto: fix PV For whatever reason, the creation of the 5.4 recipes missed the PV that we've always had in linux-yocto. PV follows the LINUX_VERSION variable and clearly indicates that we have git commits in our tree above the -stable releases. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index fc31dc8..ab93f1b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index cfecf98..097357d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index aa17380..0b2a230 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -35,7 +35,7 @@ LINUX_VERSION ?= "5.4.20" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:53 +0000 Subject: [oe-commits] [openembedded-core] 01/22: linux-yocto/5.4: update to v5.4.18 In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235752.E81F12328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ca323f7ba9c20339bf348b073a00a0893f78a6f6 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:53 2020 -0500 linux-yocto/5.4: update to v5.4.18 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 58c72057f662 Linux 5.4.18 3353852afe1e tracing/uprobe: Fix to make trace_uprobe_filter alignment safe 5f9b8c5a4618 Revert "rsi: fix potential null dereference in rsi_probe()" 09d4a9c83c68 ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order 52cf138f5cc1 mm/migrate.c: also overwrite error when it is bigger than zero 20e1bbe5cfd7 perf report: Fix no libunwind compiled warning break s390 issue e16b302f691c dm thin: fix use-after-free in metadata_pre_commit_callback 35511d9471be flow_dissector: Fix to use new variables for port ranges in bpf hook f42407a7906b cpuidle: teo: Avoid using "early hits" incorrectly c5e3c887dfc0 btrfs: do not zero f_bavail if we have available space 420e4a521c0e net: Fix skb->csum update in inet_proto_csum_replace16(). e853e3f9f9d4 netfilter: nf_tables_offload: fix check the chain offload flag 17d56cef7f93 netfilter: conntrack: sctp: use distinct states for new SCTP connections b71636ee37fa l2t_seq_next should increase position index 148a71a8ece8 seq_tab_next() should increase position index 0c9a3ab865c3 net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G e2c797b72e01 net/fsl: treat fsl,erratum-a011043 1ce13ed0a5de powerpc/fsl/dts: add fsl,erratum-a011043 6ee3feac65ea qlcnic: Fix CPU soft lockup while collecting firmware dump d693255105b6 ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1 06b5e1087103 r8152: disable DelayPhyPwrChg 510818ae0f38 r8152: avoid the MCU to clear the lanwake 3a128650b47a r8152: disable test IO for RTL8153B bc2ef2e9d142 r8152: Disable PLA MCU clock speed down b05091c3ae99 r8152: disable U2P3 for RTL8153B 26a581fafceb r8152: get default setting of WOL before initializing 281f32e34382 tee: optee: Fix compilation issue with nommu 0703666b9658 led: max77650: add of_match table 313151afdf4c ARM: 8955/1: virt: Relax arch timer version check during early boot edb6590b1b2c scsi: fnic: do not queue commands during fwreset 3075e636b368 Input: max77650-onkey - add of_match table c3a49824165c xfrm: interface: do not confirm neighbor when do pmtu update b38dd235a4bd xfrm interface: fix packet tx through bpf_redirect() c8e04566db7f vti[6]: fix packet tx through bpf_redirect() 5743a3a8a4c7 ARM: dts: am335x-boneblack-common: fix memory size c15ea8e4150d Input: evdev - convert kzalloc()/vzalloc() to kvzalloc() 220ee13d017c iwlwifi: dbg: force stop the debug monitor HW 27cf25a0b87a iwlwifi: Don't ignore the cap field upon mcc update 4df1389ff7b5 iwlwifi: pcie: allocate smaller dev_cmd for TX headers 08022255a9ee XArray: Fix xas_pause at ULONG_MAX b267caf5e51f riscv: delete temporary files 8f2fa34a52c5 perf/x86/intel/uncore: Remove PCIe3 unit for SNR aae7d5784c53 perf/x86/intel/uncore: Add PCI ID of IMC for Xeon E3 V5 Family 86982620f28b wireless: wext: avoid gcc -O3 warning b308d93dd5b3 mac80211: Fix TKIP replay protection immediately after key setup e233cbaf8ecc cfg80211: Fix radar event during another phy CAC 01c2c23d3d5f wireless: fix enabling channel 12 for custom regulatory domain 9e62f296dbae lkdtm/bugs: fix build error in lkdtm_UNSET_SMEP 0b06c373db8a parisc: Use proper printk format for resource_size_t e1133c1796a1 qmi_wwan: Add support for Quectel RM500Q 422566f37e37 ASoC: sti: fix possible sleep-in-atomic 99ced2ecfe9e ASoC: hdac_hda: Fix error in driver removal after failed probe e43ab59fb1aa ASoC: SOF: Intel: fix HDA codec driver probe with multiple controllers 70149813320f platform/x86: intel_pmc_core: update Comet Lake platform driver 689233e8f998 platform/x86: GPD pocket fan: Allow somewhat lower/higher temperature limits 7790a471e80c iavf: remove current MAC address filter on VF reset 73613ce39d59 igb: Fix SGMII SFP module discovery for 100FX/LX. fd335ee1e9e2 ixgbe: Fix calculation of queue with VFs and flow director on interface flap 5113ff357d81 ixgbevf: Remove limit of 10 entries for unicast filter list be87d4f313e3 i40e: Fix virtchnl_queue_select bitmap validation 557fda798eab s390/zcrypt: move ap device reset from bus to driver code 1a18f3a7dbbf ASoC: rt5640: Fix NULL dereference on module unload aab165d61cb4 clk: mmp2: Fix the order of timer mux parents 8b4e524dc02b mac80211: mesh: restrict airtime metric to peered established plinks 096837d4b495 clk: sunxi-ng: h6-r: Fix AR100/R_APB2 parent order e619af70d133 clk: sunxi-ng: sun8i-r: Fix divider on APB0 clock 95c892061e90 rseq: Unregister rseq for clone CLONE_VM 91f91139d32f tools lib traceevent: Fix memory leakage in filter_event 22946b839768 soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot adba4a2a5273 ARM: dts: beagle-x15-common: Model 5V0 regulator 8a14c121d4e4 ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes b5cbe8ad1b60 ARM: dts: sun8i: a83t: Correct USB3503 GPIOs polarity e8b0d16e4c7f arm64: dts: meson-sm1-sei610: add gpio bluetooth interrupt f0a7b02147ad clk: sunxi-ng: v3s: Fix incorrect number of hw_clks. 3ea87219a9c7 cgroup: Prevent double killing of css when enabling threaded cgroup 07d00820bf98 Bluetooth: Fix race condition in hci_release_sock() f39406a925b0 ttyprintk: fix a potential deadlock in interrupt context issue 99652ee9c516 tomoyo: Use atomic_t for statistics counter 81b3fd0cb421 media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0 f416aac94c12 media: gspca: zero usb_buf d35ef79fbc97 media: vp7045: do not read uninitialized values if usb transfer fails 0c7cc4c9c2bb media: af9005: uninitialized variable printked 5b256eea1ae6 media: digitv: don't continue if remote control state can't be read 761a10b67a11 reiserfs: Fix memory leak of journal device string 9bcdb8ba5a3d mm/mempolicy.c: fix out of bounds write in mpol_parse_str() 7965bc367e70 arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' e77625d1f8ff tools lib: Fix builds when glibc contains strlcpy() da1321fc1405 PM / devfreq: Add new name attribute for sysfs e9fac0046579 perf c2c: Fix return type for histogram sorting comparision functions 73774def78ec gfs2: Another gfs2_find_jhead fix d635e7c4b34e e1000e: Revert "e1000e: Make watchdog use delayed work" 21c613793972 e1000e: Drop unnecessary __E1000_DOWN bit twiddling 5ca5637ec665 x86/resctrl: Fix use-after-free due to inaccurate refcount of rdtgroup 40300f986e47 x86/resctrl: Fix use-after-free when deleting resource groups 2dd2e4722922 x86/resctrl: Fix a deadlock due to inaccurate reference cd0826719560 cifs: fix soft mounts hanging in the reconnect code 2c38e6140126 vfs: fix do_last() regression 313c8460cf02 Linux 5.4.17 831919b4c481 power/supply: ingenic-battery: Don't change scale if there's only one dd350f3918be Revert "um: Enable CONFIG_CONSTRUCTORS" a775f67b4b61 KVM: arm64: Write arch.mdcr_el2 changes since last vcpu_load on VHE 00d58d0b58bc crypto: pcrypt - Fix user-after-free on module unload 9f6d555f58f3 crypto: caam - do not reset pointer size from MCFGR register 3b52ada5b82c crypto: vmx - reject xts inputs that are too short 9d9b578ffef3 crypto: af_alg - Use bh_lock_sock in sk_destruct ac39443b7b49 rsi: fix non-atomic allocation in completion handler 1f04209d19c5 rsi: fix memory leak on failed URB submission 2d367468ecdf rsi: fix use-after-free on probe errors d8902b43745f rsi: fix use-after-free on failed probe and unbind 99d9138295cb bus: ti-sysc: Fix missing force mstandby quirk handling 58b09300ee1b Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk d1e5f8c5156e Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks d273ee188a4a ALSA: hda/realtek - Move some alc236 pintbls to fallback table 050072c0f798 usb-storage: Disable UAS on JMicron SATA enclosure a2e6217bd8ea bus: ti-sysc: Add module enable quirk for audio AESS 0c101a22fec5 mmc: sdhci-pci: Add support for Intel JSL ac342e0a1f18 mmc: sdhci-pci: Quirk for AMD SDHC Device 0x7906 142356a63872 ARM: OMAP2+: SmartReflex: add omap_sr_pdata definition f3020d789311 ARM: config: aspeed-g5: Enable 8250_DW quirks 4f8f8f31c505 mfd: intel-lpss: Add Intel Comet Lake PCH-H PCI IDs 81909bd070db perf/imx_ddr: Add enhanced AXI ID filter support b02b0a6bcc81 iommu/amd: Support multiple PCI DMA aliases in IRQ Remapping 1f03a258f20f iommu/amd: Support multiple PCI DMA aliases in device table d7937ea02315 spi: pxa2xx: Add support for Intel Comet Lake-H c90ed6e66288 bus: ti-sysc: Use swsup quirks also for am335x musb 48b038c9d54a bus: ti-sysc: Handle mstandby quirk and use it for musb 6d34eacd8348 media: dvbsky: add support for eyeTV Geniatech T2 lite fef41f3a82ea PCI: Add DMA alias quirk for Intel VCA NTB f8aaefd5510a platform/x86: dell-laptop: disable kbd backlight on Inspiron 10xx 21fd877300b0 staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute' c9ddede0a9fc libbpf: Fix BTF-defined map's __type macro handling of arrays d40471b727e8 drm/amdgpu/SRIOV: add navi12 pci id for SRIOV (v2) 791e3ec642ce ASoC: Intel: cht_bsw_rt5645: Add quirk for boards using pmc_plt_clk_0 48617aa63951 extcon-intel-cht-wc: Don't reset USB data connection at probe de850e86d2e1 HID: steam: Fix input device disappearing b60d320dc363 atm: eni: fix uninitialized variable warning f4691c14d449 stmmac: debugfs entry name is not be changed when udev rename device name. 9d54646059b2 drm/amd/display: Reduce HDMI pixel encoding if max clock is exceeded a347d66cbec7 iommu/dma: fix variable 'cookie' set but not used 4fe14f9db5c9 gpio: max77620: Add missing dependency on GPIOLIB_IRQCHIP dfe190e77862 net: wan: sdla: Fix cast from pointer to integer of different size eea2b2bb502f drivers/net/b44: Change to non-atomic bit operations on pwol_mask c2ae3ce351be net: Google gve: Remove dma_wmb() before ringing doorbell 7db4e6c728cb spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent calls db10c64764eb can: tcan4x5x: tcan4x5x_parse_config(): reset device before register access 68d199fc8e66 usb: musb: jz4740: Silence error if code is -EPROBE_DEFER 3ecda03a5c13 watchdog: orion: fix platform_get_irq() complaints b39f38f0ebed watchdog: rn5t618_wdt: fix module aliases 27757bfb8c72 watchdog: max77620_wdt: fix potential build errors 5399714dc2a1 HID: intel-ish-hid: ipc: Add Tiger Lake PCI device ID e5900bc22253 phy: cpcap-usb: Prevent USB line glitches from waking up modem 98aedb893555 ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime() 68b74847c8bc ASoC: fsl_audmix: add missed pm_runtime_disable a0636e211f8e phy: qcom-qmp: Increase PHY ready timeout b826ffe45a27 drivers/hid/hid-multitouch.c: fix a possible null pointer access. 32a369776bd5 ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free eedf205f0267 ASoC: SOF: fix fault at driver unload after failed probe 8cc2de41a529 HID: wacom: Recognize new MobileStudio Pro PID b55f9e9760c8 HID: intel-ish-hid: ipc: add CMP device id 22aa1db061d2 HID: Add quirk for incorrect input length on Lenovo Y720 854f39866e2f HID: asus: Ignore Asus vendor-page usage-code 0xff events 49de93b4018b HID: ite: Add USB id match for Acer SW5-012 keyboard dock 05c33c23d0b6 HID: Add quirk for Xin-Mo Dual Controller ae9484c6fb60 arc: eznps: fix allmodconfig kconfig warning f5adacf21c6e HID: multitouch: Add LG MELF0410 I2C touchscreen support b576b27f7ba4 rxrpc: Fix use-after-free in rxrpc_receive_data() d3da5e90665a net: include struct nhmsg size in nh nlmsg size 73226c74746d mlxsw: minimal: Fix an error handling path in 'mlxsw_m_port_create()' 3c8c966cc718 udp: segment looped gso packets correctly 87c681943725 net: socionext: fix xdp_result initialization in netsec_process_rx b7eda225ebc1 net: socionext: fix possible user-after-free in netsec_process_rx 717abad86460 net_sched: walk through all child classes in tc_bind_tclass() 55ec468d3093 net_sched: fix ops->bind_class() implementations 2d0b854393af net_sched: ematch: reject invalid TCF_EM_SIMPLE 79c13c063720 zd1211rw: fix storage endpoint lookup 226ed25115b7 rtl8xxxu: fix interface sanity check 670a39aeb07b brcmfmac: fix interface sanity check b896fe1da14f ath9k: fix storage endpoint lookup e08884197082 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() b396ec7241ed cifs: set correct max-buffer-size for smb2_ioctl_init() d65b067c2546 CIFS: Fix task struct use-after-free on reconnect 4f753389bcdc crypto: chelsio - fix writing tfm flags to wrong place 9ba7636fdb42 driver core: Fix test_async_driver_probe if NUMA is disabled 3811bd2b93af iio: st_gyro: Correct data for LSM9DS0 gyro a6d19450c314 iio: adc: stm32-dfsdm: fix single conversion 29795e4f6a36 mei: me: add comet point (lake) H device ids 9272a0797833 mei: hdcp: bind only with i915 on the same PCH 7d46883724e0 binder: fix log spam for existing debugfs file creation. 3e832cf807e8 component: do not dereference opaque pointer in debugfs 6826af9a5c3f debugfs: Return -EPERM when locked down 3b16600e1fd4 serial: imx: fix a race condition in receive path f54b5d4a1abc serial: 8250_bcm2835aux: Fix line mismatch on driver unbind 0710da067387 staging: vt6656: Fix false Tx excessive retries reporting. a56c0f7d5f15 staging: vt6656: use NULLFUCTION stack on mac80211 1a80cc38db42 staging: vt6656: correct packet types for CTS protect, mode. 3a5bff77f48c staging: wlan-ng: ensure error return is actually returned b5e5d81230ec staging: most: net: fix buffer overflow 9ba5957e034d usb: typec: fusb302: fix "op-sink-microwatt" default that was in mW 9bfa308e95b1 usb: typec: wcove: fix "op-sink-microwatt" default that was in mW 445839bc7fa3 usb: dwc3: turn off VBUS when leaving host mode 1fe175772b99 USB: serial: ir-usb: fix IrLAP framing c9b7dcee64c1 USB: serial: ir-usb: fix link-speed handling 85eec8cf9d22 USB: serial: ir-usb: add missing endpoint sanity check 380a352cd3e9 usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186 f841bbcf8130 usb: dwc3: pci: add ID for the Intel Comet Lake -V variant 566264c8b6e3 rsi_91x_usb: fix interface sanity check c48a89147160 orinoco_usb: fix interface sanity check 619c458f8f39 Bluetooth: btusb: fix non-atomic allocation in completion handler 60b6aa2b71ef Linux 5.4.16 d8a11e0f4e26 net/x25: fix nonblocking connect ce75dd3abbc8 netfilter: nf_tables: autoload modules from the abort path 07ac418120ae netfilter: nf_tables: add __nft_chain_type_get() ea52197c9c4b netfilter: ipset: use bitmap infrastructure completely d5fd8ac3fcc5 media: v4l2-ioctl.c: zero reserved fields for S/TRY_FMT 40b1747b0368 libertas: Fix two buffer overflows at parsing bss descriptor 74389183b671 net/sonic: Prevent tx watchdog timeout 58c0c4b122b1 net/sonic: Fix CAM initialization 079e7e775895 net/sonic: Fix command register usage 4d391c40c295 net/sonic: Quiesce SONIC before re-initializing descriptor memory 9f638adb9f1a net/sonic: Fix receive buffer replenishment 3a0c502d4535 net/sonic: Improve receive descriptor status flag check 3a2137846347 net/sonic: Avoid needless receive descriptor EOL flag updates f6ecc13bea2b net/sonic: Fix receive buffer handling e7092fbffc34 net/sonic: Fix interface error stats collection c5a85f05e462 net/sonic: Use MMIO accessors c463d5a17032 net/sonic: Clear interrupt flags immediately 091c1715f9dd net/sonic: Add mutual exclusion for accessing shared state ab94448beeab readdir: be more conservative with directory entry names 454759886d0b do_last(): fetch directory ->i_mode and ->i_uid before it's too late 5d001c4f74e0 net, sk_msg: Don't check if sock is locked when tearing down psock b2e061912c3e xfrm: support output_mark for offload ESP packets 4e1572b19c64 drm/i915/userptr: fix size calculation 503b54ab9666 iwlwifi: mvm: fix potential SKB leak on TXQ TX 1e3c082df320 iwlwifi: mvm: fix SKB leak on invalid queue 68ee631ba110 tracing: xen: Ordered comparison of function pointers 3c6a183d3108 scsi: RDMA/isert: Fix a recently introduced regression related to logout bbf0d37947f7 hwmon: (nct7802) Fix non-working alarm on voltages 515b97c73447 hwmon: (nct7802) Fix voltage limits to wrong registers 54b818246b03 hsr: Fix a compilation error 5440678b5acb leds: gpio: Fix uninitialized gpio label for fwnode based probe 376b860334d2 readdir: make user_access_begin() use the real access range 16aab32ff8b3 iommu/amd: Fix IOMMU perf counter clobbering during init 9f6216862a20 lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user() 9e2e1a5abccd netfilter: nft_osf: add missing check for DREG attribute 373ffce2337b Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register 21aa01da9dba Input: pegasus_notetaker - fix endpoint sanity check c65dfef27803 Input: aiptek - fix endpoint sanity check 56ded4adf16e Input: gtco - fix endpoint sanity check 3e629da150b5 Input: sur40 - fix interface sanity checks 68c2bc4da098 Input: pm8xxx-vib - fix handling of separate enable register c3f6abfe2f11 net/tls: fix async operation c9cb4f2bea44 mlxsw: switchx2: Do not modify cloned SKBs during xmit 77d323cc3783 mmc: sdhci_am654: Reset Command and Data line after tuning d5bb81660456 mmc: sdhci_am654: Remove Inverted Write Protect flag d8bc6ac2db28 mmc: sdhci: fix minimum clock rate for v3 controller 723f200e19bd mmc: tegra: fix SDR50 tuning override bccb1568bae8 ARM: 8950/1: ftrace/recordmcount: filter relocation types ff847d466bdb Revert "Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers" cec754961758 Input: keyspan-remote - fix control-message timeouts 5d1973adcfff iommu/vt-d: Call __dmar_remove_one_dev_info with valid pointer d4616a9f8ee9 pinctrl: sunrisepoint: Add missing Interrupt Status register offset dd05cf12c72f XArray: Fix xas_find returning too many entries db38561288b7 XArray: Fix xa_find_after with multi-index entries a5135ca1f92a XArray: Fix infinite loop with entry at ULONG_MAX b8560e3d90af iwlwifi: mvm: don't send the IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues 4e7d8cd6a1a8 Revert "iwlwifi: mvm: fix scan config command size" 7cf7a7d02587 powerpc/xive: Discard ESB load value when interrupt is invalid 6145307fa693 powerpc/mm/hash: Fix sharing context ids between kernel & userspace bf470f051556 tracing: Fix histogram code when expression has same var as value 07af0d03e8b2 tracing: Do not set trace clock if tracefs lockdown is in effect 67551f958458 tracing/uprobe: Fix double perf_event linking on multiprobe uprobe 44eebad10496 tracing: trigger: Replace unneeded RCU-list traversals b1302cbe530b PM: hibernate: fix crashes with init_on_free=1 d63b777d8145 drm/i915: Align engine->uabi_class/instance with i915_drm.h 3e041c27b990 drm/panfrost: Add the panfrost_gem_mapping concept 8c40a8d7d384 PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken fdd0f3b0e98b ceph: hold extra reference to r_parent over life of request 19d0cd212742 hwmon: (core) Do not use device managed functions for memory allocations 0387ee1b95d1 hwmon: (adt7475) Make volt2reg return same reg as reg2volt input 2d00fec60c8d afs: Fix characters allowed into cell names b29d143a690a Revert "io_uring: only allow submit from owning task" 29ce06b6b6d4 ipv4: Detect rollover in specific fib table dump 9bd7ae7eab7c net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path 43eda24c6f75 net/mlx5e: kTLS, Remove redundant posts in TX resync flow 384faad2ad5a net/mlx5e: kTLS, Fix corner-case checks in TX resync flow 7ae31c620dcc net/mlx5: DR, use non preemptible call to get the current cpu number 8a3b1a86d4f3 net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep b20f5fb7d473 net/mlx5: DR, Enable counter on non-fwd-dest objects ffc574c95e5b net/mlx5: Update the list of the PCI supported devices 36940c4daad0 net/mlx5: Fix lowest FDB pool size d18d22ce8f62 net: Fix packet reordering caused by GRO and listified RX cooperation 8bc302520616 fou: Fix IPv6 netlink policy e7b6ef675c46 mlxsw: spectrum_acl: Fix use-after-free during reload ef3c0a1660a7 airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE 9975b19b8d82 airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE a802ddbf41a3 tun: add mutex_unlock() call and napi.skb clearing in tun_get_user() 69486bfa064e tcp: do not leave dangling pointers in tp->highest_sack 562a7c35049c tcp_bbr: improve arithmetic division in bbr_update_bw() 41c230ae2aa4 Revert "udp: do rmem bulk free even if the rx sk queue is empty" 63635790a891 net: usb: lan78xx: Add .ndo_features_check d6f7ed61fa6e net-sysfs: Fix reference count leak 9b60a32108e2 net_sched: use validated TCA_KIND attribute in tc_new_tfilter() b6a9a954b3fe net_sched: fix datalen for ematch 888934af187c net: rtnetlink: validate IFLA_MTU attribute in rtnl_create_link() 500869d71822 net, ip_tunnel: fix namespaces move ead0377f601e net, ip6_tunnel: fix namespaces move 7943bb0f0636 net: ip6_gre: fix moving ip6gre between namespaces c6e524f4fad3 net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM 32df8d0bf461 net: bcmgenet: Use netif_tx_napi_add() for TX NAPI e2bd33937c50 ipv6: sr: remove SKB_GSO_IPXIP6 on End.D* actions 6cbb9683d743 gtp: make sure only SOCK_DGRAM UDP sockets are accepted 80a4c81c6791 firestream: fix memory leaks 34545cad8e04 can, slip: Protect tty->disc_data in write_wakeup and close with RCU Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 52f0e3b..5901ba4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine ?= "d8831a265698a000bb7305e0234dcaa302cf25a5" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index a028b37..9a18c63 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" -SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine_qemuarm ?= "e144b0946f1a159a8b5770f1fcedaebf8eadac84" +SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" PV = "5.4.15" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 9fbc47d..eea4f20 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" -SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" -SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" -SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine_qemuarm ?= "ab36b8853718cf0c92d6c37a62568d34424234e8" +SRCREV_machine_qemuarm64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemumips ?= "f9d6dd093282ef21a11d170660bb06ec81908836" +SRCREV_machine_qemuppc ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemuriscv64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemux86 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemux86-64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemumips64 ?= "8b16e493669ee19054a6407d331da75a32ed45b2" +SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:52 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (1d8e5d1 -> 7214af1) Message-ID: <158241587233.26404.12900193839976617738@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 1d8e5d1 core-image-sato-sdk-ptest: do not pull in ptest-pkgs new ca323f7 linux-yocto/5.4: update to v5.4.18 new cdbe188 linux-yocto/5.4: update to v5.4.20 new d320a03 linux-yocto/5.2: update to v5.2.29 new e597fe7 linux-yocto: fix PV new 3009e82 devsrc: fix objtool generation for v5.4+ new 8dfaf1a linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix new 16e9436 linux-yocto: perf: Make perf able to build with latest libbfd new dd40767 linux-yocto/5.4: update to -rt11 new c250dbd qemu: bump default reference kernel to v5.4 new 732cac0 musl: Update to final 1.2.0 release new 28ad55f jquery: fix upstream version check new 1cd6e9a oeqa/logparser: correctly set test result markers new 319ca22 toolchain-shar-extract: ignore timestamp on decompress new f0c50a5 libxcrypt: Upgrade to 4.4.14 release new d052940 go: Upgrade to 1.13.8 minor release new 35c052d gmp: Upgrade to 6.2.0 new 82f7d5c binutils: Upgrade to 2.34 release new bbf9e8a binutils: Fix x86_64 override usage new 3f93173 perf: Correct the substitution of python shebangs new 0f4f69d webkitgtk: enable gobject-introspection for armv7a new fb1f1a1 wayland: add a patch to address build errors due to incorrect deps new 7214af1 libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES The 22 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarmv5.conf | 2 +- meta/files/toolchain-shar-extract.sh | 2 +- meta/lib/oeqa/utils/logparser.py | 2 +- ...compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} | 0 meta/recipes-core/musl/musl_git.bb | 4 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 29 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 75 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 41 + ...=> 0005-Point-scripts-location-to-libdir.patch} | 10 +- ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- meta/recipes-devtools/go/go-1.13.inc | 7 +- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 2 + ...-add-missing-dependencies-on-protocol-hea.patch | 115 + meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + meta/recipes-kernel/linux/kernel-devsrc.bb | 5 + meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 8 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 10 +- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 24 +- meta/recipes-kernel/perf/perf.bb | 7 +- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 4 +- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 - meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 4 +- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 - ...user-provided-flags-to-the-auto-detected-.patch | 0 ...re.ac-Believe-the-cflags-from-environment.patch | 16 +- .../gmp/{gmp-6.1.2 => gmp}/use-includedir.patch | 3 + .../gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} | 5 +- 56 files changed, 7592 insertions(+), 21680 deletions(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (91%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (97%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (91%) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch delete mode 100644 meta/recipes-support/gmp/gmp-6.1.2/amd64.patch rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch (100%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-confiure.ac-Believe-the-cflags-from-environment.patch (80%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/use-includedir.patch (83%) rename meta/recipes-support/gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} (86%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:54 +0000 Subject: [oe-commits] [openembedded-core] 02/22: linux-yocto/5.4: update to v5.4.20 In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.03CA92328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cdbe18840fcd8d3f863a6198b33fc27731a4a7f0 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:54 2020 -0500 linux-yocto/5.4: update to v5.4.20 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 27dfbcc2f53d Linux 5.4.20 2d8fdc5744ff selinux: fall back to ref-walk if audit is required ae7f404d9227 libertas: make lbs_ibss_join_existing() return error code on rates overflow 61087dce64a5 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 3c822e1f3118 mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv() c5b071e3f44d mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status() 2cf2b620af7b dmaengine: axi-dmac: add a check for devm_regmap_init_mmio eada328f7f9b clk: meson: g12a: fix missing uart2 in regmap table 3cfb0b360b37 mfd: max77650: Select REGMAP_IRQ in Kconfig 3b9586e82c90 regmap: fix writes to non incrementing registers 4eb12ef7491d pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B 7b07d15aa5b4 pinctrl: sh-pfc: r8a77965: Fix DU_DOTCLKIN3 drive/bias control 875e01dd8a97 selinux: fix regression introduced by move_mount(2) syscall 3b2e595dfe2b selinux: revert "stop passing MAY_NOT_BLOCK to the AVC upon follow_link" 837c36e0451f bcache: avoid unnecessary btree nodes flushing in btree_flush_write() 7c71d438e7e5 dt-bindings: iio: adc: ad7606: Fix wrong maxItems value d15a2930f6d7 media: i2c: adv748x: Fix unsafe macros 30dd20c6d0e3 drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe 8dfa11837606 crypto: caam/qi2 - fix typo in algorithm's driver name 1f42c6de7b94 crypto: atmel-sha - fix error handling when setting hmac key fb42d3f4ec86 crypto: artpec6 - return correct error code for failed setkey() ee1c6b1aa9dc crypto: testmgr - don't try to decrypt uninitialized buffers 771fd0b2e8bf mtd: sharpslpart: Fix unsigned comparison to zero 1765aaef1753 mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock 7df80a021f66 arm64: nofpsmid: Handle TIF_FOREIGN_FPSTATE flag cleanly 0ec337059d71 KVM: arm64: Treat emulated TVAL TimerValue as a signed 32-bit integer a17d21640453 KVM: arm64: pmu: Fix chained SW_INCR counters a6229d1b5c22 KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset 93a509cf1182 KVM: arm: Make inject_abt32() inject an external abort instead 9cce31930ad3 KVM: arm: Fix DFSR setting for non-LPAE aarch32 guests 48f9ec2020b3 KVM: arm/arm64: Fix young bit from mmu notifier 537493f1460a arm64: ptrace: nofpsimd: Fail FP/SIMD regset operations 37014cee458c arm64: cpufeature: Set the FP/SIMD compat HWCAP bits properly 1a2b07a2c3dd arm64: cpufeature: Fix the type of no FP/SIMD capability ba95651cefe1 sched/uclamp: Fix a bug in propagating uclamp value in new cgroups 5d42957c9045 ARM: 8949/1: mm: mark free_memmap as __init 199808393ef7 KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections c406e5352155 ARM: at91: pm: use of_device_id array to find the proper shdwc node 69f08f44b4c1 ARM: at91: pm: use SAM9X60 PMC's compatible 451b91d88a1d iommu/arm-smmu-v3: Populate VMID field for CMDQ_OP_TLBI_NH_VA c4faf627c76e powerpc/pseries: Allow not having ibm, hypertas-functions::hcall-multi-tce for DDW cff30edec932 powerpc/pseries/vio: Fix iommu_table use-after-free refcount warning 5ca556d5edfd powerpc/papr_scm: Fix leaking 'bus_desc.provider_name' in some paths 05a23f436471 powerpc/ptdump: Only enable PPC_CHECK_WX with STRICT_KERNEL_RWX 17f37249d7db powerpc/ptdump: Fix W+X verification call in mark_rodata_ro() 6d7edac1469e Revert "powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests" 45c764da005a soc: qcom: rpmhpd: Set 'active_only' for active only power domains 0bf48acf4338 tools/power/acpi: fix compilation error 5d3453a5660b ARM: dts: at91: sama5d3: define clock rate range for tcb1 581a5fbf4f6d ARM: dts: at91: sama5d3: fix maximum peripheral clock rates 8e8802c93509 ARM: dts: meson8b: use the actual frequency for the GPU's 364MHz OPP 16665fffafee ARM: dts: meson8: use the actual frequency for the GPU's 182.1MHz OPP 3d2d8cd29c1b arm64: dts: marvell: clearfog-gt-8k: fix switch cpu port node c44134c2a287 arm64: dts: renesas: r8a77990: ebisu: Remove clkout-lr-synchronous from sound 6f9da85057c1 ARM: dts: am43xx: add support for clkout1 clock bd13285419b9 ARM: dts: at91: Reenable UART TX pull-ups d01521db86ac arm64: dts: uDPU: fix broken ethernet 5ee40005f420 arm64: dts: qcom: msm8998: Fix tcsr syscon size bc684844e7e0 platform/x86: intel_mid_powerbtn: Take a copy of ddata b09e3d3e79cf ARC: [plat-axs10x]: Add missing multicast filter number to GMAC node 2de1af2bcba0 watchdog: qcom: Use platform_get_irq_optional() for bark irq f599ae7529e6 rtc: cmos: Stop using shared IRQ 7a3aa58c0e02 rtc: hym8563: Return -EINVAL if the time is known to be invalid ffad5982ce58 x86/boot: Handle malformed SRAT tables during early ACPI parsing f4818129947c NFSv4.0: nfs4_do_fsinfo() should not do implicit lease renewals cf360732f811 NFSv4: try lease recovery on NFS4ERR_EXPIRED 5d0a6d77b69c NFSv4: pnfs_roc() must use cred_fscmp() to compare creds 86065de0eb0a NFS: Fix fix of show_nfs_errors 5d7030939d22 NFS/pnfs: Fix pnfs_generic_prepare_to_resend_writes() 1ef47a06d2d4 NFS: Revalidate the file size on a fatal write error b7560b5b72a2 nfs: NFS_SWAP should depend on SWAP 7842c7b30d75 bpf, sockmap: Check update requirements after locking 45d7b0e316d9 bpf: Improve bucket_log calculation logic cb675fde4c44 selftests/bpf: Test freeing sockmap/sockhash with a socket in it 1098f9696152 bpf, sockhash: Synchronize_rcu before free'ing map 657a17ce530e bpf, sockmap: Don't sleep while holding RCU lock on tear-down 1dfc34bd009a bpftool: Don't crash on missing xlated program instructions ec81471a70d1 iwlwifi: mvm: avoid use after free for pmsr request b706a4986382 PCI/AER: Initialize aer_fifo b51ac6e721d5 PCI: Don't disable bridge BARs when assigning bus resources 67016624a0be PCI: tegra: Fix afi_pex2_ctrl reg offset for Tegra30 df26f04f23bd PCI/switchtec: Fix vep_vector_number ioread width b72b8d0725b0 PCI/switchtec: Use dma_set_mask_and_coherent() 15818c08ca79 ath10k: pci: Only dump ATH10K_MEM_REGION_TYPE_IOREG when safe 4f0e6425a2da PCI/IOV: Fix memory leak in pci_iov_add_virtfn() da268240fb0a scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails 21702236f352 RDMA/umem: Fix ib_umem_find_best_pgsz() 56b22525ab80 RDMA/cma: Fix unbalanced cm_id reference count during address resolve b73401025a14 RDMA/uverbs: Verify MR access flags 78923675151e RDMA/core: Fix locking in ib_uverbs_event_read 33daaea78a1f RDMA/i40iw: fix a potential NULL pointer dereference b1f90d263a3b RDMA/netlink: Do not always generate an ACK for some netlink operations 839fb9e04cd7 IB/mlx4: Fix leak in id_map_find_del 996dc3d50add IB/srp: Never use immediate data if it is disabled by a user 56f5f41e80b3 IB/mlx4: Fix memory leak in add_gid error flow b96c27b1891b hv_sock: Remove the accept port restriction f7775193b643 ASoC: pcm: update FE/BE trigger order based on the command d6591ea2dd1a Linux 5.4.19 866323ccc138 powerpc/kuap: Fix set direction in allow/prevent_user_access() 3556d66be3f1 regulator fix for "regulator: core: Add regulator_is_equal() helper" 0f51165c22e4 rxrpc: Fix service call disconnection 743823969080 perf/core: Fix mlock accounting in perf_mmap() d1318034e9e9 clocksource: Prevent double add_timer_on() for watchdog_timer d15b033e9603 x86/apic/msi: Plug non-maskable MSI affinity race b64d7f7af8f9 cifs: fail i/o on soft mounts if sessionsetup errors out 3e3e8551a5a2 KVM: Play nice with read-only memslots when querying host page size 7426ddf01f16 KVM: Use vcpu-specific gva->hva translation when querying host page size 09bd0033df05 KVM: nVMX: vmread should not set rflags to specify success in case of #PF 1d6cfa003c21 KVM: x86: fix overlap between SPTE_MMIO_MASK and generation 8a1cd01bee30 KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM fc46f8a115e5 KVM: x86: use CPUID to locate host page table reserved bits f805ec37828b KVM: x86/mmu: Apply max PA check for MMIO sptes to 32-bit KVM 59593aed7e9e drm/dp_mst: Remove VCPI while disabling topology mgr 498742625716 btrfs: free block groups after free'ing fs trees 26ca39ac5593 btrfs: use bool argument in free_root_pointers() d0d327fe37cc x86/timer: Don't skip PIT setup when APIC is disabled or in legacy mode 8fbabd15bdbc mfd: bd70528: Fix hour register mask 555b3025e8fa mfd: rn5t618: Mark ADC control register volatile 3cf5733a2db7 mfd: da9062: Fix watchdog compatible string 9af68afd832f ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug 207014751cd1 net/mlx5: Deprecate usage of generic TLS HW capability bit 70b68add8d65 net/mlx5: Fix deadlock in fs_core 0fea83e06f12 drop_monitor: Do not cancel uninitialized work item 2b2de489c823 qed: Fix timestamping issue for L2 unicast ptp packets. 036ecba2eb99 ipv6/addrconf: fix potential NULL deref in inet6_set_link_af() 7fd6c4da37d4 taprio: Fix dropping packets when using taprio + ETF offloading a5b959885c45 taprio: Use taprio_reset_tc() to reset Traffic Classes configuration ee6adcf2c318 taprio: Add missing policy validation for flags d544302521af taprio: Fix still allowing changing the flags during runtime 47578c894979 taprio: Fix enabling offload with wrong number of traffic classes 4c4153375b67 net: macb: Limit maximum GEM TX length in TSO 96ad794892e7 net: macb: Remove unnecessary alignment check for TSO 9211b26dcfee net/mlx5: IPsec, fix memory leak at mlx5_fpga_ipsec_delete_sa_ctx 0be678f179e0 net/mlx5: IPsec, Fix esp modify function attribute 74888191bb13 net: systemport: Avoid RBUF stuck in Wake-on-LAN mode 8526c3b6e753 net: stmmac: fix a possible endless loop ebf9cdfbcd38 net_sched: fix a resource leak in tcindex_set_parms() 6994d92ed59a net: mvneta: move rx_dropped and rx_errors in per-cpu stats 76e828ceafee net: dsa: microchip: enable module autoprobe 07d7fcb1dd29 net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port 84e4db766fc6 net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan() fddb5a50801a dpaa_eth: support all modes with rate adapting PHYs 3f90dce11916 devlink: report 0 after hitting end in region read 6978e2935c74 bonding/alb: properly access headers in bond_alb_xmit() 0a56a2e1624a ASoC: sgtl5000: Fix VDDA and VDDIO comparison 67d5b7a1f971 regulator: core: Add regulator_is_equal() helper c533cf50fdf6 ubifs: Fix memory leak from c->sup_node fa70d4f7f8e0 ubi: Fix an error pointer dereference in error handling code 6f362620793b ubi: fastmap: Fix inverted logic in seen selfcheck c6d07f6e50e4 virtio_balloon: Fix memory leaks on errors in virtballoon_probe() 3ac13462f55a virtio-balloon: Fix memory leak when unloading while hinting is in progress 7eece787ed82 nfsd: Return the correct number of bytes written to the file e94829641e69 nfsd: fix jiffies/time_t mixup in LRU list 9f3fa8bea96d nfsd: fix delay timer on 32-bit architectures 0d1dacfda0e5 IB/core: Fix ODP get user pages flow 320a24fae280 IB/mlx5: Fix outstanding_pi index for GSI qps b4d104ce6dfe net: tulip: Adjust indentation in {dmfe, uli526x}_init_module 9b14bd934ce3 net: smc911x: Adjust indentation in smc911x_phy_configure 761b51409246 ppp: Adjust indentation into ppp_async_input bd1bac782d92 NFC: pn544: Adjust indentation in pn544_hci_check_presence da535ca18ef5 drm: msm: mdp4: Adjust indentation in mdp4_dsi_encoder_enable bf45386cef7e powerpc/44x: Adjust indentation in ibm4xx_denali_fixup_memsize 0a7473b27eb9 ext2: Adjust indentation in ext2_fill_super 421b77ae26f4 phy: qualcomm: Adjust indentation in read_poll_timeout 55a268cf341f mtd: spi-nor: Split mt25qu512a (n25q512a) entry into two 3c9edf55817a scsi: ufs: Recheck bkops level if bkops is disabled 5f8c02d32223 scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free bdc7651e6164 scsi: csiostor: Adjust indentation in csio_device_reset 454db8d6163b scsi: qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type 05dceb5a62ce ASoC: meson: axg-fifo: fix fifo threshold setup 7c662f69fa05 percpu: Separate decrypted varaibles anytime encryption can be enabled 59c458d51099 broken ping to ipv6 linklocal addresses on debian buster 07fbef9a6e18 fix up iter on short count in fuse_direct_io() e0fc65ef8a60 virtio-pci: check name when counting MSI-X vectors f603b3714e4e virtio-balloon: initialize all vq callbacks fe84d084b2e9 drm/amd/dm/mst: Ignore payload update failures f4bda8b61e7c clk: tegra: Mark fuse clock as critical 806cabd3117f mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush 091c96151279 arm64: dts: qcom: qcs404-evb: Set vdd_apc regulator in high power mode ed53278ee834 mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section 03c03090c3aa ocfs2: fix oops when writing cloned file 6e41b5499960 KVM: s390: do not clobber registers during guest reset/store status b1f9f9b84374 KVM: x86: Revert "KVM: X86: Fix fpu state crash in kvm guest" 58e1e7514f06 KVM: x86: Ensure guest's FPU state is loaded when accessing for emulation a6ff6e0546d0 KVM: x86: Handle TIF_NEED_FPU_LOAD in kvm_{load,put}_guest_fpu() e3a37628c46d KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails 9d9933f7f3f4 KVM: x86: Don't let userspace set host-reserved cr4 bits 715f9f9a0768 KVM: VMX: Add non-canonical check on writes to RTIT address MSRs 2aebc6ed84ef x86/KVM: Clean up host's steal time structure f7c1a6c67ff3 x86/kvm: Cache gfn to pfn translation d71eef9fcc0b x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed a3db2949904b x86/kvm: Introduce kvm_(un)map_gfn() 68460ceba319 x86/kvm: Be careful not to clear KVM_VCPU_FLUSH_TLB bit d0671151c2b9 kvm/svm: PKU not currently supported 9213699efd1f KVM: PPC: Book3S PR: Free shared page if mmu initialization fails b2301deda8ce KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails 0718e2d3dc54 KVM: x86: Fix potential put_fpu() w/o load_fpu() on MPX platform 72324a1db6a1 KVM: x86: Protect MSR-based index computations in fixed_msr_to_seg_unit() from Spectre-v1/L1TF attacks 2fb35312c070 KVM: x86: Protect x86_decode_insn from Spectre-v1/L1TF attacks f2a514318263 KVM: x86: Protect MSR-based index computations from Spectre-v1/L1TF attacks in x86.c a07fdd5fcb30 KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks c09be769b48d KVM: x86: Protect MSR-based index computations in pmu.h from Spectre-v1/L1TF attacks 2f8a13754e05 KVM: x86: Protect ioapic_write_indirect() from Spectre-v1/L1TF attacks c8a6b5918942 KVM: x86: Protect kvm_hv_msr_[get|set]_crash_data() from Spectre-v1/L1TF attacks bf13472e5c05 KVM: x86: Protect kvm_lapic_reg_write() from Spectre-v1/L1TF attacks 8b73ccf4b475 KVM: x86: Protect DR-based index computations from Spectre-v1/L1TF attacks c2b02d093a08 KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks 79777eb82c23 KVM: x86: Refactor prefix decoding to prevent Spectre-v1/L1TF attacks 443fd0049dcf KVM: x86: Refactor picdev_write() to prevent Spectre-v1/L1TF attacks 8dcbf26833cc aio: prevent potential eventfd recursion on poll 844d2025b68d eventfd: track eventfd_signal() recursion depth d5d6b5887241 bcache: add readahead cache policy options via sysfs interface f158399c1fe9 watchdog: fix UAF in reboot notifier handling in watchdog core code c157da57304e xen/balloon: Support xend-based toolstack take two 726599c63799 tools/kvm_stat: Fix kvm_exit filter name 7a19bd6fe21b media: rc: ensure lirc is initialized before registering input device fd52d88c1dd8 media: iguanair: fix endpoint sanity check ae116f21b24a drm/rect: Avoid division by zero 5b442859ab80 drm: atmel-hlcdc: prefer a lower pixel-clock than requested d065ae83dff8 drm: atmel-hlcdc: enable clock before configuring timing engine 6421785d17e1 drm: atmel-hlcdc: use double rate for pixel clock only if supported ae35ac3c4b08 gfs2: fix O_SYNC write handling 637348690865 gfs2: move setting current->backing_dev_info c61b93fae603 gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0 65afa6958134 sunrpc: expiry_time should be seconds not timeval 301763168c5f mwifiex: fix unbalanced locking in mwifiex_process_country_ie() 535a755d6e6d iwlwifi: don't throw error when trying to remove IGTK cbe53807a14d ARM: tegra: Enable PLLP bypass during Tegra124 LP1 9e78c0e74261 btrfs: Correctly handle empty trees in find_first_clear_extent_bit d82ff2d6406d btrfs: flush write bio if we loop in extent_write_cache_pages 5e7a9ad78d56 Btrfs: fix race between adding and putting tree mod seq elements and nodes ce066845584a btrfs: drop log root for dropped roots 7baf8f665b77 btrfs: set trans->drity in btrfs_commit_transaction 78748f249199 Btrfs: fix infinite loop during fsync after rename operations 79a29dee9024 Btrfs: make deduplication with range including the last block work ddb36ab79b11 Btrfs: fix missing hole after hole punching and fsync when using NO_HOLES f0edd3abee0d ext4: fix race conditions in ->d_compare() and ->d_hash() d44fa04f0864 ext4: fix deadlock allocating crypto bounce page from mempool b19f130269c0 jbd2_seq_info_next should increase position index 6282102dbcbf nfsd: fix filecache lookup 4544a6912416 NFS: Directory page cache pages need to be locked when read 293cdcd89b6c NFS: Fix memory leaks and corruption in readdir 8d313c04b425 scsi: qla2xxx: Fix unbound NVME response length 246a54895ac6 powerpc/futex: Fix incorrect user access blocking eee7a67c0391 crypto: picoxcell - adjust the position of tasklet_init and fix missed tasklet_kill e057d64f86d4 crypto: api - Fix race condition in crypto_spawn_alg 12a15e1c544e crypto: atmel-aes - Fix counter overflow in CTR mode 2c4d8203ff0c crypto: pcrypt - Do not clear MAY_SLEEP flag in original request ded7c73a2b8c crypto: arm64/ghash-neon - bump priority to 150 3a35871603a6 crypto: ccp - set max RSA modulus size for v3 platform devices as well 58d8f2dec6ab crypto: hisilicon - Use the offset fields in sqe to avoid need to split scatterlists a791fc62a574 crypto: api - fix unexpectedly getting generic implementation 1f5f3f65f956 selftests: bpf: Ignore FIN packets for reuseport tests 44a522bf5edc selftests: bpf: Use a temporary file in test_sockmap da43712a7262 selftests/bpf: Skip perf hw events test if the setup disabled it 49437ecf9f30 selftests/bpf: Fix test_attach_probe c0ada6ad3ec5 samples/bpf: Xdp_redirect_cpu fix missing tracepoint attach a69af866bd35 samples/bpf: Don't try to remove user's homedir on clean fbee8f61747f tc-testing: fix eBPF tests failure on linux fresh clones f7a2ccc00a36 libbpf: Fix realloc usage in bpf_core_find_cands ab48c14a444b bpf, devmap: Pass lockdep expression to RCU lists 77bb53cb0948 selftests/bpf: Fix perf_buffer test on systems w/ offline CPUs 5b0e9b563c01 riscv, bpf: Fix broken BPF tail calls f3107a3c9b84 btrfs: Handle another split brain scenario with metadata uuid feature dd9837259de0 btrfs: fix improper setting of scanned for range cyclic write cache pages b4c8ed0bf977 crypto: pcrypt - Avoid deadlock by using per-instance padata queues c8e9dafe668d ftrace: Protect ftrace_graph_hash with ftrace_sync 6a652ed941aa ftrace: Add comment to why rcu_dereference_sched() is open coded c9dc142b39a8 tracing: Annotate ftrace_graph_notrace_hash pointer with __rcu 024537c7548f tracing: Annotate ftrace_graph_hash pointer with __rcu df57920d6e18 ASoC: SOF: core: release resources on errors in probe_continue 3145862d8f9e ASoC: SOF: Introduce state machine for FW boot 0b84591fdd5e scsi: qla2xxx: Fix stuck login session using prli_pend_timer 78cbd2c397bf dm: fix potential for q->make_request_fn NULL pointer 1426201af047 dm thin metadata: use pool locking at end of dm_pool_metadata_close 40d3d8d6eb64 dm crypt: fix benbi IV constructor crash if used in authenticated mode b805ec7d089f dm crypt: fix GFP flags passed to skcipher_request_alloc() 1781fa54a4ea dm writecache: fix incorrect flush sequence when doing SSD mode commit a8d99d630117 dm space map common: fix to ensure new block isn't already in use 188f9b710ff1 dm zoned: support zone sizes smaller than 128MiB ad7c38abe8ba ARM: dma-api: fix max_pfn off-by-one error in __dma_supported() bae74e7ac842 of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc f5f68d165dc0 cpufreq: Avoid creating excessively large stack frames 7dce99d3182a PM: core: Fix handling of devices deleted during system-wide resume e9116299ffac f2fs: fix race conditions in ->d_compare() and ->d_hash() 6d722cd2e387 f2fs: fix dcache lookup of !casefolded directories f4803553aae6 f2fs: code cleanup for f2fs_statfs_project() b1de9ec0e788 f2fs: fix miscounted block limit in f2fs_statfs_project() ae2cb41583a9 f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project() 08846286bf28 ovl: fix lseek overflow on 32bit 809e16a6eeb3 ovl: fix wrong WARN_ON() in ovl_cache_update_ino() 03572189d61c power: supply: ltc2941-battery-gauge: fix use-after-free 6f33d59ae165 power: supply: axp20x_ac_power: Fix reporting online status 4eed5d3bb14a cpupower: Revert library ABI changes from commit ae2917093fb60bdc1ed3e 2b27acfde9b2 scsi: qla2xxx: Fix mtcp dump collection failure edd15b154653 scsi: megaraid_sas: Do not initiate OCR if controller is not in ready state 3728834fff19 erofs: fix out-of-bound read for shifted uncompressed block 3ebbfdf41d26 scripts/find-unused-docs: Fix massive false positives a421f513779c fs: allow deduplication of eof block into the end of the destination file 5fefc9b3e358 padata: Remove broken queue flushing 5f63963669ec crypto: ccree - fix PM race condition 5e33535cf13c crypto: ccree - fix FDE descriptor sequence d8760030e701 crypto: ccree - fix pm wrongful error reporting 70439e8b7ccf crypto: ccree - fix AEAD decrypt auth fail 80c660892c24 crypto: ccree - fix backlog memory leak d2b1dcd5430f crypto: api - Check spawn->alg under lock in crypto_drop_spawn 0ed43162f578 nvmem: core: fix memory abort in cleanup path 6bdd1a0ed111 mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile 385c61a41cf9 hv_balloon: Balloon up according to request page number 570a29b1f75b ASoC: SOF: core: free trace on errors 84c9efd2f855 mmc: sdhci-of-at91: fix memleak on clk_get failure 65e6f63ebfb9 ubifs: Fix deadlock in concurrent bulk-read and writepage e3a561aa5376 ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag 91f96a9cdd82 ubifs: Fix wrong memory allocation 0119c617ebb6 ubifs: don't trigger assertion on invalid no-key filename 9220bf17ae18 fscrypt: don't print name of busy file when removing key ad270734193e alarmtimer: Unregister wakeup source when module get fails 05b147599f9d ACPI / battery: Deal better with neither design nor full capacity not being reported 7b86d05d1b02 ACPI / battery: Use design-cap for capacity calculations if full-cap is not available 93bba324c28a ACPI / battery: Deal with design or full capacity being reported as -1 832d6f76f268 ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards 44f6e43924f8 mmc: spi: Toggle SPI polarity, do not hardcode it 47bdd025b921 PCI: keystone: Fix error handling when "num-viewport" DT property is not populated a8b56e222300 PCI: keystone: Fix link training retries initiation 6700c0d9ae92 PCI: keystone: Fix outbound region mapping 05d56da81d94 PCI: tegra: Fix return value check of pm_runtime_get_sync() 38b67e60b6b5 tracing: Fix now invalid var_ref_vals assumption in trace action 5b92f86c8492 powerpc/32s: Fix CPU wake-up from sleep mode 4135a03fdf2e powerpc/32s: Fix bad_kuap_fault() 1bd3b871af57 powerpc/pseries: Advance pfn if section is not present in lmb_is_removable() 02c4699fb664 powerpc/xmon: don't access ASDR in VMs 796085dbe323 powerpc/ptdump: Fix W+X verification 2cabe61ab8ae powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case 63098a93063a s390/mm: fix dynamic pagetable upgrade for hugetlbfs e25f00c69039 MIPS: boot: fix typo in 'vmlinux.lzma.its' target bd9abdfd68b2 MIPS: fix indentation of the 'RELOCS' message 6b29d4a1f832 MIPS: syscalls: fix indentation of the 'SYSNR' message 6cca9100db90 KVM: arm64: Only sign-extend MMIO up to register width 4dd5c62d2e4c KVM: arm/arm64: Correct AArch32 SPSR on exception entry b0e01e9d2353 KVM: arm/arm64: Correct CPSR on exception entry cc7931dc766f KVM: arm64: Correct PSTATE on exception entry 5222ded5c72c arm64: acpi: fix DAIF manipulation with pNMI 79c56db06547 ALSA: hda: Add JasperLake PCI ID and codec vid 3d938d9febd1 ALSA: hda: Add Clevo W65_67SB the power_save blacklist 6cb7581f5702 ALSA: hda: Apply aligned MMIO access only conditionally 68efc422c547 platform/x86: intel_scu_ipc: Fix interrupt support 5bf25f3828a2 x86/cpu: Update cached HLE state on write to TSX_CTRL_CPUID_CLEAR 146f086a409b irqdomain: Fix a memory leak in irq_domain_push_irq() db165906cad5 lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() 9cbcbfc67b25 media: v4l2-rect.h: fix v4l2_rect_map_inside() top/left adjustments 965ccdedf1bf media: v4l2-core: compat: ignore native command codes d2db1cbc751f media/v4l2-core: set pages dirty upon releasing DMA buffers d364e9b37cc9 mm: move_pages: report the number of non-attempted pages 95419e7ef266 mm: thp: don't need care deferred split queue in memcg charge move path aab4189dfdb1 mm/memory_hotplug: fix remove_memory() lockdep splat cb33e477a50b utimes: Clamp the timestamps in notify_change() 73031a617ac3 mmc: sdhci-pci: Make function amd_sdhci_reset static af823232b018 mm/sparse.c: reset section's mem_map when fully deactivated c2c814fc9aee memcg: fix a crash in wb_workfn when a device disappears 39fac95159b4 ALSA: dummy: Fix PCM format loop in proc output 6edf790e9e51 ALSA: usb-audio: Annotate endianess in Scarlett gen2 quirk 85dbab63b461 ALSA: usb-audio: Fix endianess in descriptor validation 2068fbb20b9f usb: gadget: f_ecm: Use atomic_t to track in-flight request a7d00597e0b7 usb: gadget: f_ncm: Use atomic_t to track in-flight request 683b53b5aa12 usb: gadget: legacy: set max_speed to super-speed 063daad1412e usb: gadget: f_fs: set req->num_sgs as 0 for non-sg transfer 47dbff795049 objtool: Silence build output 72a533fc29e1 usb: typec: tcpci: mask event interrupts when remove driver 91cfedb762bd usb: dwc3: gadget: Delay starting transfer 1dc0d21fc1e6 usb: dwc3: gadget: Check END_TRANSFER completion 4e5d1bf6e68f brcmfmac: Fix memory leak in brcmf_usbdev_qinit 1c8c75275f97 Bluetooth: btusb: Disable runtime suspend on Realtek devices 1bfecb50771d Bluetooth: btusb: fix memory leak on fw 21780d1fd65b nvmet: Fix controller use after free 6243cb9e32d2 nvmet: Fix error print message at nvmet_install_queue function 6a4fea54ab46 rcu: Use READ_ONCE() for ->expmask in rcu_read_unlock_special() c71706a5ffff srcu: Apply *_ONCE() to ->srcu_last_gp_end dcad7270b2c7 rcu: Avoid data-race in rcu_gp_fqs_check_wake() a523031513b7 rcu: Use *_ONCE() to protect lockless ->expmask accesses d42b2370f28a tracing: Fix sched switch start/stop refcount racy updates e39351c52efb tracing/kprobes: Have uname use __get_str() in print_fmt 59b2e64b16bb ipc/msg.c: consolidate all xxxctl_down() functions 8ce07d95d67a netfilter: ipset: fix suspicious RCU usage in find_set_and_id 7bad0dda8164 mfd: dln2: More sanity checking for endpoints 6fcbff54ded1 media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors 9f5c4fac341c bnxt_en: Fix logic that disables Bus Master during firmware reset. fddd3f73ad08 netdevsim: fix stack-out-of-bounds in nsim_dev_debugfs_init() f146529c0049 MAINTAINERS: correct entries for ISDN/mISDN section 096df4720ab6 ionic: fix rxq comp packet type mask b6a7ba0e8622 tcp: clear tp->segs_{in|out} in tcp_disconnect() 31fceaf08597 tcp: clear tp->data_segs{in|out} in tcp_disconnect() 2fc4773b6af7 tcp: clear tp->delivered in tcp_disconnect() c9b6c6d07e5c tcp: clear tp->total_retrans in tcp_disconnect() 269a3c472a6f rxrpc: Fix NULL pointer deref due to call->conn being cleared on disconnect 843e115de475 rxrpc: Fix missing active use pinning of rxrpc_local object 524cba2f8de5 rxrpc: Fix insufficient receive notification generation 62221a9b1c9a rxrpc: Fix use-after-free in rxrpc_put_local() 5fa06c956821 bnxt_en: Fix TC queue mapping. 8566221e46eb net: stmmac: Delete txtimer in suspend() dd8142a6fa52 net_sched: fix an OOB access in cls_tcindex 919f13c56485 net: hsr: fix possible NULL deref in hsr_handle_frame() f3dea4cea67a l2tp: Allow duplicate session creation with UDP b080bc8481d9 gtp: use __GFP_NOWARN to avoid memalloc warning 0f8f0429a299 cls_rsvp: fix rsvp_policy 097ef8be69a3 bnxt_en: Move devlink_register before registering netdev aaf5369c72e9 sparc32: fix struct ipc64_perm type definition Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 5901ba4..fc31dc8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "d8831a265698a000bb7305e0234dcaa302cf25a5" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 9a18c63..cfecf98 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e144b0946f1a159a8b5770f1fcedaebf8eadac84" -SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" +SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "5.4.15" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index eea4f20..aa17380 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ab36b8853718cf0c92d6c37a62568d34424234e8" -SRCREV_machine_qemuarm64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemumips ?= "f9d6dd093282ef21a11d170660bb06ec81908836" -SRCREV_machine_qemuppc ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemuriscv64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemux86 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemux86-64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemumips64 ?= "8b16e493669ee19054a6407d331da75a32ed45b2" -SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" +SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" +SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" +SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:55 +0000 Subject: [oe-commits] [openembedded-core] 03/22: linux-yocto/5.2: update to v5.2.29 In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.116CD2328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d320a03b697679dfe223883b23480b70f89ad649 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:55 2020 -0500 linux-yocto/5.2: update to v5.2.29 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: 928ea9c56927 Linux 5.2.29 4e41907620bc slip: Fix use-after-free Read in slip_open d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support 4ac031b15d86 USB: serial: mos7840: fix remote wakeup 4d44a218aea6 USB: serial: mos7720: fix remote wakeup 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 13a33fb9debe appledisplay: fix error handling in the scheduled work 0cd437d7c16b USB: chaoskey: fix error case of a timeout 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status 726510907c68 USBIP: add config dependency for SGL_ALLOC 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer 1e4921f684ca media: imon: invalid dereference in imon_touch_event d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq 767facdefa23 media: usbvision: Fix races among open, close, and disconnect ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true 57f2b5c44f02 nfc: port100: handle command failure cleanly 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD c938307a439a futex: Prevent robust futex exit race 8b0f13ee2b7b nbd: prevent memory leak 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" 53eaf5993eea ath9k_hw: fix uninitialized variable data 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() 01d151b7e74e virtio_balloon: fix shrinker count caae62219805 virtio_ring: fix return code on DMA mapping fails 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed abce58c3af15 nbd:fix memory leak in nbd_get_socket() 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils 3608aa07bac2 gpio: max77620: Fixup debounce delays c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers 95a617d1f70c net/mlx5: Update the list of the PCI supported devices febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 e049e3c43308 taprio: don't reject same mqprio settings 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress 27845a1dd06b net/mlx5: Fix auto group size calculation ec6d299939c3 net/mlx5e: Fix set vf link state error flow bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel da957117e731 fbdev: Ditch fb_edid_add_monspecs 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault 0063e9b69796 mm/memory_hotplug: fix updating the node span d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process 045a481acd16 slcan: Fix memory leak in error path 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite 8505966cdc7e mm/page_io.c: do not free shared swap slots 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb 364436976763 slip: Fix memory leak in slip_open error path b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() b392b2d28e58 net: gemini: add missed free_netdev 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). 5fa89b3526c5 ax88172a: fix information leak on short answers 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL 0593a806b430 x86/entry/32: Use %ss segment where required 26ce03ac3327 x86/entry/32: Fix IRET exception f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit 41cb303e1436 x86/pti/32: Size initial_page_table correctly 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV 37880a369c68 x86/speculation: Fix redundant MDS mitigation message 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status c77d64c158c6 x86/insn: Fix awk regexp warnings 41bbdde13b43 x86: Use CONFIG_PREEMPTION 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value 8ccce28352fe x86/mm, tracing: Fix CR2 corruption 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap 7801660649a0 x86/entry/64: Simplify idtentry a little 5d305a697f40 x86/entry/32: Simplify common_exception 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption e4a8155be9bd x86/ldt: Initialize the context lock for init_mm f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() 22334402db00 x86/stackframe/32: Provide consistent pt_regs ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path ce394d5e28c6 x86/asm: Pin sensitive CR0 bits b3327106585c x86/asm: Pin sensitive CR4 bits e3534ce1de0c Documentation/x86: Fix path to entry_32.S 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 5391e05..79da8c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index 986dd6e..d88cb5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 358c0ad..59cc08e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:57 +0000 Subject: [oe-commits] [openembedded-core] 05/22: devsrc: fix objtool generation for v5.4+ In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.26F862328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3009e82f65bcf0988b4400552afd554ff91f024b Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:57 2020 -0500 devsrc: fix objtool generation for v5.4+ commit 6ec14aa7a58a1c2fb303692f8cb1ff82d9abd10a [objtool: Silence build output] was added to -stable in v5.4.19. This change was meant to ensure that build output was truly silent when required. But the trailing "cd -" in the tools script was ensuring that a success return code was always returned from the sync script. As such, some missing files for x86 were being masked. We add those files to ensure that objtool can be regenerated as required Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 2fa4be6..2888236 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -200,6 +200,7 @@ do_install() { cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/ + cp -a --parents arch/x86/tools/gen-insn-attr-x86.awk $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/ # 4.18 + have unified the purgatory files, so we ignore any errors if @@ -215,6 +216,10 @@ do_install() { cp -a --parents arch/x86/boot/string.c $kerneldir/build/ cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ + + # objtool requires these files + cp -a --parents arch/x86/lib/inat.c $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/x86/lib/insn.c $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "mips" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:01 +0000 Subject: [oe-commits] [openembedded-core] 09/22: qemu: bump default reference kernel to v5.4 In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.51D7F2328EB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c250dbd2a68048f83837e7cbdfb53bc38623e4a2 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:02 2020 -0500 qemu: bump default reference kernel to v5.4 Now that the 5.4 recipes are available, we bump the default versions to use them. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarmv5.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index da56cc3..a727147 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.2%" +PREFERRED_VERSION_linux-yocto ??= "5.4%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index fb4789f..7f72048 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -PREFERRED_VERSION_linux-yocto ??= "5.2%" +PREFERRED_VERSION_linux-yocto ??= "5.4%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:02 +0000 Subject: [oe-commits] [openembedded-core] 10/22: musl: Update to final 1.2.0 release In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.5BC842328EC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 732cac03632fee312e8a43aa091d056d4a3900f0 Author: Khem Raj AuthorDate: Fri Feb 21 08:34:20 2020 -0800 musl: Update to final 1.2.0 release Detailed log [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=a662220df547e5c2446518e74440a7d834f9ebe6..040c1d16b468c50c04fc94edff521f1637708328 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index b6ec6fe..afc8446 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,9 +4,9 @@ require musl.inc inherit linuxloader -SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" +SRCREV = "040c1d16b468c50c04fc94edff521f1637708328" -BASEVER = "1.1.24" +BASEVER = "1.2.0" PV = "${BASEVER}+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:05 +0000 Subject: [oe-commits] [openembedded-core] 13/22: toolchain-shar-extract: ignore timestamp on decompress In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.787252328EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 319ca22ea4465c56c63730847378a7aee4f5935a Author: Jeremy Puhlman AuthorDate: Fri Feb 21 12:20:15 2020 -0800 toolchain-shar-extract: ignore timestamp on decompress Installing on centos7, which the extended version of the buildtools tarball is supposed to fix and with reproducable builds turned on, all the time stamps are for epoch. This results in the following output for every file: tar: ./sysroots/x86_64-pokysdk-linux/usr/include/c++/9.2.0/cstdalign: implausibly old time stamp 1969-12-31 16:00:00 tar: ./sysroots/x86_64-pokysdk-linux/usr/lib/libstdc++.so.6: implausibly old time stamp 1969-12-31 16:00:00 Ignore the timestamps during the uncompession step. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ccc4f4e..4c4b4de 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -249,7 +249,7 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:03 +0000 Subject: [oe-commits] [openembedded-core] 11/22: jquery: fix upstream version check In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.644052328ED@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 28ad55f3cee1446c368e03f1853de46ba4ee4983 Author: Alexander Kanavin AuthorDate: Fri Feb 21 21:15:42 2020 +0100 jquery: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb index e1080ae..1bf6ef5 100644 --- a/meta/recipes-devtools/jquery/jquery_3.4.1.bb +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -14,6 +14,8 @@ SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4 SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" +UPSTREAM_CHECK_REGEX = "jquery-(?P\d+(\.\d+)+)\.js" + inherit allarch do_install() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:04 +0000 Subject: [oe-commits] [openembedded-core] 12/22: oeqa/logparser: correctly set test result markers In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.6E6792328EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1cd6e9a8fdfef927916c6cea2371fc0430b1ffdf Author: Alexander Kanavin AuthorDate: Fri Feb 21 21:15:43 2020 +0100 oeqa/logparser: correctly set test result markers I spotted this by noticing ptests started to unexpectedly pass, which shouldn't happen yet. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 5403721..60e16d5 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -26,7 +26,7 @@ class PtestParser(object): section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") # Cache markers so we don't take the re.search() hit all the time. - markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + markers = ("PASS:", "FAIL:", "SKIP:", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") def newsection(): return { 'name': "No-section", 'log': [] } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:06 +0000 Subject: [oe-commits] [openembedded-core] 14/22: libxcrypt: Upgrade to 4.4.14 release In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.828D42328F1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f0c50a5bebe593dd3b5ffbe4c84688ae7e84e4fe Author: Khem Raj AuthorDate: Fri Feb 21 14:45:34 2020 -0800 libxcrypt: Upgrade to 4.4.14 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 59744c0..416205c 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" +SRCREV = "5c43f7d56a31667bcdaa334bbb4edafb75672872" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:59 +0000 Subject: [oe-commits] [openembedded-core] 07/22: linux-yocto: perf: Make perf able to build with latest libbfd In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.3FA652328E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 16e943690bdbdf2e60a2fe33950697278018c7d1 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:59 2020 -0500 linux-yocto: perf: Make perf able to build with latest libbfd Khem pointed out that we need to backport the following change to get perf building with the latest binutils: commit 0ada120c883d4f1f6 upstream: [ Subject: perf: Make perf able to build with latest libbfd libbfd has changed the bfd_section_* macros to inline functions bfd_section_ since 2019-09-18. See below two commits: o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html This fix make perf able to build with both old and new libbfd. Signed-off-by: Changbin Du Acked-by: Jiri Olsa Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du at gmail.com Signed-off-by: Arnaldo Carvalho de Melo ] Reported-by: Khem Raj Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 94a8e05..2a35e33 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" +SRCREV_machine ?= "97cb5fe4e4fa529a5b8165c4f84182d2d4751b39" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 622f5e6..463451f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" -SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuarm ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" +SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index feb8978..5dd7b68 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" -SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" -SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" -SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuarm ?= "aa91aac123d12d9d4f420862238a437781fe3825" +SRCREV_machine_qemuarm64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemumips ?= "6cb162ab5262318fc52a7cbef86afcf48c6b2449" +SRCREV_machine_qemuppc ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemuriscv64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemux86 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemux86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemumips64 ?= "fcbec8b4f0f2f24a31ce5c6e6439c69f7512fb31" +SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:57:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:57:58 +0000 Subject: [oe-commits] [openembedded-core] 06/22: linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.3357F2328E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8dfaf1abe9f2292b5c357a62d6fa4c0660a5c47c Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:45:58 2020 -0500 linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix Bumping the SRCREVs to pickup the VDSO fix by Victor Kamensky. We need it to avoid segfaults in SDK testing as well as the standard mips image test cases. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index ab93f1b..94a8e05 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 097357d..622f5e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 0b2a230..feb8978 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" -SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" -SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" +SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" +SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:00 +0000 Subject: [oe-commits] [openembedded-core] 08/22: linux-yocto/5.4: update to -rt11 In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.499492328EA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit dd407673d7091cb49ed41bef750c33bbcb53a1c3 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:00 2020 -0500 linux-yocto/5.4: update to -rt11 Integrating the -rt11 changes into the linux-yocto-rt branches: e3a0470f1ebe (HEAD -> v5.4/standard/preempt-rt/base, origin/v5.4/standard/preempt-rt/base) v5.4.19-rt11 2748be173948 bpf/stackmap: Don't trylock mmap_sem with PREEMPT_RT and interrupts disabled d721d73cb752 bpf, lpm: Make locking RT friendly dc53d4c7fad3 bpf: Prepare hashtab locking for PREEMPT_RT a13a53a8ae75 bpf: Factor out hashtab bucket lock operations 96a25d8a5a2d bpf: Use migrate_disable() in sys_bpf() bb8a96d7e701 bpf: Use migrate_disable() in hashtab code 615cc5998661 bpf: Use migrate_disable/enable in array macros and cgroup/lirc code. c3a06a1ab3d4 bpf/tests: Use migrate disable instead of preempt disable 0717741a61e6 trace/bpf: Use migrate disable in trace_call_bpf() b528161bf4e0 bpf: Use BPF_PROG_RUN_PIN_ON_CPU() at simple call sites. a3b5b903f04f bpf: Replace cant_sleep() with cant_migrate() dd708fd4fb18 bpf: Provide BPF_PROG_RUN_PIN_ON_CPU() macro 6ccad68939c7 bpf: Don't iterate over possible CPUs with interrupts disabled 055b62ad0b2c perf/bpf: Remove preempt disable around BPF invocation 7848f4a45054 bpf/tracing: Remove redundant preempt_disable() in __bpf_trace_run() caf8a5d6b42f bpf: Update locking comment in hashtab code 2ddd1653369d sched: Provide cant_migrate() 37b6c8361d28 sched: Provide migrate_disable/enable() inlines 2a1c4980a1e6 drm/i915/gt: use a LOCAL_IRQ_LOCK in __timeline_mark_lock() 84a119be5c68 v5.4.19-rt10 bb5e8418fb66 v5.4.17-rt9 bf976f5d86e7 locallock: Include header for the `current' macro 7a00b04683bd mm/memcontrol: Move misplaced local_unlock_irqrestore() b647f8807169 sched: migrate_enable: Remove __schedule() call 2b321530c794 sched: migrate_enable: Use per-cpu cpu_stop_work 22b448083286 locking: Percpu-rwsem rewrite f5d550cc9950 v5.4.17-rt8 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 2a35e33..37282b2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97cb5fe4e4fa529a5b8165c4f84182d2d4751b39" +SRCREV_machine ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:07 +0000 Subject: [oe-commits] [openembedded-core] 15/22: go: Upgrade to 1.13.8 minor release In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.8AB202328F2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d052940cb5964053a7efd0f828f4114b647d98b7 Author: Khem Raj AuthorDate: Fri Feb 21 14:45:36 2020 -0800 go: Upgrade to 1.13.8 minor release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/go/go-1.13.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.13.inc index 39dbd74..7780ace 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.13.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.13" -GO_MINOR = ".5" +GO_MINOR = ".8" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,6 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "ecd1729313608d3ef352ea4fd9ea42cd" -SRC_URI[main.sha256sum] = "27d356e2a0b30d9983b60a788cf225da5f914066b37a6b4f69d457ba55a626ff" - +SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" +SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:11 +0000 Subject: [oe-commits] [openembedded-core] 19/22: perf: Correct the substitution of python shebangs In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.DC6402328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3f93173130a94310255389cfc62c67102a4fb21b Author: He Zhe AuthorDate: Sat Feb 22 11:37:24 2020 +0800 perf: Correct the substitution of python shebangs To make the native python3 always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..10a5b88 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` `find ${S}/scripts/ -name 'bpf_helpers_doc.py'`; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:12 +0000 Subject: [oe-commits] [openembedded-core] 20/22: webkitgtk: enable gobject-introspection for armv7a In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.E608D2328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0f4f69d1b238b2c22c30ef306358a055d3aa39cb Author: Andreas M?ller AuthorDate: Sat Feb 22 12:26:27 2020 +0100 webkitgtk: enable gobject-introspection for armv7a Tested with cortex-a9 machine * before this patch -> no gir * after: gir was built without issues Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a1dba73..a48a976 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -124,9 +124,5 @@ 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" - # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:08 +0000 Subject: [oe-commits] [openembedded-core] 16/22: gmp: Upgrade to 6.2.0 In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.936BE2328F3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 35c052db4e081d363bcca350383adb0ac8c321d3 Author: Khem Raj AuthorDate: Fri Feb 21 14:45:37 2020 -0800 gmp: Upgrade to 6.2.0 Drop amd64 patch, the bsfq has been replaced with bsfl for count_trailing_zeros Forward port rest of patches to 6.2.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 ------------------ ...the-user-provided-flags-to-the-auto-detected-.patch | 0 ...nfiure.ac-Believe-the-cflags-from-environment.patch | 16 ++++++++-------- .../gmp/{gmp-6.1.2 => gmp}/use-includedir.patch | 3 +++ .../recipes-support/gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} | 5 ++--- 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch deleted file mode 100644 index 3935589..0000000 --- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Index: gmp-6.1.2/longlong.h -=================================================================== ---- gmp-6.1.2.orig/longlong.h -+++ gmp-6.1.2/longlong.h -@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype - count is only an int. */ - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ -+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ -+ (count) = __cbtmp; \ - } while (0) - #endif /* __amd64__ */ - diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch similarity index 100% rename from meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch rename to meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch similarity index 80% rename from meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch rename to meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 1e47924..56564db 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,11 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -Index: gmp-6.1.2/configure.ac -=================================================================== ---- gmp-6.1.2.orig/configure.ac -+++ gmp-6.1.2/configure.ac -@@ -604,15 +604,6 @@ case $host in - any_32_testlist="sizeof-long-4" - any_64_testlist="sizeof-long-8" +--- a/configure.ac ++++ b/configure.ac +@@ -625,17 +625,6 @@ case $host in + any_32_testlist="sizeof-void*-4" + any_64_testlist="sizeof-void*-8" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -33,12 +31,14 @@ Index: gmp-6.1.2/configure.ac - gcc_cflags_fpmode="-mfloat-abi=softfp" ;; - *-*-*eabihf) - gcc_cflags_fpmode="-mfloat-abi=hard" ;; +- *-*-mingw*) +- limb_64=longlong ;; - esac - # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -746,8 +737,6 @@ case $host in +@@ -780,8 +769,6 @@ case $host in ;; *) path="arm" diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch similarity index 83% rename from meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch rename to meta/recipes-support/gmp/gmp/use-includedir.patch index 6b089cf..d27317c 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/meta/recipes-support/gmp/gmp/use-includedir.patch @@ -1,4 +1,7 @@ +exec includedir should be pointing to general yocto includdir + Upstream-Status: Pending +Signed-off-by: Khem Raj Index: gmp-6.1.2/Makefile.am =================================================================== diff --git a/meta/recipes-support/gmp/gmp_6.1.2.bb b/meta/recipes-support/gmp/gmp_6.2.0.bb similarity index 86% rename from meta/recipes-support/gmp/gmp_6.1.2.bb rename to meta/recipes-support/gmp/gmp_6.2.0.bb index c745dbb..a19c74f 100644 --- a/meta/recipes-support/gmp/gmp_6.1.2.bb +++ b/meta/recipes-support/gmp/gmp_6.2.0.bb @@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ REVISION = "" SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://amd64.patch \ file://use-includedir.patch \ file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ " -SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" -SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" +SRC_URI[md5sum] = "c24161e0dd44cae78cd5f67193492a21" +SRC_URI[sha256sum] = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea" acpaths = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:13 +0000 Subject: [oe-commits] [openembedded-core] 21/22: wayland: add a patch to address build errors due to incorrect deps In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.EEC2C2328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fb1f1a1e6461b5d3c51fbae0b893debb88bfa8d5 Author: Alexander Kanavin AuthorDate: Sat Feb 22 16:30:18 2020 +0100 wayland: add a patch to address build errors due to incorrect deps Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-add-missing-dependencies-on-protocol-hea.patch | 115 +++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 1 + 2 files changed, 116 insertions(+) diff --git a/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch new file mode 100644 index 0000000..61de0e0 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch @@ -0,0 +1,115 @@ +From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Sat, 15 Feb 2020 02:03:45 +0000 +Subject: [PATCH] meson/tests: add missing dependencies on protocol headers + +In file included from ../tests/connection-test.c:43: +In file included from ../tests/test-compositor.h:30: +../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found + #include "wayland-client-protocol.h" + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from ../tests/display-test.c:45: +In file included from ../src/wayland-server.h:104: +src/wayland-server-protocol.h:4454:2: error: unterminated /* comment + /** + ^ +In file included from ../tests/cpp-compile-test.cpp:2: +In file included from src/wayland-server-protocol.h:8: +In file included from ../src/wayland-server.h:104: +src/wayland-server-protocol.h:3:2: error: unterminated conditional directive + #ifndef WAYLAND_SERVER_PROTOCOL_H + ^ +../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h! + #error including wayland-server-protocol.h did not include wayland-server.h! + ^ +In file included from ../tests/headers-protocol-test.c:26: +In file included from src/wayland-client-protocol.h:8: +In file included from ../src/wayland-client.h:40: +src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive + #ifndef WL_SHM_FORMAT_ENUM + ^ +In file included from ../tests/protocol-logger-test.c:34: +In file included from ../src/wayland-client.h:40: +src/wayland-client-protocol.h:2613:1: error: unterminated /* comment +/** +^ +../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface' + res = wl_resource_create(client, &wl_seat_interface, 4, 0); + ^ +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + tests/meson.build | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index c28a2a3..f1af7b4 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -69,7 +69,7 @@ test( + executable( + 'cpp-compile-test', + 'cpp-compile-test.cpp', +- wayland_server_protocol_core_h, ++ wayland_server_protocol_h, + include_directories: src_inc + ) + ) +@@ -91,17 +91,25 @@ tests = { + 'array-test': [], + 'client-test': [ wayland_server_protocol_h ], + 'display-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + tests_server_protocol_h, + tests_client_protocol_c, + tests_protocol_c, + ], +- 'connection-test': [ wayland_server_protocol_h ], ++ 'connection-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, ++ ], + 'event-loop-test': [ wayland_server_protocol_h ], + 'fixed-test': [], + 'interface-test': [ wayland_client_protocol_h ], + 'list-test': [], + 'map-test': [], +- 'sanity-test' : [ wayland_server_protocol_h ], ++ 'sanity-test' : [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, ++ ], + 'socket-test': [ + wayland_client_protocol_h, + wayland_server_protocol_h, +@@ -116,7 +124,7 @@ tests = { + files('../src/wayland-server.c'), + wayland_server_protocol_h, + ], +- 'resources-test': [ wayland_server_protocol_core_h ], ++ 'resources-test': [ wayland_server_protocol_h ], + 'message-test': [ + wayland_client_protocol_h, + wayland_server_protocol_h, +@@ -126,14 +134,16 @@ tests = { + wayland_server_protocol_h, + ], + 'protocol-logger-test': [ +- wayland_server_protocol_core_h, +- wayland_client_protocol_core_h, ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + ], + 'headers-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + 'headers-protocol-test.c', +- 'headers-protocol-core-test.c', +- wayland_server_protocol_core_h, + wayland_client_protocol_core_h, ++ wayland_server_protocol_core_h, ++ 'headers-protocol-core-test.c', + ], + 'os-wrappers-test': [], + } diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 6a6e749..5dc3116 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -16,6 +16,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ + file://0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:14 +0000 Subject: [oe-commits] [openembedded-core] 22/22: libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235754.045C72328F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7214af1d8ed9082cb4646951df8b5d97591a4876 Author: Martin Jansa AuthorDate: Sat Feb 22 18:49:01 2020 +0100 libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES * requires virtual/egl which isn't available without opengl in DISTRO_FEATURES as shown in world builds without it: ERROR: Nothing PROVIDES 'virtual/egl' (but openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb, openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it) $ bitbake libwpe NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb DEPENDS on or otherwise requires it). Close matches: virtual/kernel virtual/make virtual/perf ERROR: Required build target 'libwpe' has no buildable providers. Missing or unbuildable dependency chain was: ['libwpe', 'virtual/egl'] $ bitbake wpebackend-fdo NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it). Close matches: virtual/kernel virtual/make virtual/perf ERROR: Required build target 'wpebackend-fdo' has no buildable providers. Missing or unbuildable dependency chain was: ['wpebackend-fdo', 'virtual/egl'] $ bitbake webkitgtk ERROR: Nothing PROVIDES 'webkitgtk' webkitgtk was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 4 +++- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb index 346ca9b..12499ff 100644 --- a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -9,7 +9,9 @@ DEPENDS = "virtual/egl libxkbcommon" # Workaround build issue with RPi userland EGL libraries. CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" -inherit cmake +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb index 7db5806..cd2f7fa 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -8,7 +8,9 @@ DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" DEPENDS_append_class-target = " wayland-native" -inherit cmake +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:10 +0000 Subject: [oe-commits] [openembedded-core] 18/22: binutils: Fix x86_64 override usage In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.D451B2328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c Author: Richard Purdie AuthorDate: Sat Feb 22 10:30:27 2020 +0000 binutils: Fix x86_64 override usage This override was applying to binutils-native meaning it would behave differently depending upon the host it was building on. This is not a good idea and we have tests to detect it which failed: oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash binutils-native already enables all targets so we can avoid issues by not setting this option in the native case. Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 5b4a339..6ed40a1 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -75,9 +75,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --enable-deterministic-archives \ --enable-plugins \ ${LDGOLD} \ + ${EXTRA_TARGETS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" -EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS = "" +EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS_class-native = "" LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:58:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:58:09 +0000 Subject: [oe-commits] [openembedded-core] 17/22: binutils: Upgrade to 2.34 release In-Reply-To: <158241587233.26404.12900193839976617738@git.openembedded.org> References: <158241587233.26404.12900193839976617738@git.openembedded.org> Message-ID: <20200222235753.CBCED2328D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 82f7d5cfc2ab02f39b69c0f8697d660936422d4a Author: Khem Raj AuthorDate: Thu Feb 20 09:13:40 2020 -0800 binutils: Upgrade to 2.34 release Details of changelog [1] Removing bfd/ld patch to enable PE targets, instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch rpaths are no longer emitted into elfedit/readelf therefore no need of chrpath anymore Instead of pre-generating configure scripts and house them in libtool patch, generate them during configure. This also ensures that we do not patch configure directly but rather the sources which generate it Package newly added libctf library [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ...ian_2.33.bb => binutils-cross-canadian_2.34.bb} | 0 ...te_2.33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...nutils-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...nutils-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...oss-Do-not-generate-linker-script-directo.patch | 4 +- ...ivesdk-Search-for-alternative-ld.so.conf.patch} | 75 +- ...ure-widen-the-regexp-for-SH-architectures.patch | 44 - ...ure-widen-the-regexp-for-SH-architectures.patch | 41 + ...=> 0005-Point-scripts-location-to-libdir.patch} | 10 +- ...e-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/binutils/0006-Use-libtool-2.4.patch | 21203 ------------------- .../binutils/binutils/0007-Use-libtool-2.4.patch | 7115 +++++++ ...e-distro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...s-of-system-directories-when-cross-linki.patch} | 40 +- ...rpath-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...hange-default-emulation-for-mips64-linux.patch} | 23 +- ...tch => 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...correct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ...patch => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...able-x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...tch => 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- 28 files changed, 7396 insertions(+), 21590 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 82530f5..e957e3a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8..eaaa5ed 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa5..5b4a339 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -13,17 +13,12 @@ LICENSE = "GPLv3" DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" -# -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath -# -DEPENDS_append_class-target = " chrpath-replacement-native" -EXTRANATIVEPATH_append_class-target = " chrpath-native" - inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ + ${libdir}/libctf.so \ + ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" # Rather than duplicating multiple entries for these, make one @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do + cd ${S}/$d + autoconf + rm -rf autom4te.cache + done + cd ${S} + gnu-configize) + oe_runconf # # must prime config.cache to ensure the build of libiberty @@ -123,10 +129,6 @@ do_configure () { done } -do_compile_append_class-target() { - chrpath -d ${B}/binutils/elfedit - chrpath -d ${B}/binutils/readelf -} do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461b..14e8421 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,6 +1,6 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 +Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4..91de94b 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From 6d79f81336e7cbe727b5a51134f5d314a455379d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d1..8b59ba5 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From d057b215f114f6158b4010ab44a19cae9dcc8386 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 4a6b107..0000000 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH] configure: widen the regexp for SH architectures - -gprof needs to know about uclibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure | 2 +- - gprof/configure | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 ---- a/configure -+++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000..d10a144 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,41 @@ +From f7ad8a44c10f01e03680f093fd7af71c9f5e8606 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH] configure: widen the regexp for SH architectures + +gprof needs to know about uclibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 91dc42f6c7..7c1b747e7c 100755 +--- a/configure ++++ b/configure +@@ -3915,7 +3915,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4bd869a63a..7187b34dfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1159,7 +1159,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3..3ba0ba6 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 08b088b7dd3d9707ed66948a7271ffb438eeddf5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch similarity index 51% rename from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename to meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 214ae06..d920729 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 +From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -10,21 +10,23 @@ Upstream-Status: Pending Signed-off-by: Chris Chimelis Signed-off-by: Khem Raj --- - ld/emultempl/elf32.em | 4 ++++ + ld/ldelf.c | 4 ++++ 1 file changed, 4 insertions(+) ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment < -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH] Use libtool 2.4 - -get libtool sysroot support - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - bfd/configure | 1322 ++++++++++++++----- - bfd/configure.ac | 2 +- - binutils/configure | 1320 ++++++++++++++----- - gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1321 ++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------ - libtool.m4 | 1080 +++++++++++----- - ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- - ltoptions.m4 | 2 +- - ltversion.m4 | 12 +- - lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 ++++++++++++++----- - opcodes/configure.ac | 2 +- - zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) - ---- a/bfd/configure -+++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -822,6 +825,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-mmap try using mmap for BFD input files if available - --with-separate-debug-dir=DIR - Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6808,6 +6894,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6900,6 +7158,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7262,8 +7580,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7351,7 +7682,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7426,6 +7757,20 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7445,6 +7790,41 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - - - # Check whether --enable-libtool-lock was given. -@@ -7653,6 +8033,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8380,7 +8879,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8469,7 +8969,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9470,7 +9983,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9588,8 +10102,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9607,8 +10121,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9654,8 +10168,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9785,7 +10299,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9798,22 +10318,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9838,22 +10371,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10102,23 +10685,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10932,7 +11587,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11728,7 +12383,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= - if test "$enable_shared" = "yes"; then - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18422,12 +19127,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/binutils/configure -+++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -807,6 +810,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6572,6 +6658,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6664,6 +6922,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7115,7 +7446,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7190,6 +7521,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -7211,6 +7554,43 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8175,7 +8674,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8264,7 +8764,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9265,7 +9778,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9383,8 +9897,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9402,8 +9916,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9449,8 +9963,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9580,7 +10094,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9593,22 +10113,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9633,22 +10166,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9897,23 +10480,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10727,7 +11382,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11523,7 +12178,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17159,12 +17864,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gas/configure -+++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -799,6 +802,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-cpu=CPU default cpu variant is CPU (currently only supported - on ARC) - --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6392,6 +6478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6484,6 +6742,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6935,7 +7266,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7010,6 +7341,19 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7030,6 +7374,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7237,6 +7617,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7995,7 +8494,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8084,7 +8584,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9085,7 +9598,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9203,8 +9717,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9222,8 +9736,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9269,8 +9783,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9400,7 +9914,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9413,22 +9933,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9453,22 +9986,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9717,23 +10300,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10547,7 +11202,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11343,7 +11998,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16049,8 +16714,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16081,7 +16753,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16117,6 +16788,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16890,7 +17562,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17158,12 +17863,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gprof/configure -+++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -780,6 +783,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5124,8 +5130,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --linux-uclibc*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -- ;; -- - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6244,6 +6325,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6276,8 +6525,8 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6336,6 +6589,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6698,8 +7011,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6776,6 +7090,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6787,7 +7113,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6824,8 +7150,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6862,6 +7188,17 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ - - - -@@ -6883,6 +7220,44 @@ fi - - - -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7089,6 +7464,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7652,6 +8144,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7847,7 +8341,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7936,7 +8431,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8234,8 +8729,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8520,13 +9019,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8587,6 +9090,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8937,7 +9445,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9036,12 +9545,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9055,8 +9564,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9074,8 +9583,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9121,8 +9630,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9252,7 +9761,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9265,22 +9780,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9305,22 +9833,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9569,23 +10147,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10399,7 +11049,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11239,10 +11889,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11345,10 +11995,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13435,8 +14095,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13467,7 +14134,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13503,6 +14169,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14268,7 +14935,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14536,12 +15236,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/ld/configure -+++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -816,6 +819,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-lib-path=dir1:dir2... set default LIB_PATH - --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -7075,6 +7161,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7167,6 +7425,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7618,7 +7949,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7693,6 +8024,13 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - - - -@@ -7714,6 +8052,48 @@ fi - - - -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8551,6 +9050,16 @@ done - - - -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+ -+ -+ - - - # Set options -@@ -8679,7 +9188,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8768,7 +9278,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9769,7 +10292,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9887,8 +10411,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9906,8 +10430,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9953,8 +10477,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10084,7 +10608,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10097,22 +10627,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10137,22 +10680,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10401,23 +10994,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11231,7 +11896,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -12027,7 +12692,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12884,22 +13557,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12925,22 +13611,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: - }; - _LT_EOF - -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -13815,6 +14572,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -13850,7 +14608,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -14476,6 +15246,7 @@ fi - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -14891,7 +15726,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15350,6 +16185,7 @@ fi - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi - compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' - GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' - archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har - hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' - inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' - link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' - always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' - exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' - file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' - compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ - reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19773,12 +20659,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -199,7 +205,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -746,15 +752,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_XSI_SHELLFNS -+ _LT_PROG_REPLACE_SHELLFNS - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -980,6 +983,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - -@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - - AC_MSG_CHECKING([how to print strings]) - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_libtool_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2342,7 +2483,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2950,6 +3091,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -3167,6 +3314,21 @@ tpf*) - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3403,8 +3630,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t at _DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t at _DLSYM_CONST -+#else -+# define LT@&t at _DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3484,7 +3724,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t at _DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3551,6 +3791,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4529,8 +4801,8 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4548,8 +4820,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4595,8 +4867,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4726,7 +4998,7 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else -@@ -4737,7 +5009,7 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4852,7 +5167,7 @@ _LT_EOF - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -4876,10 +5191,10 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4926,16 +5241,31 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { - }; - _LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6586,6 +7008,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF --esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,10 +1,9 @@ --# Generated from ltmain.m4sh. - --# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -38,7 +37,6 @@ - # -n, --dry-run display commands without modifying any files - # --features display basic configuration information and exit - # --mode=MODE use operation mode MODE --# --no-finish let install mode avoid finish commands - # --preserve-dup-deps don't remove duplicate dependency libraries - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent -@@ -71,17 +69,19 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# $progname: (GNU libtool) 2.4 - # automake: $automake_version - # autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.7a --TIMESTAMP=" 1.3134 2009-11-29" --package_revision=1.3134 -+VERSION=2.4 -+TIMESTAMP="" -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -106,9 +106,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -121,15 +118,13 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -- -- -- -- -- - # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh - # is ksh but when the shell is invoked as "sh" and the current value of - # the _XPG environment variable is not equal to 1 (one), the special -@@ -140,7 +135,7 @@ progpath="$0" - - - : ${CP="cp -f"} --: ${ECHO=$as_echo} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -149,7 +144,7 @@ progpath="$0" - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -169,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -183,17 +199,31 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation - --# Generated shell functions inserted here. - - # These SED scripts presuppose an absolute path with a trailing slash. - pathcar='s,^/\([^/]*\).*$,\1,' -@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -404,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -430,14 +469,14 @@ func_echo_all () - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -656,19 +695,35 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -+ $opt_debug -+ - $SED -n '/(C)/!b go - :more - /\./!{ - N -- s/\n# // -+ s/\n# / / - b more - } - :go -@@ -685,7 +740,9 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/^# *-h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ -@@ -701,7 +758,10 @@ func_usage () - # unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -714,7 +774,11 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret -@@ -726,12 +790,39 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: - - - -@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_finish=: --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -850,130 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac -+ -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- --no-finish) opt_finish=false ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- opt_verbose=false -+ opt_preserve_dup_deps=: - ;; -- -- --no-quiet|--no-silent) -- preserve_args="$preserve_args $opt" -- opt_silent=false -+ --features) -+ opt_features=: -+func_features - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -- opt_verbose=: -+func_append preserve_args " $opt" - ;; -- -- --no-verbose) preserve_args="$preserve_args $opt" -+ --no-verbose) - opt_verbose=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --help-all) opt_help=': help-all' ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -@@ -981,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval "std_shrext=\"$shrext_cmds\"" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1149,7 +1311,7 @@ func_execute_cmds () - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1172,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1184,8 +1377,7 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1204,8 +1396,7 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1274,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1314,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1340,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1364,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1496,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval "srcfile=\"$fix_srcfile_path\"" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1526,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1573,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1622,13 +2290,13 @@ compiler." - } - - $opt_help || { -- test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -@@ -1819,13 +2487,13 @@ if $opt_help; then - else - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done -@@ -1854,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1882,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1907,10 +2578,10 @@ func_mode_execute () - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. -- if eval test -z \"\$$shlibpath_var\"; then -- eval $shlibpath_var=\$dir -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" - else -- eval $shlibpath_var=\$dir:\$$shlibpath_var -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - -@@ -1939,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1972,22 +2642,59 @@ func_mode_execute () - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi - -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1997,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -2006,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval "flag=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2077,7 +2786,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; -@@ -2097,7 +2806,7 @@ func_mode_install () - do - arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -2135,11 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi -- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2151,7 +2860,7 @@ func_mode_install () - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" -- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - -@@ -2209,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2226,23 +2938,30 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2315,7 +3034,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2503,7 +3222,7 @@ func_mode_install () - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - -- if test -n "$current_libdirs" && $opt_finish; then -+ if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -@@ -2512,7 +3231,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2559,6 +3278,18 @@ extern \"C\" { - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2570,21 +3301,22 @@ extern \"C\" { - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { -- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - -@@ -2593,23 +3325,23 @@ extern \"C\" { - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols -- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$export_symbols" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { -- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" -- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$nlist" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } -@@ -2620,10 +3352,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- $ECHO ": $name " >> "$nlist" -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2661,26 +3435,9 @@ typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- echo >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2796,9 +3553,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- win32_nmres=`$NM -f posix -A "$1" | -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2827,6 +3586,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2917,7 +3801,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +3816,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -@@ -3014,7 +3898,110 @@ func_fallback_echo () - _LTECHO_EOF' - } - ECHO=\"$qECHO\" -- fi\ -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -@@ -3078,7 +4065,7 @@ _LTECHO_EOF' - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" -@@ -3102,6 +4089,18 @@ _LTECHO_EOF' - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -3116,35 +4115,10 @@ _LTECHO_EOF' - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -@@ -3158,166 +4132,6 @@ fi\ - } - - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_result=`cygpath -w "$1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result= -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -- --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_pathlist_tmp1=$func_stripname_result -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- func_to_host_pathlist_result=` -- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_append func_to_host_pathlist_result ";$func_to_host_path_result" -- fi -- fi -- fi -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result"; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_append func_to_host_pathlist_result ";" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -- - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout - # Must ONLY be called from within func_mode_link because -@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined LT_DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); - void lt_update_exe_path (const char *name, const char *value); -@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); - EOF - - cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3706,7 +4529,9 @@ EOF - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3728,7 +4553,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3762,8 +4587,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3780,8 +4605,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4222,7 +5078,7 @@ EOF - func_win32_import_lib_p () - { - $opt_debug -- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -@@ -4401,9 +5257,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4427,7 +5283,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4446,7 +5302,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4475,7 +5331,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4487,7 +5343,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4557,12 +5413,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4574,28 +5430,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4686,15 +5542,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4706,10 +5563,16 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in -@@ -4718,12 +5581,12 @@ func_mode_link () - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4747,7 +5610,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4758,9 +5621,6 @@ func_mode_link () - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -- *-*-linux*) -- test "X$arg" = "X-lc" && continue -- ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -@@ -4770,7 +5630,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4782,8 +5642,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4791,12 +5651,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4863,13 +5723,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4922,8 +5786,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4938,9 +5802,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4968,24 +5832,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4997,7 +5864,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -5028,7 +5895,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -5040,7 +5907,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -5085,24 +5952,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -5127,7 +5995,7 @@ func_mode_link () - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval "arg=\"$export_dynamic_flag_spec\"" -+ eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi -@@ -5144,11 +6012,13 @@ func_mode_link () - else - shlib_search_path= - fi -- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" -- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -5169,12 +6039,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -5187,9 +6057,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5256,8 +6126,9 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library -@@ -5267,7 +6138,7 @@ func_mode_link () - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5288,11 +6159,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5377,7 +6248,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5390,7 +6261,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5404,7 +6276,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5415,17 +6288,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5488,11 +6365,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5538,7 +6415,7 @@ func_mode_link () - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -@@ -5546,8 +6423,8 @@ func_mode_link () - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5558,20 +6435,20 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv -@@ -5579,9 +6456,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5598,9 +6481,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5622,14 +6505,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5637,12 +6520,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5653,20 +6536,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5684,7 +6593,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5697,7 +6606,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5708,12 +6618,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5728,7 +6638,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5740,7 +6650,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5749,7 +6659,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5774,12 +6684,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5814,7 +6724,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5823,7 +6733,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5835,7 +6745,7 @@ func_mode_link () - shift - realname="$1" - shift -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" -@@ -5848,7 +6758,7 @@ func_mode_link () - versuffix="-$major" - ;; - esac -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -5877,7 +6787,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5933,7 +6843,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5955,7 +6865,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5969,13 +6879,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5989,7 +6899,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6001,12 +6911,12 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6083,27 +6993,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -6113,8 +7029,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -6130,7 +7048,7 @@ func_mode_link () - case $host in - *-*-darwin*) - depdepl= -- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp -@@ -6141,8 +7059,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -6152,7 +7070,7 @@ func_mode_link () - ;; - esac - else -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -@@ -6192,7 +7110,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6205,7 +7123,7 @@ func_mode_link () - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -- eval tmp_libs=\$$var -+ eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so -@@ -6250,13 +7168,13 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done -- eval $var=\$tmp_libs -+ eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs -@@ -6269,7 +7187,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6310,7 +7228,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6319,8 +7237,8 @@ func_mode_link () - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ -@@ -6330,8 +7248,8 @@ func_mode_link () - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result -@@ -6346,7 +7264,7 @@ func_mode_link () - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6544,7 +7462,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6612,10 +7530,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6631,7 +7549,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6642,7 +7560,7 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -@@ -6659,10 +7577,11 @@ func_mode_link () - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6676,7 +7595,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6686,7 +7605,7 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - -@@ -6698,7 +7617,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6715,7 +7634,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6764,18 +7683,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6789,7 +7708,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6807,18 +7726,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6840,7 +7759,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6857,15 +7776,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6885,10 +7816,10 @@ EOF - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6913,7 +7844,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6929,20 +7860,20 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6967,7 +7898,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7071,7 +8002,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7081,10 +8012,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -7101,10 +8032,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -7113,18 +8046,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- dep_rpath="$dep_rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -7133,40 +8066,38 @@ EOF - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done -- eval $runpath_var=\$rpath\$$runpath_var -- export $runpath_var -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then -- eval $shlibpath_var=\$shlibpath\$$shlibpath_var -- export $shlibpath_var -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. -- eval "shared_ext=\"$shrext_cmds\"" -- eval "library_names=\"$library_names_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -7178,7 +8109,7 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -@@ -7189,7 +8120,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7220,13 +8151,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7248,7 +8211,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7260,7 +8223,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7270,7 +8233,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7286,43 +8249,43 @@ EOF - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval "flag=\"$thread_safe_flag_spec\"" -- linker_flags="$linker_flags $flag" -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval "test_cmds=\"$module_expsym_cmds\"" -+ eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else -- eval "test_cmds=\"$module_cmds\"" -+ eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval "test_cmds=\"$archive_expsym_cmds\"" -+ eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else -- eval "test_cmds=\"$archive_cmds\"" -+ eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi -@@ -7366,10 +8329,13 @@ EOF - echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output -- delfiles="$delfiles $output" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7383,15 +8349,17 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext -- eval "test_cmds=\"$reload_cmds\"" -+ eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -7411,12 +8379,12 @@ EOF - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist -- eval "concat_cmds=\"$reload_cmds\"" -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 -@@ -7433,11 +8401,11 @@ EOF - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7450,9 +8418,9 @@ EOF - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - -@@ -7471,7 +8439,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7492,7 +8460,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7504,7 +8472,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7515,7 +8483,7 @@ EOF - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the -@@ -7539,23 +8507,23 @@ EOF - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. -- eval "cmds=\"\$cmds~\$RM $delfiles\"" -+ eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" -@@ -7564,7 +8532,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7576,8 +8544,8 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -@@ -7656,17 +8624,20 @@ EOF - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -@@ -7690,7 +8661,7 @@ EOF - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || echo timestamp > $libobj || exit $? -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - -@@ -7740,8 +8711,8 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi -@@ -7761,7 +8732,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7771,17 +8742,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7789,7 +8760,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7808,18 +8779,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7828,12 +8799,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7842,7 +8813,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - -@@ -7859,18 +8830,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7878,7 +8849,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - -@@ -7921,6 +8892,12 @@ EOF - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7943,7 +8920,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7951,7 +8928,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7966,6 +8943,13 @@ EOF - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7999,6 +8983,12 @@ EOF - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -8096,7 +9086,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -8104,10 +9094,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -8118,10 +9108,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -8139,7 +9129,7 @@ EOF - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -8163,18 +9153,28 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -- eval "cmds=\"$old_archive_cmds\"" -+ eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8189,7 +9189,7 @@ EOF - do - last_oldobj=$obj - done -- eval "test_cmds=\"$old_archive_cmds\"" -+ eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -8208,7 +9208,7 @@ EOF - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi -@@ -8216,9 +9216,9 @@ EOF - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then -- eval "cmds=\"\$concat_cmds\"" -+ eval cmds=\"\$concat_cmds\" - else -- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi -@@ -8268,12 +9268,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8284,12 +9295,14 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8303,10 +9316,11 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8318,7 +9332,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8327,7 +9341,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi -@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8432,9 +9446,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8443,24 +9457,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8486,18 +9499,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8525,19 +9537,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8547,7 +9559,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8556,7 +9568,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8564,12 +9576,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8577,7 +9589,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8589,16 +9600,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" ---- a/ltoptions.m4 -+++ b/ltoptions.m4 -@@ -8,7 +8,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ---- a/ltversion.m4 -+++ b/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3134 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.7a]) --m4_define([LT_PACKAGE_REVISION], [1.3134]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.7a' --macro_revision='1.3134' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 -@@ -7,7 +7,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -680,6 +680,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -798,6 +801,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5403,8 +5409,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6518,6 +6604,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6610,6 +6868,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6972,8 +7290,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7061,7 +7392,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7136,6 +7467,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7157,6 +7496,47 @@ fi - - - -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7363,6 +7743,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8091,7 +8590,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8180,7 +8680,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9181,7 +9694,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9299,8 +9813,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9318,8 +9832,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9365,8 +9879,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9496,7 +10010,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9509,22 +10029,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9549,22 +10082,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9813,23 +10396,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10643,7 +11298,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11439,7 +12094,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then - # since libbfd may not pull in the entirety of libiberty. - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14979,12 +15684,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -170,7 +170,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/zlib/configure -+++ b/zlib/configure -@@ -646,8 +646,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -774,6 +777,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_host_shared - ' -@@ -1428,6 +1432,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -4147,8 +4153,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5054,6 +5060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5070,6 +5150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5238,7 +5323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -5392,6 +5478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5484,6 +5743,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -5846,8 +6165,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -5935,7 +6267,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6010,6 +6342,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -6031,6 +6375,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -6241,6 +6621,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7269,7 +7768,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7358,7 +7858,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8359,7 +8872,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -8477,8 +8991,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -8496,8 +9010,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8543,8 +9057,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8674,7 +9188,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -8997,26 +9580,39 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- if test x$gcc_no_link = xyes; then -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -9830,7 +10485,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -10644,7 +11299,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -13322,12 +14027,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch new file mode 100644 index 0000000..c71e19e --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -0,0 +1,7115 @@ +From 3a2e7ec956568c503a678385ebee17098337feab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH] Use libtool 2.4 + +get libtool sysroot support + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + bfd/configure.ac | 2 +- + libtool.m4 | 1080 +++++++++++------ + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- + ltoptions.m4 | 2 +- + ltversion.m4 | 12 +- + lt~obsolete.m4 | 2 +- + 6 files changed, 2717 insertions(+), 1306 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -296,7 +296,7 @@ changequote(,)dnl + x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` + changequote([,])dnl + if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" + fi + + case "${host}" in +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -199,7 +205,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -746,15 +752,12 @@ _LT_EOF + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -980,6 +983,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + +@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + + AC_MSG_CHECKING([how to print strings]) + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) + ])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1623,7 +1705,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1667,10 +1749,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2342,7 +2483,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -2950,6 +3091,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -3016,7 +3162,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -3167,6 +3314,21 @@ tpf*) + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + + # LT_LIB_M + # -------- +@@ -3403,8 +3630,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3473,6 +3701,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t at _DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t at _DLSYM_CONST ++#else ++# define LT@&t at _DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3484,7 +3724,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t at _DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3551,6 +3791,13 @@ else + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4172,9 +4432,11 @@ case $host_os in + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + + # + # Check to make sure the PIC flag actually works. +@@ -4193,6 +4455,8 @@ fi + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. +@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4411,7 +4682,8 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4510,12 +4782,12 @@ _LT_EOF + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4529,8 +4801,8 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4548,8 +4820,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4595,8 +4867,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4726,7 +4998,7 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else +@@ -4737,7 +5009,7 @@ _LT_EOF + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -4781,20 +5053,63 @@ _LT_EOF + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4828,7 +5143,7 @@ _LT_EOF + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4836,7 +5151,7 @@ _LT_EOF + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4852,7 +5167,7 @@ _LT_EOF + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -4876,10 +5191,10 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4926,16 +5241,31 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -5020,7 +5350,7 @@ _LT_EOF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +@@ -5039,9 +5369,9 @@ _LT_EOF + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6445,6 +6825,29 @@ AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6453,6 +6856,7 @@ AC_LANG_POP + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6503,6 +6907,13 @@ public class foo { + }; + _LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6586,6 +7008,7 @@ else + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6622,7 +7045,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP +@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6992,7 +7423,8 @@ fi + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + +@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -7042,7 +7476,8 @@ fi + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; +- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh. + +-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -38,7 +37,6 @@ + # -n, --dry-run display commands without modifying any files + # --features display basic configuration information and exit + # --mode=MODE use operation mode MODE +-# --no-finish let install mode avoid finish commands + # --preserve-dup-deps don't remove duplicate dependency libraries + # --quiet, --silent don't print informational messages + # --no-quiet, --no-silent +@@ -71,17 +69,19 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -106,9 +106,6 @@ _LTECHO_EOF' + } + + # NLS nuisances: We save the old values to restore during execute mode. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). + lt_user_locale= + lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +@@ -121,15 +118,13 @@ do + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done ++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL + + $lt_unset CDPATH + + +- +- +- +- +- + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special +@@ -140,7 +135,7 @@ progpath="$0" + + + : ${CP="cp -f"} +-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} + : ${EGREP="/bin/grep -E"} + : ${FGREP="/bin/grep -F"} + : ${GREP="/bin/grep"} +@@ -149,7 +144,7 @@ progpath="$0" + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -169,6 +164,27 @@ IFS=" $lt_nl" + dirname="s,/[^/]*$,," + basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: +@@ -183,17 +199,31 @@ basename="s,^.*/,," + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + +-# Generated shell functions inserted here. + + # These SED scripts presuppose an absolute path with a trailing slash. + pathcar='s,^/\([^/]*\).*$,\1,' +@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ + # Re-`\' parameter expansions in output of double_quote_subst that were + # `\'-ed in input to the same. If an odd number of `\' preceded a '$' + # in input to double_quote_subst, that '$' was protected from expansion. +@@ -404,7 +443,7 @@ opt_warning=: + # name if it has been set yet. + func_echo () + { +- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + } + + # func_verbose arg... +@@ -430,14 +469,14 @@ func_echo_all () + # Echo program name prefixed message to standard error. + func_error () + { +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + } + + # func_warning arg... + # Echo program name prefixed warning message to standard error. + func_warning () + { +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +@@ -656,19 +695,35 @@ func_show_eval_locale () + fi + } + +- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} + + + # func_version + # Echo version message to standard output and exit. + func_version () + { ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ + N +- s/\n# // ++ s/\n# / / + b more + } + :go +@@ -685,7 +740,9 @@ func_version () + # Echo short help message to standard output and exit. + func_usage () + { +- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ +@@ -701,7 +758,10 @@ func_usage () + # unless 'noexit' is passed as argument. + func_help () + { ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* +@@ -714,7 +774,11 @@ func_help () + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p +- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret +@@ -726,12 +790,39 @@ func_help () + # exit_cmd. + func_missing_arg () + { +- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1." + exit_cmd=exit + } + +-exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + +@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" + magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-# $mode is unset + nonopt= +-execute_dlfiles= + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + extracted_archives= + extracted_serial=0 + +-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +- + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ + # func_fatal_configuration arg... + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. +@@ -850,130 +979,204 @@ func_enable_tag () + esac + } + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () + { ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift +- + case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" +- opt_debug='set -x' + $opt_debug + ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; +- + --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=: + ;; +- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false +- opt_verbose=: ++func_append preserve_args " $opt" + ;; +- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) +@@ -981,82 +1184,44 @@ func_enable_tag () + opt_duplicate_compiler_generated_deps=: + ;; + *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + +- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + +- # Darwin sucks +- eval "std_shrext=\"$shrext_cmds\"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} + ++## ----------- ## ++## Main. ## ++## ----------- ## + + # func_lalib_p file + # True iff FILE is a libtool `.la' library or `.lo' object file. +@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () + # temporary ltwrapper_script. + func_ltwrapper_scriptname () + { +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + } + + # func_ltwrapper_p file +@@ -1149,7 +1311,7 @@ func_execute_cmds () + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1172,6 +1334,37 @@ func_source () + } + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ + # func_infer_tag arg + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. +@@ -1184,8 +1377,7 @@ func_infer_tag () + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1204,8 +1396,7 @@ func_infer_tag () + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1274,6 +1465,486 @@ EOF + } + } + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +@@ -1314,12 +1985,12 @@ func_mode_compile () + ;; + + -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" ++ func_append later " $arg" + continue + ;; + +@@ -1340,15 +2011,14 @@ func_mode_compile () + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + +@@ -1364,8 +2034,7 @@ func_mode_compile () + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in +@@ -1496,17 +2165,16 @@ compiler." + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + +- if test -n "$fix_srcfile_path"; then +- eval "srcfile=\"$fix_srcfile_path\"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + +@@ -1526,7 +2194,7 @@ compiler." + + if test -z "$output_obj"; then + # Place PIC objects in $objdir +- command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ +@@ -1573,11 +2241,11 @@ compiler." + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then +- command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. +- command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +@@ -1622,13 +2290,13 @@ compiler." + } + + $opt_help || { +- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + } + + func_mode_help () + { + # We need to display help for each of the modes. +- case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." + ;; + + *) +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + +@@ -1819,13 +2487,13 @@ if $opt_help; then + else + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done +@@ -1854,13 +2522,16 @@ func_mode_execute () + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" +@@ -1882,7 +2553,7 @@ func_mode_execute () + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +@@ -1907,10 +2578,10 @@ func_mode_execute () + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. +- if eval test -z \"\$$shlibpath_var\"; then +- eval $shlibpath_var=\$dir ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" + else +- eval $shlibpath_var=\$dir:\$$shlibpath_var ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + +@@ -1939,8 +2610,7 @@ func_mode_execute () + ;; + esac + # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then +@@ -1972,22 +2642,59 @@ func_mode_execute () + fi + } + +-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { + $opt_debug +- libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +@@ -1997,7 +2704,7 @@ func_mode_finish () + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done +@@ -2006,53 +2713,55 @@ func_mode_finish () + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag=\"$hardcode_libdir_flag_spec\"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + +- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS + } + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... +@@ -2077,7 +2786,7 @@ func_mode_install () + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +@@ -2097,7 +2806,7 @@ func_mode_install () + do + arg2= + if test -n "$dest"; then +- files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi +@@ -2135,11 +2844,11 @@ func_mode_install () + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi +- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +@@ -2151,7 +2860,7 @@ func_mode_install () + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" +- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +@@ -2209,10 +2918,13 @@ func_mode_install () + case $file in + *.$libext) + # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" +@@ -2226,23 +2938,30 @@ func_mode_install () + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" +- dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +@@ -2315,7 +3034,7 @@ func_mode_install () + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) +@@ -2503,7 +3222,7 @@ func_mode_install () + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + +- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +@@ -2512,7 +3231,7 @@ func_mode_install () + fi + } + +-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -2559,6 +3278,18 @@ extern \"C\" { + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + /* External symbol declarations for the compiler. */\ + " + +@@ -2570,21 +3301,22 @@ extern \"C\" { + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { +- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + +@@ -2593,23 +3325,23 @@ extern \"C\" { + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols +- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { +- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } +@@ -2620,10 +3352,52 @@ extern \"C\" { + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" +- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { +@@ -2661,26 +3435,9 @@ typedef struct { + const char *name; + void *address; + } lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = + {\ + { \"$my_originator\", (void *) 0 }," +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + +@@ -2796,9 +3553,11 @@ func_win32_libid () + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static +- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ +@@ -2827,6 +3586,131 @@ func_win32_libid () + $ECHO "$win32_libid_type" + } + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + + # func_extract_an_archive dir oldlib +@@ -2917,7 +3801,7 @@ func_extract_archives () + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ +@@ -2932,7 +3816,7 @@ func_extract_archives () + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +@@ -3014,7 +3898,110 @@ func_fallback_echo () + _LTECHO_EOF' + } + ECHO=\"$qECHO\" +- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=\$0 ++ shift ++ for lt_opt ++ do ++ case \"\$lt_opt\" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` ++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. ++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` ++ cat \"\$lt_dump_D/\$lt_dump_F\" ++ exit 0 ++ ;; ++ --lt-*) ++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n \"\$lt_option_debug\"; then ++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from \$@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case \$lt_wr_arg in ++ --lt-*) ;; ++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core \${1+\"\$@\"} ++} ++ ++ # Parse options ++ func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` +@@ -3078,7 +4065,7 @@ _LTECHO_EOF' + + # relink executable if necessary + if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" +@@ -3102,6 +4089,18 @@ _LTECHO_EOF' + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ +@@ -3116,35 +4115,10 @@ _LTECHO_EOF' + " + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 ++ func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. +@@ -3158,166 +4132,6 @@ fi\ + } + + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +- + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout + # Must ONLY be called from within func_mode_link because +@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. + */ + EOF + cat <<"EOF" +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1; + #else +-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0; + #endif + +-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + + void *xmalloc (size_t num); + char *xstrdup (const char *string); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); + int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s); + void lt_setenv (const char *name, const char *value); + char *lt_extend_str (const char *orig_value, const char *add, int to_end); + void lt_update_exe_path (const char *name, const char *value); +@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); + EOF + + cat <"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero)); + for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i])); + } + + EOF +@@ -3706,7 +4529,9 @@ EOF + if (rval == -1) + { + /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target \"%s\": %s\n", ++ lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +@@ -3728,7 +4553,7 @@ xmalloc (size_t num) + { + void *p = (void *) malloc (num); + if (!p) +- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted"); + + return p; + } +@@ -3762,8 +4587,8 @@ check_executable (const char *path) + { + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3780,8 +4605,8 @@ make_executable (const char *path) + int rval = 0; + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) + int tmp_len; + char *concat_name; + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; +@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); +@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) +@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) + } + else + { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file \"%s\": %s", ++ tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); +@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { +- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); + #endif +@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) + return str; + } + ++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++ + static void +-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode, + const char *message, va_list ap) + { +- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, + } + + void +-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...) + { + va_list ap; + va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); + } + ++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++ + void + lt_setenv (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value)); + { + #ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) + void + lt_update_exe_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) + void + lt_update_lib_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4222,7 +5078,7 @@ EOF + func_win32_import_lib_p () + { + $opt_debug +- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +@@ -4401,9 +5257,9 @@ func_mode_link () + ;; + *) + if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg" + else +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg" + fi + prev= + continue +@@ -4427,7 +5283,7 @@ func_mode_link () + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; +@@ -4446,7 +5302,7 @@ func_mode_link () + moreargs= + for fil in `cat "$save_arg"` + do +-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + +@@ -4475,7 +5331,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -4487,7 +5343,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -4557,12 +5413,12 @@ func_mode_link () + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;; + esac + fi + prev= +@@ -4574,28 +5430,28 @@ func_mode_link () + continue + ;; + weak) +- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) +- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" +@@ -4686,15 +5542,16 @@ func_mode_link () + ;; + + -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -4706,10 +5563,16 @@ func_mode_link () + ;; + esac + case "$deplibs " in +- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;; + *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir" + ;; + esac + case $host in +@@ -4718,12 +5581,12 @@ func_mode_link () + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -4747,7 +5610,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) +@@ -4758,9 +5621,6 @@ func_mode_link () + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; +- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -4770,7 +5630,7 @@ func_mode_link () + ;; + esac + fi +- deplibs="$deplibs $arg" ++ func_append deplibs " $arg" + continue + ;; + +@@ -4782,8 +5642,8 @@ func_mode_link () + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler +@@ -4791,12 +5651,12 @@ func_mode_link () + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; +@@ -4863,13 +5723,17 @@ func_mode_link () + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + continue + ;; +@@ -4922,8 +5786,8 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4938,9 +5802,9 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4968,24 +5832,27 @@ func_mode_link () + arg="$func_quote_for_eval_result" + ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + continue + ;; + +@@ -4997,7 +5864,7 @@ func_mode_link () + + *.$objext) + # A standard object. +- objs="$objs $arg" ++ func_append objs " $arg" + ;; + + *.lo) +@@ -5028,7 +5895,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -5040,7 +5907,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -5085,24 +5952,25 @@ func_mode_link () + + *.$libext) + # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + ++ func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else +- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; +@@ -5127,7 +5995,7 @@ func_mode_link () + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval "arg=\"$export_dynamic_flag_spec\"" ++ eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi +@@ -5144,11 +6012,13 @@ func_mode_link () + else + shlib_search_path= + fi +- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" +- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" ++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + +@@ -5169,12 +6039,12 @@ func_mode_link () + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- libs="$libs $deplib" ++ func_append libs " $deplib" + done + + if test "$linkmode" = lib; then +@@ -5187,9 +6057,9 @@ func_mode_link () + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac +- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= +@@ -5256,8 +6126,9 @@ func_mode_link () + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= ++ func_resolve_sysroot "$lib" + case $lib in +- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library +@@ -5267,7 +6138,7 @@ func_mode_link () + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;; + esac + done + done +@@ -5288,11 +6159,11 @@ func_mode_link () + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5377,7 +6248,7 @@ func_mode_link () + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5390,7 +6261,8 @@ func_mode_link () + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then +@@ -5404,7 +6276,8 @@ func_mode_link () + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" +@@ -5415,17 +6288,21 @@ func_mode_link () + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; +- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" +@@ -5488,11 +6365,11 @@ func_mode_link () + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib" + fi + fi + continue +@@ -5538,7 +6415,7 @@ func_mode_link () + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi +@@ -5546,8 +6423,8 @@ func_mode_link () + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then +@@ -5558,20 +6435,20 @@ func_mode_link () + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv +@@ -5579,9 +6456,15 @@ func_mode_link () + + # Get the name of the library we link against. + linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi +@@ -5598,9 +6481,9 @@ func_mode_link () + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs" + else +- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen +@@ -5622,14 +6505,14 @@ func_mode_link () + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -5637,12 +6520,12 @@ func_mode_link () + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" +@@ -5653,20 +6536,46 @@ func_mode_link () + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then +@@ -5684,7 +6593,7 @@ func_mode_link () + + + if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no +@@ -5697,7 +6606,8 @@ func_mode_link () + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? +@@ -5708,12 +6618,12 @@ func_mode_link () + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... +@@ -5728,7 +6638,7 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;; + esac + fi + +@@ -5740,7 +6650,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5749,7 +6659,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5774,12 +6684,12 @@ func_mode_link () + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; +@@ -5814,7 +6724,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5823,7 +6733,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5835,7 +6745,7 @@ func_mode_link () + shift + realname="$1" + shift +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" +@@ -5848,7 +6758,7 @@ func_mode_link () + versuffix="-$major" + ;; + esac +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -5877,7 +6787,7 @@ func_mode_link () + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= +@@ -5933,7 +6843,7 @@ func_mode_link () + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -5955,7 +6865,7 @@ func_mode_link () + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then +@@ -5969,13 +6879,13 @@ func_mode_link () + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + +- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= +@@ -5989,7 +6899,7 @@ func_mode_link () + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +@@ -6001,12 +6911,12 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -6083,27 +6993,33 @@ func_mode_link () + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";; + esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + +- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then +@@ -6113,8 +7029,10 @@ func_mode_link () + case $deplib in + -L*) path="$deplib" ;; + *.la) ++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +@@ -6130,7 +7048,7 @@ func_mode_link () + case $host in + *-*-darwin*) + depdepl= +- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp +@@ -6141,8 +7059,8 @@ func_mode_link () + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi +@@ -6152,7 +7070,7 @@ func_mode_link () + ;; + esac + else +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +@@ -6192,7 +7110,7 @@ func_mode_link () + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= +@@ -6205,7 +7123,7 @@ func_mode_link () + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +- eval tmp_libs=\$$var ++ eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so +@@ -6250,13 +7168,13 @@ func_mode_link () + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + done +- eval $var=\$tmp_libs ++ eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs +@@ -6269,7 +7187,7 @@ func_mode_link () + ;; + esac + if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs +@@ -6310,7 +7228,7 @@ func_mode_link () + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" +- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs" + ;; + + lib) +@@ -6319,8 +7237,8 @@ func_mode_link () + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ +@@ -6330,8 +7248,8 @@ func_mode_link () + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result +@@ -6346,7 +7264,7 @@ func_mode_link () + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" ++ func_append libobjs " $objs" + fi + fi + +@@ -6544,7 +7462,7 @@ func_mode_link () + done + + # Make executables depend on our current version. +- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0" + ;; + + qnx) +@@ -6612,10 +7530,10 @@ func_mode_link () + fi + + func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + +- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -6631,7 +7549,7 @@ func_mode_link () + continue + fi + fi +- removelist="$removelist $p" ++ func_append removelist " $p" + ;; + *) ;; + esac +@@ -6642,7 +7560,7 @@ func_mode_link () + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` +@@ -6659,10 +7577,11 @@ func_mode_link () + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +@@ -6676,7 +7595,7 @@ func_mode_link () + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;; + esac + done + +@@ -6686,7 +7605,7 @@ func_mode_link () + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;; + esac + done + +@@ -6698,7 +7617,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. +@@ -6715,7 +7634,7 @@ func_mode_link () + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" ++ func_append deplibs " -lc" + fi + ;; + esac +@@ -6764,18 +7683,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6789,7 +7708,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6807,18 +7726,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6840,7 +7759,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6857,15 +7776,27 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | +@@ -6885,10 +7816,10 @@ EOF + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6913,7 +7844,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -6929,20 +7860,20 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6967,7 +7898,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -7071,7 +8002,7 @@ EOF + *) + case " $deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7081,10 +8012,10 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" +@@ -7101,10 +8032,12 @@ EOF + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -7113,18 +8046,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- dep_rpath="$dep_rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done +@@ -7133,40 +8066,38 @@ EOF + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else +- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done +- eval $runpath_var=\$rpath\$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then +- eval $shlibpath_var=\$shlibpath\$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. +- eval "shared_ext=\"$shrext_cmds\"" +- eval "library_names=\"$library_names_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -7178,7 +8109,7 @@ EOF + linknames= + for link + do +- linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic +@@ -7189,7 +8120,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= +@@ -7220,13 +8151,45 @@ EOF + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. +@@ -7248,7 +8211,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +@@ -7260,7 +8223,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7270,7 +8233,7 @@ EOF + case " $convenience " in + *" $test_deplib "*) ;; + *) +- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done +@@ -7286,43 +8249,43 @@ EOF + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval "flag=\"$thread_safe_flag_spec\"" +- linker_flags="$linker_flags $flag" ++ eval flag=\"$thread_safe_flag_spec\" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval "test_cmds=\"$module_expsym_cmds\"" ++ eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else +- eval "test_cmds=\"$module_cmds\"" ++ eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval "test_cmds=\"$archive_expsym_cmds\"" ++ eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else +- eval "test_cmds=\"$archive_cmds\"" ++ eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi +@@ -7366,10 +8329,13 @@ EOF + echo 'INPUT (' > $output + for obj in $save_libobjs + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output +- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" +@@ -7383,15 +8349,17 @@ EOF + fi + for obj + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext +- eval "test_cmds=\"$reload_cmds\"" ++ eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -7411,12 +8379,12 @@ EOF + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist +- eval "concat_cmds=\"$reload_cmds\"" ++ eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 +@@ -7433,11 +8401,11 @@ EOF + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi +- delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= +@@ -7450,9 +8418,9 @@ EOF + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + +@@ -7471,7 +8439,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7492,7 +8460,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then +@@ -7504,7 +8472,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7515,7 +8483,7 @@ EOF + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the +@@ -7539,23 +8507,23 @@ EOF + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. +- eval "cmds=\"\$cmds~\$RM $delfiles\"" ++ eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" +@@ -7564,7 +8532,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7576,8 +8544,8 @@ EOF + IFS="$save_ifs" + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then +@@ -7656,17 +8624,20 @@ EOF + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +@@ -7690,7 +8661,7 @@ EOF + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + +@@ -7740,8 +8711,8 @@ EOF + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi +@@ -7761,7 +8732,7 @@ EOF + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7771,17 +8742,17 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -7789,7 +8760,7 @@ EOF + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi +@@ -7808,18 +8779,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in +@@ -7828,12 +8799,12 @@ EOF + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -7842,7 +8813,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + +@@ -7859,18 +8830,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done +@@ -7878,7 +8849,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + +@@ -7921,6 +8892,12 @@ EOF + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' +@@ -7943,7 +8920,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7951,7 +8928,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7966,6 +8943,13 @@ EOF + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -7999,6 +8983,12 @@ EOF + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + +@@ -8096,7 +9086,7 @@ EOF + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" +@@ -8104,10 +9094,10 @@ EOF + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. +@@ -8118,10 +9108,10 @@ EOF + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have +@@ -8139,7 +9129,7 @@ EOF + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= +@@ -8163,18 +9153,28 @@ EOF + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; +- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi +- eval "cmds=\"$old_archive_cmds\"" ++ eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." +@@ -8189,7 +9189,7 @@ EOF + do + last_oldobj=$obj + done +- eval "test_cmds=\"$old_archive_cmds\"" ++ eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -8208,7 +9208,7 @@ EOF + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi +@@ -8216,9 +9216,9 @@ EOF + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then +- eval "cmds=\"\$concat_cmds\"" ++ eval cmds=\"\$concat_cmds\" + else +- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi +@@ -8268,12 +9268,23 @@ EOF + *.la) + func_basename "$deplib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -8284,12 +9295,14 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; +- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" +@@ -8303,10 +9316,11 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +@@ -8318,7 +9332,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= +@@ -8327,7 +9341,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi +@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" + exit $EXIT_SUCCESS + } + +-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +@@ -8432,9 +9446,9 @@ func_mode_uninstall () + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + +@@ -8443,24 +9457,23 @@ func_mode_uninstall () + + rmdirs= + +- origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then +- objdir="$origobjdir" ++ odir="$objdir" + else +- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" +- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + +- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in +- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + +@@ -8486,18 +9499,17 @@ func_mode_uninstall () + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done +- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$mode" in ++ case "$opt_mode" in + clean) +- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; +- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then +@@ -8525,19 +9537,19 @@ func_mode_uninstall () + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then +- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then +- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) +@@ -8547,7 +9559,7 @@ func_mode_uninstall () + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe +- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. +@@ -8556,7 +9568,7 @@ func_mode_uninstall () + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename +@@ -8564,12 +9576,12 @@ func_mode_uninstall () + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then +- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then +- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi +@@ -8577,7 +9589,6 @@ func_mode_uninstall () + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done +- objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do +@@ -8589,16 +9600,16 @@ func_mode_uninstall () + exit $exit_status + } + +-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +-test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 87% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a19505..b0e94ab 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From e36a4e05f900bbe6a8d744a93f3a407bc55c96f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc37..11a8110 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index 811134a503..f8c17c19ae 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -15788,6 +15791,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 96% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278..f4f1a06 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From 70f3f2d9e912ea777fa113e02cdbc3465a66e40d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50db..c49b8e8 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From 2182791a453f34bee6968b3e72848608cf7d7abe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,24 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 81% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752..c32867a 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From a0237ec2d1e58bd35c236df39dd5a06504c6d2ed Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle binutils/readelf.c | 1 + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ + gas/configure.ac | 3 +++ include/elf/mips.h | 1 + include/opcode/mips.h | 6 ++++++ ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 14 files changed, 62 insertions(+), 21 deletions(-) + 15 files changed, 65 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..59d6d11215 100755 --- a/gas/configure +++ b/gas/configure -@@ -13377,6 +13377,9 @@ _ACEOF +@@ -12722,6 +12722,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) -+ mips_cpu=xlp -+ ;; ++ mips_cpu=xlp ++ ;; mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/gas/configure.ac b/gas/configure.ac +index 6f32e55a1a..11c2e0d273 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -325,6 +325,9 @@ changequote([,])dnl + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 + ;; ++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;; + mipstx39 | mipstx39el) + mips_cpu=r3900 + ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763..463de80 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From ef4ad1cb9ff1b5a871ffa792a71b3ad6d14eb3dc Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b050..6acde1f 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 2f7f2389764ef1d699f6ad32057314024b7e84e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61..0000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 97% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d..a794719 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From 392d474a72d37b669f53ab9f0fa913b958af93f6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d3..0000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 91% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf7..bfc9346 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -49,9 +49,9 @@ do_install_class-native () { # Split out libbfd-*.so so including perf doesn't include extra stuff PACKAGE_BEFORE_PN += "libbfd" -FILES_libbfd = "${libdir}/libbfd-*.so" +FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (df0a770 -> 1dd3cf7) Message-ID: <158241594507.27522.17168916709727131516@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard df0a770 libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES discard 81b1399 wayland: add a patch to address build errors due to incorrect deps discard b9fcc16 webkitgtk: enable gobject-introspection for armv7a discard 3da604a perf: Correct the substitution of python shebangs discard 3b55a93 psplash: Fix systemd service dependencies discard dada717 binutils: Fix x86_64 override usage discard 9b7ba2d binutils: Upgrade to 2.34 release discard 6d0a2c2 gmp: Upgrade to 6.2.0 discard 5058325 go: Upgrade to 1.13.8 minor release discard 474ea3d ninja: upgrade 1.9.0 -> 1.10.0 discard 02c06ae libxcrypt: Upgrade to 4.4.14 release discard e4647e5 toolchain-shar-extract: ignore timestamp on decompress discard a8ad24f oeqa/logparser: correctly set test result markers discard ecffa85 jquery: fix upstream version check discard 155cf8c psplash: add systemd support discard 6ed18bb musl: Update to final 1.2.0 release discard e08fdee qemu: bump default reference kernel to v5.4 discard a3646f2 linux-yocto: drop 4.19 recipes discard c4a6530 linux-yocto/5.4: update to -rt11 discard c4b513d linux-yocto: perf: Make perf able to build with latest libbfd discard 51339af linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix discard df413f6 devsrc: fix objtool generation for v5.4+ discard 0428b2b linux-yocto: fix PV discard 46de7a6 linux-yocto/5.2: update to v5.2.29 discard db827b4 linux-yocto/5.4: update to v5.4.20 discard 8929c38 linux-yocto/5.4: update to v5.4.18 discard 4898d26 HACK: extra debug discard 902d0df rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 1a90e33 sstatesig: Log timestamps for hashequiv in reprodubile builds discard b2c792a HACK: signing: Add extra test debug discard 919e2b4 glew/curl: specify exclusive package configs discard b7cf349 base.bbclass: extend PACKAGECONFIG for conflict package configs add ca323f7 linux-yocto/5.4: update to v5.4.18 add cdbe188 linux-yocto/5.4: update to v5.4.20 add d320a03 linux-yocto/5.2: update to v5.2.29 add e597fe7 linux-yocto: fix PV add 3009e82 devsrc: fix objtool generation for v5.4+ add 8dfaf1a linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix add 16e9436 linux-yocto: perf: Make perf able to build with latest libbfd add dd40767 linux-yocto/5.4: update to -rt11 add c250dbd qemu: bump default reference kernel to v5.4 add 732cac0 musl: Update to final 1.2.0 release add 28ad55f jquery: fix upstream version check add 1cd6e9a oeqa/logparser: correctly set test result markers add 319ca22 toolchain-shar-extract: ignore timestamp on decompress add f0c50a5 libxcrypt: Upgrade to 4.4.14 release add d052940 go: Upgrade to 1.13.8 minor release add 35c052d gmp: Upgrade to 6.2.0 add 82f7d5c binutils: Upgrade to 2.34 release add bbf9e8a binutils: Fix x86_64 override usage add 3f93173 perf: Correct the substitution of python shebangs add 0f4f69d webkitgtk: enable gobject-introspection for armv7a add fb1f1a1 wayland: add a patch to address build errors due to incorrect deps add 7214af1 libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES new 8c561f8 base.bbclass: extend PACKAGECONFIG for conflict package configs new 06afd4e glew/curl: specify exclusive package configs new 09af21a HACK: signing: Add extra test debug new ee3b41f sstatesig: Log timestamps for hashequiv in reprodubile builds new e0dad9c rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 702d878 HACK: extra debug new b25f1cb linux-yocto: drop 4.19 recipes new 625efb3 psplash: add systemd support new d1aebdc ninja: upgrade 1.9.0 -> 1.10.0 new 1dd3cf7 psplash: Fix systemd service dependencies This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (df0a770) \ N -- N -- N refs/heads/master-next (1dd3cf7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:08 +0000 Subject: [oe-commits] [openembedded-core] 03/10: HACK: signing: Add extra test debug In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.503412328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 09af21ae0378bd7551b951ecf0a53174d6a7a646 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:06 +0000 Subject: [oe-commits] [openembedded-core] 01/10: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.3B68F2328DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8c561f8dd3b3b98753aa45ee1e9f077380073d86 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:09 +0000 Subject: [oe-commits] [openembedded-core] 04/10: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.5A7592328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ee3b41fad9da0027e1168768d05bd83da76c4ad2 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:07 +0000 Subject: [oe-commits] [openembedded-core] 02/10: glew/curl: specify exclusive package configs In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.45B402328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 06afd4e1e7492c2b709bcd899ad13d5236f5ff6b Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:11 +0000 Subject: [oe-commits] [openembedded-core] 06/10: HACK: extra debug In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.6F3752328E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 702d878491651a1160ceecaa93de638e6bc25901 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:15 +0000 Subject: [oe-commits] [openembedded-core] 10/10: psplash: Fix systemd service dependencies In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.981E62328EC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1dd3cf7cca0bc34d22bb36ad27652040f0679917 Author: Richard Purdie AuthorDate: Sat Feb 22 13:55:25 2020 +0000 psplash: Fix systemd service dependencies Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Also, psplash-systemd requires psplash-start, not the other way around as the splash creates the fifo which the other then needs to open. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 2 +- meta/recipes-core/psplash/files/psplash-systemd.service | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index 9de8f63..af9d5d6 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -1,7 +1,7 @@ [Unit] Description=Start psplash boot splash screen DefaultDependencies=no -Requires=psplash-systemd.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f420..249aa54 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,8 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:13 +0000 Subject: [oe-commits] [openembedded-core] 08/10: psplash: add systemd support In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.842362328EA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 625efb321478dfc0590d6da9a042e6734e5518c8 Author: Stefan Agner AuthorDate: Wed Jan 22 14:20:24 2020 +0000 psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++--- .../psplash/files/psplash-start.service | 10 ++++++ .../psplash/files/psplash-systemd.service | 10 ++++++ meta/recipes-core/psplash/psplash_git.bb | 38 +++++++++++++--------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866..f58e043 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000..9de8f63 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000..e14f420 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1..6ff0393 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -66,7 +68,11 @@ python __anonymous() { S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -97,8 +103,17 @@ python do_compile () { } do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,8 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." - -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:12 +0000 Subject: [oe-commits] [openembedded-core] 07/10: linux-yocto: drop 4.19 recipes In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.79CCA2328E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b25f1cb861201a795bcff1f55e23ae763487d0a8 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:01 2020 -0500 linux-yocto: drop 4.19 recipes 5.4 is the next LTS kernel, so we drop the 4.19 recipes from master. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 44 ------------------- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 32 -------------- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 50 ---------------------- 3 files changed, 126 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb deleted file mode 100644 index b6e0a1e..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v4.19/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "2fbf678238302f33b3aec5a2cba829f260744f24" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.19.87" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb deleted file mode 100644 index e2626ab..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v4.19/standard/tiny/base" -KBRANCH_qemuarm ?= "v4.19/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.19.87" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine_qemuarm ?= "bd239fb802a15c2759ea456dd1f09f5e106fc88a" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb deleted file mode 100644 index c6e482a..0000000 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ /dev/null @@ -1,50 +0,0 @@ -KBRANCH ?= "v4.19/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.19/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.19/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.19/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.19/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.19/standard/base" -KBRANCH_qemux86-64 ?= "v4.19/standard/base" -KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "19fa1657d1d82d01647c6f73a2bbf39305505294" -SRCREV_machine_qemuarm64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips ?= "8fb7ab96b84852ee3d9e1d9d9e7bc35e1249b653" -SRCREV_machine_qemuppc ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86-64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips64 ?= "c8a036abd7d469013dddab15a23e0d2dde1d0000" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.87" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:10 +0000 Subject: [oe-commits] [openembedded-core] 05/10: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.64C332328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e0dad9c87a23c9255cc73fb14f7035472523e16d Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 22 23:59:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 22 Feb 2020 23:59:14 +0000 Subject: [oe-commits] [openembedded-core] 09/10: ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <158241594507.27522.17168916709727131516@git.openembedded.org> References: <158241594507.27522.17168916709727131516@git.openembedded.org> Message-ID: <20200222235905.8EDC02328EB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d1aebdcc70eeb932254e5117a2f2e5d13c40ac15 Author: Upgrade Helper AuthorDate: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 ---------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch deleted file mode 100644 index 7fd7791..0000000 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -Date: Mon, 24 Dec 2018 03:13:16 +0200 -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 - -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward -compatibility macro. Should help avoid hardcoding platform detection. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/disk_interface.cc b/src/disk_interface.cc -index d4c2fb0..dc297c4 100644 ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { - // that it doesn't exist. - if (st.st_mtime == 0) - return 1; --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) -+#if defined(_AIX) -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; -+#elif defined(__APPLE__) - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + - st.st_mtimespec.tv_nsec); --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar -- // For bionic, C and POSIX API is always enabled. -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; --#elif defined(_AIX) -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; - #else - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; - #endif --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb similarity index 87% rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8..bdc6365 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:00:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:00:18 +0000 Subject: [oe-commits] [bitbake] branch master updated: lib/bb/utils.py: Preserve ownership of symlink Message-ID: <158241601833.28612.13917405931538279089@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new 6a0b6dd lib/bb/utils.py: Preserve ownership of symlink 6a0b6dd is described below commit 6a0b6dd17c6d842960d448114b252e92c55dea33 Author: Daisuke Yamane AuthorDate: Sat Feb 22 06:17:14 2020 +0000 lib/bb/utils.py: Preserve ownership of symlink Yocto Bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13806 Uncomment lchown() to preserve ownership of symlink. Signed-off-by: Daisuke Yamane Signed-off-by: Richard Purdie --- lib/bb/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 47805d0..5f5767c 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -864,7 +864,7 @@ def copyfile(src, dest, newmtime = None, sstat = None): if destexists and not stat.S_ISDIR(dstat[stat.ST_MODE]): os.unlink(dest) os.symlink(target, dest) - #os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) + os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) return os.lstat(dest) except Exception as e: logger.warning("copyfile: failed to create symlink %s to %s (%s)" % (dest, target, e)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:00:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:00:22 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (799cf68 -> 77c6678) Message-ID: <158241602291.28819.12213763588562447330@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. discard 799cf68 lib/bb/utils.py: Preserve ownership of symlink discard 086e247 runqueue: Possible tid handling optimisation add 6a0b6dd lib/bb/utils.py: Preserve ownership of symlink new 77c6678 runqueue: Possible tid handling optimisation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (799cf68) \ N -- N -- N refs/heads/master-next (77c6678) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:00:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:00:23 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158241602291.28819.12213763588562447330@git.openembedded.org> References: <158241602291.28819.12213763588562447330@git.openembedded.org> Message-ID: <20200223000023.1C8832328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 77c6678467d854aff36592f867f88e3050f0538f Author: Richard Purdie AuthorDate: Fri Dec 13 16:16:58 2019 +0000 runqueue: Possible tid handling optimisation Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..2e4f8cd 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -24,12 +24,16 @@ import pickle from multiprocessing import Process import shlex import pprint +from collections import namedtuple bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") __find_sha256__ = re.compile( r'(?i)(? References: <158241636725.1551.14677205928917917435@git.openembedded.org> Message-ID: <20200223000607.704132328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 396c0935047c7415a322801f22534c8308b590df Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:07 2020 +0100 valgrind: exclude one more failing test for arm64 valgrind's test suite isn't generally run by upstream on arm64, so let's simply disable the failing test and establish a set that works. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index acf4fd1..a3a0c6e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -1,3 +1,4 @@ +gdbserver_tests/hgtls cachegrind/tests/ann1 callgrind/tests/simwork1 callgrind/tests/simwork2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:06:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:06:07 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1dd3cf7 -> d95efa3) Message-ID: <158241636725.1551.14677205928917917435@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 1dd3cf7 psplash: Fix systemd service dependencies new 627ea9e valgrind: replace a submitted patch with one that was merged new 396c093 valgrind: exclude one more failing test for arm64 new 6027b27 mdadm: fix more ptests new d95efa3 mdadm: drop from PTESTS_SLOW The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/ptest-packagelists.inc | 2 +- ...pthread_detatch-call-portable-across-plat.patch | 65 ++++++++++++++++++---- .../valgrind/valgrind/remove-for-aarch64 | 1 + meta/recipes-extended/mdadm/files/run-ptest | 2 +- 4 files changed, 57 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:06:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:06:10 +0000 Subject: [oe-commits] [openembedded-core] 03/04: mdadm: fix more ptests In-Reply-To: <158241636725.1551.14677205928917917435@git.openembedded.org> References: <158241636725.1551.14677205928917917435@git.openembedded.org> Message-ID: <20200223000607.7AA5B2328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6027b27e224ff7e02ebc20c8e355362864bdbde6 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:08 2020 +0100 mdadm: fix more ptests Particularly: 1. set $dir, so supplementary utilities can be found 2. disable integrity checks as they take more time than any other test Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/files/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest index 7959c05..fae8071 100644 --- a/meta/recipes-extended/mdadm/files/run-ptest +++ b/meta/recipes-extended/mdadm/files/run-ptest @@ -2,6 +2,6 @@ mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail -./test --keep-going +dir=. ./test --keep-going --disable-integrity rm -rf /mdadm-testing-dir/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:06:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:06:08 +0000 Subject: [oe-commits] [openembedded-core] 01/04: valgrind: replace a submitted patch with one that was merged In-Reply-To: <158241636725.1551.14677205928917917435@git.openembedded.org> References: <158241636725.1551.14677205928917917435@git.openembedded.org> Message-ID: <20200223000607.66EE12328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 627ea9ef46b2f0563d8ebdb2b6757279c6284f85 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:06 2020 +0100 valgrind: replace a submitted patch with one that was merged This addresses a ptest failure in particular that the submitted patch caused. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 65 ++++++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch index 44d707a..f407d81 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -1,25 +1,31 @@ -From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 27 Jan 2020 17:17:19 -0800 -Subject: [PATCH] tests: Make pthread_detatch call portable across platforms +Date: Mon, 27 Jan 2020 19:50:04 -0800 +Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable + across platforms -pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type -this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable -across glibc and musl +pthread_t is opaque type therefore we can not apply simple arithmetic to +variables of pthread_t type this test needs to pass a invalid pthread_t +handle, typcasting to uintptr_t works too and is portable across glibc and +musl Fixes | pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' | 24 | pthread_detach(thread + 8); | | ^ -Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +[ bvanassche: reformatted patch description and fixed up line numbers ] + +Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a] Signed-off-by: Khem Raj --- - drd/tests/pth_detached3.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drd/tests/pth_detached3.c | 3 ++- + drd/tests/pth_detached3.stderr.exp1 | 4 ++-- + drd/tests/pth_detached3.stderr.exp2 | 4 ++-- + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef11a..efeb15b72 100644 +index c02eef1..efeb15b 100644 --- a/drd/tests/pth_detached3.c +++ b/drd/tests/pth_detached3.c @@ -4,6 +4,7 @@ @@ -39,6 +45,43 @@ index c02eef11a..efeb15b72 100644 fprintf(stderr, "Finished.\n"); +diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1 +index 58412ec..8dd58ba 100644 +--- a/drd/tests/pth_detached3.stderr.exp1 ++++ b/drd/tests/pth_detached3.stderr.exp1 +@@ -1,11 +1,11 @@ + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + +diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2 +index bdc5cf8..e82dee1 100644 +--- a/drd/tests/pth_detached3.stderr.exp2 ++++ b/drd/tests/pth_detached3.stderr.exp2 +@@ -2,12 +2,12 @@ + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + -- -2.25.0 +2.9.3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 00:06:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 00:06:11 +0000 Subject: [oe-commits] [openembedded-core] 04/04: mdadm: drop from PTESTS_SLOW In-Reply-To: <158241636725.1551.14677205928917917435@git.openembedded.org> References: <158241636725.1551.14677205928917917435@git.openembedded.org> Message-ID: <20200223000607.83C0B2328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d95efa3f1fefbc1f05df3620538df85b4e0f1ca2 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:09 2020 +0100 mdadm: drop from PTESTS_SLOW There are two primary reasons for this: 1. mdadm test suite tends to work like this do_action sleep arbitrary_amount check_result This is unreliable, and arbitrary_amount may or may not be enough. I have confirmed this by increasing the amount, and seeing more tests pass than before. 2. The test suite aborts half way through because one of the mdadm binaries segfaults. This indicates that upstream isn't actually running the suite anymore, and in this situation we shouldn't be relying on it either. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 752a088..6e77085 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -58,6 +58,7 @@ PTESTS_FAST = "\ # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py +# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts #" PTESTS_SLOW = "\ @@ -69,7 +70,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ lttng-tools-ptest \ - mdadm-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 08:11:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 08:11:13 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: luajit: Upgrade to 2.1.0-beta3 Message-ID: <158244547389.8752.1650910767692913092@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 5c5395e luajit: Upgrade to 2.1.0-beta3 5c5395e is described below commit 5c5395ea79c317b17d09fbe7e8a515ffb8b5d550 Author: Leo Yan AuthorDate: Sun Feb 23 05:35:49 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 88% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..afa60db 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -3,12 +3,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ - file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" +PV = "2.1.0+${SRCPV}" +SRCREV = "8271c643c21d1b2f344e339f559f2de6f3663191" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1" S = "${WORKDIR}/git" @@ -90,8 +87,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:27 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: linux-yocto: drop 4.19 recipes Message-ID: <158245250719.14358.4331029537006414756@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. The following commit(s) were added to refs/heads/master by this push: new bb5c2b8 linux-yocto: drop 4.19 recipes bb5c2b8 is described below commit bb5c2b8d6a875a773271d7cae08f55f0fd8e9156 Author: Bruce Ashfield AuthorDate: Fri Feb 21 12:46:01 2020 -0500 linux-yocto: drop 4.19 recipes 5.4 is the next LTS kernel, so we drop the 4.19 recipes from master. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 44 ------------------- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 32 -------------- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 50 ---------------------- 3 files changed, 126 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb deleted file mode 100644 index b6e0a1e..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v4.19/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "2fbf678238302f33b3aec5a2cba829f260744f24" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.19.87" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb deleted file mode 100644 index e2626ab..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v4.19/standard/tiny/base" -KBRANCH_qemuarm ?= "v4.19/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.19.87" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine_qemuarm ?= "bd239fb802a15c2759ea456dd1f09f5e106fc88a" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb deleted file mode 100644 index c6e482a..0000000 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ /dev/null @@ -1,50 +0,0 @@ -KBRANCH ?= "v4.19/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.19/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.19/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.19/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.19/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.19/standard/base" -KBRANCH_qemux86-64 ?= "v4.19/standard/base" -KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "19fa1657d1d82d01647c6f73a2bbf39305505294" -SRCREV_machine_qemuarm64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips ?= "8fb7ab96b84852ee3d9e1d9d9e7bc35e1249b653" -SRCREV_machine_qemuppc ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86-64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips64 ?= "c8a036abd7d469013dddab15a23e0d2dde1d0000" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.87" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:32 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d95efa3 -> d8b77d8) Message-ID: <158245251294.14635.16064671764136442890@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard d95efa3 mdadm: drop from PTESTS_SLOW discard 6027b27 mdadm: fix more ptests discard 396c093 valgrind: exclude one more failing test for arm64 discard 627ea9e valgrind: replace a submitted patch with one that was merged discard 1dd3cf7 psplash: Fix systemd service dependencies discard d1aebdc ninja: upgrade 1.9.0 -> 1.10.0 discard 625efb3 psplash: add systemd support discard b25f1cb linux-yocto: drop 4.19 recipes discard 702d878 HACK: extra debug discard e0dad9c rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard ee3b41f sstatesig: Log timestamps for hashequiv in reprodubile builds discard 09af21a HACK: signing: Add extra test debug discard 06afd4e glew/curl: specify exclusive package configs discard 8c561f8 base.bbclass: extend PACKAGECONFIG for conflict package configs add bb5c2b8 linux-yocto: drop 4.19 recipes new e2a4889 base.bbclass: extend PACKAGECONFIG for conflict package configs new ecc9b8d glew/curl: specify exclusive package configs new f926695 HACK: signing: Add extra test debug new 2ecef21 sstatesig: Log timestamps for hashequiv in reprodubile builds new 09009f2 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 3dc8d62 HACK: extra debug new 29cbe3a psplash: add systemd support new 46f9ddc ninja: upgrade 1.9.0 -> 1.10.0 new 9c140b2 psplash: Fix systemd service dependencies new dda7337 valgrind: replace a submitted patch with one that was merged new 92389b7 valgrind: exclude one more failing test for arm64 new 7e53d19 mdadm: fix more ptests new 2f94454 mdadm: drop from PTESTS_SLOW new c51587e package: Correct variable dependecies new d8b77d8 package_ipk: Add missing variables to the task hash This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d95efa3) \ N -- N -- N refs/heads/master-next (d8b77d8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/package.bbclass | 6 ++++-- meta/classes/package_ipk.bbclass | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:35 +0000 Subject: [oe-commits] [openembedded-core] 03/15: HACK: signing: Add extra test debug In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.2D0702328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f92669522d2992211abcea77ea8e837384a52ef5 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:33 +0000 Subject: [oe-commits] [openembedded-core] 01/15: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.1B2D22328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e2a48899ce46e201289ab6e894245e7461d2c97f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:36 +0000 Subject: [oe-commits] [openembedded-core] 04/15: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.352492328E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ecef212b79dee86bc577385a52fc121c2202a4c Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:34 +0000 Subject: [oe-commits] [openembedded-core] 02/15: glew/curl: specify exclusive package configs In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.23BD82328E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ecc9b8de329b433920951a47c44a34679cd3052f Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:38 +0000 Subject: [oe-commits] [openembedded-core] 06/15: HACK: extra debug In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.460A62328EA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3dc8d620e404cf8126f434eb9c8fc32d6be89505 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:37 +0000 Subject: [oe-commits] [openembedded-core] 05/15: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.3DB492328E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 09009f26b78850b4df6366c2a4817ef5e3379fad Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:41 +0000 Subject: [oe-commits] [openembedded-core] 09/15: psplash: Fix systemd service dependencies In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.6F2522328ED@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9c140b2ed5eff33fb2d93af0460eec7d58d88881 Author: Richard Purdie AuthorDate: Sat Feb 22 13:55:25 2020 +0000 psplash: Fix systemd service dependencies Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Also, psplash-systemd requires psplash-start, not the other way around as the splash creates the fifo which the other then needs to open. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 2 +- meta/recipes-core/psplash/files/psplash-systemd.service | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index 9de8f63..af9d5d6 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -1,7 +1,7 @@ [Unit] Description=Start psplash boot splash screen DefaultDependencies=no -Requires=psplash-systemd.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f420..249aa54 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,8 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:39 +0000 Subject: [oe-commits] [openembedded-core] 07/15: psplash: add systemd support In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.5505D2328EB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 29cbe3a33bc03c3162dd7630d0da3a47e7de8a17 Author: Stefan Agner AuthorDate: Wed Jan 22 14:20:24 2020 +0000 psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++--- .../psplash/files/psplash-start.service | 10 ++++++ .../psplash/files/psplash-systemd.service | 10 ++++++ meta/recipes-core/psplash/psplash_git.bb | 38 +++++++++++++--------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866..f58e043 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000..9de8f63 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000..e14f420 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1..6ff0393 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -66,7 +68,11 @@ python __anonymous() { S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -97,8 +103,17 @@ python do_compile () { } do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,8 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." - -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:43 +0000 Subject: [oe-commits] [openembedded-core] 11/15: valgrind: exclude one more failing test for arm64 In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.8CD902328DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 92389b7f513658b4b9a77da8c163021be4c89600 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:07 2020 +0100 valgrind: exclude one more failing test for arm64 valgrind's test suite isn't generally run by upstream on arm64, so let's simply disable the failing test and establish a set that works. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index acf4fd1..a3a0c6e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -1,3 +1,4 @@ +gdbserver_tests/hgtls cachegrind/tests/ann1 callgrind/tests/simwork1 callgrind/tests/simwork2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:45 +0000 Subject: [oe-commits] [openembedded-core] 13/15: mdadm: drop from PTESTS_SLOW In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.A2CD12328F1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2f94454ce5c726b69bdef48d05aed4ed33ac4ad2 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:09 2020 +0100 mdadm: drop from PTESTS_SLOW There are two primary reasons for this: 1. mdadm test suite tends to work like this do_action sleep arbitrary_amount check_result This is unreliable, and arbitrary_amount may or may not be enough. I have confirmed this by increasing the amount, and seeing more tests pass than before. 2. The test suite aborts half way through because one of the mdadm binaries segfaults. This indicates that upstream isn't actually running the suite anymore, and in this situation we shouldn't be relying on it either. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 752a088..6e77085 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -58,6 +58,7 @@ PTESTS_FAST = "\ # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py +# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts #" PTESTS_SLOW = "\ @@ -69,7 +70,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ lttng-tools-ptest \ - mdadm-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:44 +0000 Subject: [oe-commits] [openembedded-core] 12/15: mdadm: fix more ptests In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.9775C2328EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7e53d19bdb99960a6ec7c20d8c8fe3e5a8b4b981 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:08 2020 +0100 mdadm: fix more ptests Particularly: 1. set $dir, so supplementary utilities can be found 2. disable integrity checks as they take more time than any other test Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/files/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest index 7959c05..fae8071 100644 --- a/meta/recipes-extended/mdadm/files/run-ptest +++ b/meta/recipes-extended/mdadm/files/run-ptest @@ -2,6 +2,6 @@ mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail -./test --keep-going +dir=. ./test --keep-going --disable-integrity rm -rf /mdadm-testing-dir/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:40 +0000 Subject: [oe-commits] [openembedded-core] 08/15: ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.61EBB2328EC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 46f9ddc5ce8fde06f43b434b6dd1d1fd4a4e8a54 Author: Upgrade Helper AuthorDate: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 ---------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch deleted file mode 100644 index 7fd7791..0000000 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -Date: Mon, 24 Dec 2018 03:13:16 +0200 -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 - -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward -compatibility macro. Should help avoid hardcoding platform detection. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/disk_interface.cc b/src/disk_interface.cc -index d4c2fb0..dc297c4 100644 ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { - // that it doesn't exist. - if (st.st_mtime == 0) - return 1; --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) -+#if defined(_AIX) -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; -+#elif defined(__APPLE__) - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + - st.st_mtimespec.tv_nsec); --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar -- // For bionic, C and POSIX API is always enabled. -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; --#elif defined(_AIX) -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; - #else - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; - #endif --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb similarity index 87% rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8..bdc6365 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:46 +0000 Subject: [oe-commits] [openembedded-core] 14/15: package: Correct variable dependecies In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.AE6662328E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c51587ee10c869df9a670c51db29d9b77a1397f3 Author: Richard Purdie AuthorDate: Sun Feb 23 10:03:54 2020 +0000 package: Correct variable dependecies Ensure that the plain variable X is also added to the dependencies as well as X_. Allow the funciton to be called with a different variable list too. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1efc396..d4c6a90 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -2171,10 +2171,12 @@ python package_depchains() { # iteration, we need to list them here: PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm pkg_postinst_ontarget INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES SYSTEMD_SERVICE LICENSE SECTION pkg_preinst pkg_prerm RREPLACES GROUPMEMS_PARAM SYSTEMD_AUTO_ENABLE SKIP_FILEDEPS PRIVATE_LIBS" -def gen_packagevar(d): +def gen_packagevar(d, pkgvars="PACKAGEVARS"): ret = [] pkgs = (d.getVar("PACKAGES") or "").split() - vars = (d.getVar("PACKAGEVARS") or "").split() + vars = (d.getVar(pkgvars) or "").split() + for v in vars: + ret.append(v) for p in pkgs: for v in vars: ret.append(v + "_" + p) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:47 +0000 Subject: [oe-commits] [openembedded-core] 15/15: package_ipk: Add missing variables to the task hash In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.BB6DD2328DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d8b77d837b1a788426a1ccaff66bf26ccef55706 Author: Richard Purdie AuthorDate: Sun Feb 23 10:05:01 2020 +0000 package_ipk: Add missing variables to the task hash Several variables used by the task are not included in the hash, as highlighted by recent changes to MAINTAINERS not causing rebuilds. Fix this. Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 25d1ab7..c008559 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -237,6 +237,10 @@ def ipk_write_pkg(pkg, d): cleanupcontrol(root) bb.utils.unlockfile(lf) +# Have to list any variables referenced as X_ that aren't in pkgdata here +IPKEXTRAVARS = "PRIORITY MAINTAINER PACKAGE_ARCH HOMEPAGE" +ipk_write_pkg[vardeps] += "${@gen_packagevar(d, 'IPKEXTRAVARS')}" + # Otherwise allarch packages may change depending on override configuration ipk_write_pkg[vardepsexclude] = "OVERRIDES" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 10:08:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 10:08:42 +0000 Subject: [oe-commits] [openembedded-core] 10/15: valgrind: replace a submitted patch with one that was merged In-Reply-To: <158245251294.14635.16064671764136442890@git.openembedded.org> References: <158245251294.14635.16064671764136442890@git.openembedded.org> Message-ID: <20200223100833.7F1BF2328EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dda73372b34d7bc162c38466cccbfa98b6da619d Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:06 2020 +0100 valgrind: replace a submitted patch with one that was merged This addresses a ptest failure in particular that the submitted patch caused. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 65 ++++++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch index 44d707a..f407d81 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -1,25 +1,31 @@ -From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 27 Jan 2020 17:17:19 -0800 -Subject: [PATCH] tests: Make pthread_detatch call portable across platforms +Date: Mon, 27 Jan 2020 19:50:04 -0800 +Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable + across platforms -pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type -this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable -across glibc and musl +pthread_t is opaque type therefore we can not apply simple arithmetic to +variables of pthread_t type this test needs to pass a invalid pthread_t +handle, typcasting to uintptr_t works too and is portable across glibc and +musl Fixes | pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' | 24 | pthread_detach(thread + 8); | | ^ -Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +[ bvanassche: reformatted patch description and fixed up line numbers ] + +Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a] Signed-off-by: Khem Raj --- - drd/tests/pth_detached3.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drd/tests/pth_detached3.c | 3 ++- + drd/tests/pth_detached3.stderr.exp1 | 4 ++-- + drd/tests/pth_detached3.stderr.exp2 | 4 ++-- + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef11a..efeb15b72 100644 +index c02eef1..efeb15b 100644 --- a/drd/tests/pth_detached3.c +++ b/drd/tests/pth_detached3.c @@ -4,6 +4,7 @@ @@ -39,6 +45,43 @@ index c02eef11a..efeb15b72 100644 fprintf(stderr, "Finished.\n"); +diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1 +index 58412ec..8dd58ba 100644 +--- a/drd/tests/pth_detached3.stderr.exp1 ++++ b/drd/tests/pth_detached3.stderr.exp1 +@@ -1,11 +1,11 @@ + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + +diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2 +index bdc5cf8..e82dee1 100644 +--- a/drd/tests/pth_detached3.stderr.exp2 ++++ b/drd/tests/pth_detached3.stderr.exp2 +@@ -2,12 +2,12 @@ + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + -- -2.25.0 +2.9.3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:20 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (5c5395e -> 5617b12) Message-ID: <158247296088.27344.14167733835044565405@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 5c5395e luajit: Upgrade to 2.1.0-beta3 discard fb802f5 oprofile: Fix build with bfd 2.34+ discard 17dab2c ipmiutil: gzip man pages with out timestamp new d280be7 oprofile: Fix build with bfd 2.34+ new 975b6b2 libqmi: Upgrade 1.24.2 -> 1.24.4 new 3fd86f3 modemmanager: Upgrade 1.12.4 -> 1.12.6 new c87588d python-h2: Add missing RDEPENDS on hpack and hyperframe new df0745a Ply: Add recipe for git version new f95eb5b python3-networkx: upgrade 2.3 -> 2.4 new 5617b12 luajit: Upgrade to 2.1.0-beta3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5c5395e) \ N -- N -- N refs/heads/master-next (5617b12) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../libqmi/{libqmi_1.24.2.bb => libqmi_1.24.4.bb} | 4 ++-- ...demmanager_1.12.4.bb => modemmanager_1.12.6.bb} | 4 ++-- meta-oe/recipes-devtools/ply/ply_git.bb | 15 +++++++++++++ ...ess-times-from-changing-resulting-gzip-md.patch | 25 ---------------------- meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb | 1 - .../recipes-connectivity/python-h2/python-h2.inc | 2 ++ .../recipes-devtools/python/python-networkx.inc | 2 -- .../python/python3-networkx_2.3.bb | 8 ------- .../python/python3-networkx_2.4.bb | 8 +++++++ 9 files changed, 29 insertions(+), 40 deletions(-) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.2.bb => libqmi_1.24.4.bb} (85%) rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.12.4.bb => modemmanager_1.12.6.bb} (93%) create mode 100644 meta-oe/recipes-devtools/ply/ply_git.bb delete mode 100644 meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch delete mode 100644 meta-python/recipes-devtools/python/python3-networkx_2.3.bb create mode 100644 meta-python/recipes-devtools/python/python3-networkx_2.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:22 +0000 Subject: [oe-commits] [meta-openembedded] 02/07: libqmi: Upgrade 1.24.2 -> 1.24.4 In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.591132328F2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 975b6b20e19a8b1515302b8b61125fd1a32f0f38 Author: Adrian Bunk AuthorDate: Sun Feb 23 14:18:13 2020 +0200 libqmi: Upgrade 1.24.2 -> 1.24.4 Upgrade on the 1.24 stable branch. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../libqmi/{libqmi_1.24.2.bb => libqmi_1.24.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.2.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb similarity index 85% rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.24.2.bb rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb index 35a58d2..5512828 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.2.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb @@ -14,8 +14,8 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "e49c419112d708b5301af7ccc2c090ff" -SRC_URI[sha256sum] = "4ae4e476f960dbc0d04b1c0368776eb78edffd4421f3e4c074bb2bfb6375b282" +SRC_URI[md5sum] = "be6539fde54fec1fc9d852db201c8560" +SRC_URI[sha256sum] = "0316badec92ff32f51fe6278e6046968d2272a26608995deedd8e4afb563918a" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:23 +0000 Subject: [oe-commits] [meta-openembedded] 03/07: modemmanager: Upgrade 1.12.4 -> 1.12.6 In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.62EBA2328F3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3fd86f3fa3021da760f26bc70755142d35f77f9b Author: Adrian Bunk AuthorDate: Sun Feb 23 14:18:14 2020 +0200 modemmanager: Upgrade 1.12.4 -> 1.12.6 Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../modemmanager/{modemmanager_1.12.4.bb => modemmanager_1.12.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb similarity index 93% rename from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb rename to meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb index 1f64be0..ef6ba6b 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.4.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb @@ -14,8 +14,8 @@ DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ " -SRC_URI[md5sum] = "22280110d75c87a89786a317aa9cee04" -SRC_URI[sha256sum] = "852d61755e0c1a8d0c609b17192d742b324fdd2e513f3ed64b228befb859a95b" +SRC_URI[md5sum] = "796bf7bfc156c4229cef1a9cb8c79f37" +SRC_URI[sha256sum] = "2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c" S = "${WORKDIR}/ModemManager-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:24 +0000 Subject: [oe-commits] [meta-openembedded] 04/07: python-h2: Add missing RDEPENDS on hpack and hyperframe In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.6BBD82328F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c87588d6143d8f15dfe1e115da6339406eb34600 Author: Jonatan P?lsson AuthorDate: Sun Feb 23 13:43:23 2020 +0100 python-h2: Add missing RDEPENDS on hpack and hyperframe Signed-off-by: Jonatan P?lsson Signed-off-by: Khem Raj --- meta-python/recipes-connectivity/python-h2/python-h2.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-connectivity/python-h2/python-h2.inc b/meta-python/recipes-connectivity/python-h2/python-h2.inc index 42629c2..c457836 100644 --- a/meta-python/recipes-connectivity/python-h2/python-h2.inc +++ b/meta-python/recipes-connectivity/python-h2/python-h2.inc @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "950b5a62a2a608dc4547a01edf99aa8f" SRC_URI[sha256sum] = "b8a32bd282594424c0ac55845377eea13fa54fe4a8db012f3a198ed923dc3ab4" inherit pypi + +RDEPENDS_${PN} += "${PYTHON_PN}-hpack ${PYTHON_PN}-hyperframe" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:21 +0000 Subject: [oe-commits] [meta-openembedded] 01/07: oprofile: Fix build with bfd 2.34+ In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.4FC392328F1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d280be7d5d6238ef7024c1a89277dabbe7e08c2b Author: Khem Raj AuthorDate: Thu Feb 20 08:19:24 2020 -0800 oprofile: Fix build with bfd 2.34+ Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc index a9ee775..0e1e2ed 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://root-home-dir.patch \ file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ file://0001-replace-sym_iterator-0-with-sym_iterator.patch \ + file://0001-Use-new-bfd-APIs-from-2.34.patch \ " UPSTREAM_CHECK_REGEX = "oprofile-(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/" diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch new file mode 100644 index 0000000..faf56d1 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch @@ -0,0 +1,79 @@ +From 34745fb066a266ae6bbb15d08466d4d2cb6a2110 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Feb 2020 08:11:04 -0800 +Subject: [PATCH] Use new bfd APIs from 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libutil++/bfd_support.cpp | 10 +++++----- + opjitconv/create_bfd.c | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..e53a1530 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -137,7 +137,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +188,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = bfd_section_size(sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +346,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = bfd_section_size(section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +819,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((bfd_section_flags(section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= bfd_section_size(section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..5c0e9152 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -86,12 +86,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ bfd_set_section_vma(section, vma); ++ if (bfd_set_section_size(section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (bfd_set_section_flags(section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:25 +0000 Subject: [oe-commits] [meta-openembedded] 05/07: Ply: Add recipe for git version In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.743EA2328F5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit df0745a2452e7b053c4ab81d928382064a3a0c22 Author: Leo Yan AuthorDate: Sun Feb 23 12:55:14 2020 +0000 Ply: Add recipe for git version Ply is a light-weight eBPF tool which compiles ply script or one-liner to Linux BPF programs and attaches to kprobes and tracepoints. It doesn't require external dependencies except libc, so it's very friendly for embedded system usage. This patch adds the recipe to support ply building for git version. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/ply/ply_git.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb new file mode 100644 index 0000000..7d693b3 --- /dev/null +++ b/meta-oe/recipes-devtools/ply/ply_git.bb @@ -0,0 +1,15 @@ +SUMMARY = "Ply: A light-weight dynamic tracer for eBPF" +HOMEPAGE = "https://github.com/iovisor/ply" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "bison-native" + +SRC_URI = "git://github.com/iovisor/ply" +SRCREV = "aa5b9ac31307ec1acece818be334ef801c802a12" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +COMPATIBLE_HOST = "(x86_64.*|aarch64.*|arm.*|powerpc.*)-linux" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:26 +0000 Subject: [oe-commits] [meta-openembedded] 06/07: python3-networkx: upgrade 2.3 -> 2.4 In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.7D2722328F9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f95eb5ba9e5779b376e82bc081d9243ef76e7c31 Author: Yi Zhao AuthorDate: Sun Feb 23 23:03:43 2020 +0800 python3-networkx: upgrade 2.3 -> 2.4 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-networkx.inc | 2 -- meta-python/recipes-devtools/python/python3-networkx_2.3.bb | 8 -------- meta-python/recipes-devtools/python/python3-networkx_2.4.bb | 8 ++++++++ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-networkx.inc b/meta-python/recipes-devtools/python/python-networkx.inc index a4c31b2..4bca636 100644 --- a/meta-python/recipes-devtools/python/python-networkx.inc +++ b/meta-python/recipes-devtools/python/python-networkx.inc @@ -3,8 +3,6 @@ LICENSE = "BSD-3-Clause" inherit pypi -PYPI_PACKAGE_EXT = "zip" - RDEPENDS_${PN} += "\ ${PYTHON_PN}-decorator \ " diff --git a/meta-python/recipes-devtools/python/python3-networkx_2.3.bb b/meta-python/recipes-devtools/python/python3-networkx_2.3.bb deleted file mode 100644 index 8feb6da..0000000 --- a/meta-python/recipes-devtools/python/python3-networkx_2.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require python-networkx.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd" - -SRC_URI[md5sum] = "320d3f6c7872732baa63cedafddadea9" -SRC_URI[sha256sum] = "8311ddef63cf5c5c5e7c1d0212dd141d9a1fe3f474915281b73597ed5f1d4e3d" - -inherit setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-networkx_2.4.bb b/meta-python/recipes-devtools/python/python3-networkx_2.4.bb new file mode 100644 index 0000000..efa82e2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-networkx_2.4.bb @@ -0,0 +1,8 @@ +require python-networkx.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd" + +SRC_URI[md5sum] = "63e3fdc9d3a46bcabc776acc5ea5fe48" +SRC_URI[sha256sum] = "f8f4ff0b6f96e4f9b16af6b84622597b5334bf9cae8cf9b2e42e7985d5c95c64" + +inherit setuptools3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 15:49:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 15:49:27 +0000 Subject: [oe-commits] [meta-openembedded] 07/07: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158247296088.27344.14167733835044565405@git.openembedded.org> References: <158247296088.27344.14167733835044565405@git.openembedded.org> Message-ID: <20200223154921.8631D2328FB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5617b12744934ad21e079ae966fad45605a56c54 Author: Leo Yan AuthorDate: Sun Feb 23 05:35:49 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 88% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..afa60db 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -3,12 +3,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ - file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" +PV = "2.1.0+${SRCPV}" +SRCREV = "8271c643c21d1b2f344e339f559f2de6f3663191" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1" S = "${WORKDIR}/git" @@ -90,8 +87,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:49 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (bb5c2b8 -> 0bfb2e9) Message-ID: <158250088965.29486.16045278220266283412@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from bb5c2b8 linux-yocto: drop 4.19 recipes new 4e9d46a valgrind: replace a submitted patch with one that was merged new f9c9532 valgrind: exclude one more failing test for arm64 new a8983d6 mdadm: fix more ptests new e21021d mdadm: drop from PTESTS_SLOW new c392401 package: Correct variable dependecies new 0bfb2e9 package_ipk: Add missing variables to the task hash The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/package.bbclass | 6 +- meta/classes/package_ipk.bbclass | 4 ++ meta/conf/distro/include/ptest-packagelists.inc | 2 +- ...pthread_detatch-call-portable-across-plat.patch | 65 ++++++++++++++++++---- .../valgrind/valgrind/remove-for-aarch64 | 1 + meta/recipes-extended/mdadm/files/run-ptest | 2 +- 6 files changed, 65 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:51 +0000 Subject: [oe-commits] [openembedded-core] 02/06: valgrind: exclude one more failing test for arm64 In-Reply-To: <158250088965.29486.16045278220266283412@git.openembedded.org> References: <158250088965.29486.16045278220266283412@git.openembedded.org> Message-ID: <20200223233449.D4068232918@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f9c953295a44f74c6394d155dfa080384f637806 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:07 2020 +0100 valgrind: exclude one more failing test for arm64 valgrind's test suite isn't generally run by upstream on arm64, so let's simply disable the failing test and establish a set that works. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index acf4fd1..a3a0c6e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -1,3 +1,4 @@ +gdbserver_tests/hgtls cachegrind/tests/ann1 callgrind/tests/simwork1 callgrind/tests/simwork2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:53 +0000 Subject: [oe-commits] [openembedded-core] 04/06: mdadm: drop from PTESTS_SLOW In-Reply-To: <158250088965.29486.16045278220266283412@git.openembedded.org> References: <158250088965.29486.16045278220266283412@git.openembedded.org> Message-ID: <20200223233449.EA2AC23292C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e21021dc00ec76c76cc361e15bc83a89083c9e72 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:09 2020 +0100 mdadm: drop from PTESTS_SLOW There are two primary reasons for this: 1. mdadm test suite tends to work like this do_action sleep arbitrary_amount check_result This is unreliable, and arbitrary_amount may or may not be enough. I have confirmed this by increasing the amount, and seeing more tests pass than before. 2. The test suite aborts half way through because one of the mdadm binaries segfaults. This indicates that upstream isn't actually running the suite anymore, and in this situation we shouldn't be relying on it either. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 752a088..6e77085 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -58,6 +58,7 @@ PTESTS_FAST = "\ # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py +# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts #" PTESTS_SLOW = "\ @@ -69,7 +70,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ lttng-tools-ptest \ - mdadm-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:52 +0000 Subject: [oe-commits] [openembedded-core] 03/06: mdadm: fix more ptests In-Reply-To: <158250088965.29486.16045278220266283412@git.openembedded.org> References: <158250088965.29486.16045278220266283412@git.openembedded.org> Message-ID: <20200223233449.E006F23292B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a8983d659b27219a0d70e56882727ceddd0f4331 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:08 2020 +0100 mdadm: fix more ptests Particularly: 1. set $dir, so supplementary utilities can be found 2. disable integrity checks as they take more time than any other test Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/files/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest index 7959c05..fae8071 100644 --- a/meta/recipes-extended/mdadm/files/run-ptest +++ b/meta/recipes-extended/mdadm/files/run-ptest @@ -2,6 +2,6 @@ mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail -./test --keep-going +dir=. ./test --keep-going --disable-integrity rm -rf /mdadm-testing-dir/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:50 +0000 Subject: [oe-commits] [openembedded-core] 01/06: valgrind: replace a submitted patch with one that was merged In-Reply-To: <158250088965.29486.16045278220266283412@git.openembedded.org> References: <158250088965.29486.16045278220266283412@git.openembedded.org> Message-ID: <20200223233449.C71B5232917@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4e9d46a570f7d7d1981a24f90c5e919b1f73c8b5 Author: Alexander Kanavin AuthorDate: Sat Feb 22 23:09:06 2020 +0100 valgrind: replace a submitted patch with one that was merged This addresses a ptest failure in particular that the submitted patch caused. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...pthread_detatch-call-portable-across-plat.patch | 65 ++++++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch index 44d707a..f407d81 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -1,25 +1,31 @@ -From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 27 Jan 2020 17:17:19 -0800 -Subject: [PATCH] tests: Make pthread_detatch call portable across platforms +Date: Mon, 27 Jan 2020 19:50:04 -0800 +Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable + across platforms -pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type -this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable -across glibc and musl +pthread_t is opaque type therefore we can not apply simple arithmetic to +variables of pthread_t type this test needs to pass a invalid pthread_t +handle, typcasting to uintptr_t works too and is portable across glibc and +musl Fixes | pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' | 24 | pthread_detach(thread + 8); | | ^ -Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +[ bvanassche: reformatted patch description and fixed up line numbers ] + +Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a] Signed-off-by: Khem Raj --- - drd/tests/pth_detached3.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drd/tests/pth_detached3.c | 3 ++- + drd/tests/pth_detached3.stderr.exp1 | 4 ++-- + drd/tests/pth_detached3.stderr.exp2 | 4 ++-- + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef11a..efeb15b72 100644 +index c02eef1..efeb15b 100644 --- a/drd/tests/pth_detached3.c +++ b/drd/tests/pth_detached3.c @@ -4,6 +4,7 @@ @@ -39,6 +45,43 @@ index c02eef11a..efeb15b72 100644 fprintf(stderr, "Finished.\n"); +diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1 +index 58412ec..8dd58ba 100644 +--- a/drd/tests/pth_detached3.stderr.exp1 ++++ b/drd/tests/pth_detached3.stderr.exp1 +@@ -1,11 +1,11 @@ + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + +diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2 +index bdc5cf8..e82dee1 100644 +--- a/drd/tests/pth_detached3.stderr.exp2 ++++ b/drd/tests/pth_detached3.stderr.exp2 +@@ -2,12 +2,12 @@ + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + -- -2.25.0 +2.9.3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:54 +0000 Subject: [oe-commits] [openembedded-core] 05/06: package: Correct variable dependecies In-Reply-To: <158250088965.29486.16045278220266283412@git.openembedded.org> References: <158250088965.29486.16045278220266283412@git.openembedded.org> Message-ID: <20200223233450.014E6232932@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c392401e10ff43d10b7e57c9d552522a02c91878 Author: Richard Purdie AuthorDate: Sun Feb 23 10:03:54 2020 +0000 package: Correct variable dependecies Ensure that the plain variable X is also added to the dependencies as well as X_. Allow the funciton to be called with a different variable list too. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1efc396..d4c6a90 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -2171,10 +2171,12 @@ python package_depchains() { # iteration, we need to list them here: PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm pkg_postinst_ontarget INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES SYSTEMD_SERVICE LICENSE SECTION pkg_preinst pkg_prerm RREPLACES GROUPMEMS_PARAM SYSTEMD_AUTO_ENABLE SKIP_FILEDEPS PRIVATE_LIBS" -def gen_packagevar(d): +def gen_packagevar(d, pkgvars="PACKAGEVARS"): ret = [] pkgs = (d.getVar("PACKAGES") or "").split() - vars = (d.getVar("PACKAGEVARS") or "").split() + vars = (d.getVar(pkgvars) or "").split() + for v in vars: + ret.append(v) for p in pkgs: for v in vars: ret.append(v + "_" + p) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:34:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:34:55 +0000 Subject: [oe-commits] [openembedded-core] 06/06: package_ipk: Add missing variables to the task hash In-Reply-To: <158250088965.29486.16045278220266283412@git.openembedded.org> References: <158250088965.29486.16045278220266283412@git.openembedded.org> Message-ID: <20200223233450.0A8DA232934@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0bfb2e984062e2a00f8989d26aebb89b112d81d2 Author: Richard Purdie AuthorDate: Sun Feb 23 10:05:01 2020 +0000 package_ipk: Add missing variables to the task hash Several variables used by the task are not included in the hash, as highlighted by recent changes to MAINTAINERS not causing rebuilds. Fix this. Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 25d1ab7..c008559 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -237,6 +237,10 @@ def ipk_write_pkg(pkg, d): cleanupcontrol(root) bb.utils.unlockfile(lf) +# Have to list any variables referenced as X_ that aren't in pkgdata here +IPKEXTRAVARS = "PRIORITY MAINTAINER PACKAGE_ARCH HOMEPAGE" +ipk_write_pkg[vardeps] += "${@gen_packagevar(d, 'IPKEXTRAVARS')}" + # Otherwise allarch packages may change depending on override configuration ipk_write_pkg[vardepsexclude] = "OVERRIDES" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:01 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d8b77d8 -> 970f637) Message-ID: <158250090190.30011.8260298492864380545@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard d8b77d8 package_ipk: Add missing variables to the task hash discard c51587e package: Correct variable dependecies discard 2f94454 mdadm: drop from PTESTS_SLOW discard 7e53d19 mdadm: fix more ptests discard 92389b7 valgrind: exclude one more failing test for arm64 discard dda7337 valgrind: replace a submitted patch with one that was merged discard 9c140b2 psplash: Fix systemd service dependencies discard 46f9ddc ninja: upgrade 1.9.0 -> 1.10.0 discard 29cbe3a psplash: add systemd support discard 3dc8d62 HACK: extra debug discard 09009f2 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 2ecef21 sstatesig: Log timestamps for hashequiv in reprodubile builds discard f926695 HACK: signing: Add extra test debug discard ecc9b8d glew/curl: specify exclusive package configs discard e2a4889 base.bbclass: extend PACKAGECONFIG for conflict package configs add 4e9d46a valgrind: replace a submitted patch with one that was merged add f9c9532 valgrind: exclude one more failing test for arm64 add a8983d6 mdadm: fix more ptests add e21021d mdadm: drop from PTESTS_SLOW add c392401 package: Correct variable dependecies add 0bfb2e9 package_ipk: Add missing variables to the task hash new c95d08b base.bbclass: extend PACKAGECONFIG for conflict package configs new 14fabbb glew/curl: specify exclusive package configs new df9eeec HACK: signing: Add extra test debug new 07ec86d sstatesig: Log timestamps for hashequiv in reprodubile builds new 5399c02 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new dadacb7 HACK: extra debug new eec514e psplash: add systemd support new 36af6d5 ninja: upgrade 1.9.0 -> 1.10.0 new 3ebf982 psplash: Fix systemd service dependencies new 4eace19 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new a597632 webkitgtk: Remove unused DEPENDS on pulseaudio new 2364a41 webkitgtk: Remove obsolete gtk2 packageconfig new 869f5bb webkitgtk: Remove the unused DEPENDS on libidn new 43f37ed systemd: Add a PACKAGECONFIG for libidn2 new 379bde7 libidn: Move to meta-oe new e05f8f9 Revert "psmisc: Fix dependency for USE_NLS=no" new 49126bc clutter: Build cluter with the GDK backend new 34cf804 wayland: add ptest new 970f637 apt: Inherit upstream-version-is-even This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d8b77d8) \ N -- N -- N refs/heads/master-next (970f637) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/maintainers.inc | 1 - meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-core/systemd/systemd_244.3.bb | 1 + meta/recipes-devtools/apt/apt.inc | 2 +- .../libidn/0001-idn-format-security-warnings.patch | 181 --------------------- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 ---- .../libidn/libidn/dont-depend-on-help2man.patch | 23 --- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---- meta/recipes-extended/libidn/libidn_1.35.bb | 42 ----- meta/recipes-extended/psmisc/psmisc.inc | 2 +- meta/recipes-graphics/clutter/clutter-1.0.inc | 4 +- meta/recipes-graphics/wayland/wayland/run-ptest | 17 ++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 14 +- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 7 +- 14 files changed, 39 insertions(+), 325 deletions(-) delete mode 100644 meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch delete mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn_1.35.bb create mode 100644 meta/recipes-graphics/wayland/wayland/run-ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:04 +0000 Subject: [oe-commits] [openembedded-core] 03/19: HACK: signing: Add extra test debug In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.4C98523292B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df9eeec7218e69ff1019e703461b79449793f763 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:02 +0000 Subject: [oe-commits] [openembedded-core] 01/19: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.2D007232917@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c95d08b1ff60e29dbcc78947392c6a02ef1d14f7 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:05 +0000 Subject: [oe-commits] [openembedded-core] 04/19: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.58FC523292C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 07ec86d1f50983ff9e9f03cdbf372a023278a32b Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:03 +0000 Subject: [oe-commits] [openembedded-core] 02/19: glew/curl: specify exclusive package configs In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.3BBB2232918@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 14fabbbbbc35622d03d340ff67ec173c3f1968ba Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:07 +0000 Subject: [oe-commits] [openembedded-core] 06/19: HACK: extra debug In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.71F11232934@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dadacb703319c51a0d97ff1608777dd0375f63bb Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:10 +0000 Subject: [oe-commits] [openembedded-core] 09/19: psplash: Fix systemd service dependencies In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.96933232941@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3ebf9821cb3659239291c933e3236ae42223c5fd Author: Richard Purdie AuthorDate: Sat Feb 22 13:55:25 2020 +0000 psplash: Fix systemd service dependencies Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Also, psplash-systemd requires psplash-start, not the other way around as the splash creates the fifo which the other then needs to open. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 2 +- meta/recipes-core/psplash/files/psplash-systemd.service | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index 9de8f63..af9d5d6 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -1,7 +1,7 @@ [Unit] Description=Start psplash boot splash screen DefaultDependencies=no -Requires=psplash-systemd.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f420..249aa54 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,8 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:06 +0000 Subject: [oe-commits] [openembedded-core] 05/19: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.656C8232932@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5399c029d09e0c8e77f5bc02b0e5b17b9cefe54b Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:11 +0000 Subject: [oe-commits] [openembedded-core] 10/19: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.A599F232942@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4eace197326ba9c2b0318cd560c7ea2c9e35cd6b Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:28 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements opengl is optional. x11 can be replaced with wayland. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a48a976..51fba94 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:12 +0000 Subject: [oe-commits] [openembedded-core] 11/19: webkitgtk: Remove unused DEPENDS on pulseaudio In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.B3962232912@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a597632b78bb270da1e9f4afbfde8a5ee7740510 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:29 2020 +0200 webkitgtk: Remove unused DEPENDS on pulseaudio Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 51fba94..80ed427 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -33,7 +33,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+" DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:08 +0000 Subject: [oe-commits] [openembedded-core] 07/19: psplash: add systemd support In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.7DAF923293D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eec514e9b8648613919c94f588bab32717f885bc Author: Stefan Agner AuthorDate: Wed Jan 22 14:20:24 2020 +0000 psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++--- .../psplash/files/psplash-start.service | 10 ++++++ .../psplash/files/psplash-systemd.service | 10 ++++++ meta/recipes-core/psplash/psplash_git.bb | 38 +++++++++++++--------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866..f58e043 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000..9de8f63 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000..e14f420 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1..6ff0393 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -66,7 +68,11 @@ python __anonymous() { S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -97,8 +103,17 @@ python do_compile () { } do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,8 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." - -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:13 +0000 Subject: [oe-commits] [openembedded-core] 12/19: webkitgtk: Remove obsolete gtk2 packageconfig In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.BF267232943@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2364a416dd5a23f58c0968729a6f0de97a730f6d Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:30 2020 +0200 webkitgtk: Remove obsolete gtk2 packageconfig Upstream no longer supports GTK2 plugins. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 80ed427..a9c0086 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -48,7 +48,6 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" -PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:14 +0000 Subject: [oe-commits] [openembedded-core] 13/19: webkitgtk: Remove the unused DEPENDS on libidn In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.D2773232917@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 869f5bb3044314d8d3c635ff2fb9dd970c96f949 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:31 2020 +0200 webkitgtk: Remove the unused DEPENDS on libidn Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a9c0086..7b3d16d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,7 +30,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:09 +0000 Subject: [oe-commits] [openembedded-core] 08/19: ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.8A4AF23293E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 36af6d5deb9b9ed7e3cfa619f39fbaab7ad75291 Author: Upgrade Helper AuthorDate: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 ---------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch deleted file mode 100644 index 7fd7791..0000000 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -Date: Mon, 24 Dec 2018 03:13:16 +0200 -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 - -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward -compatibility macro. Should help avoid hardcoding platform detection. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/disk_interface.cc b/src/disk_interface.cc -index d4c2fb0..dc297c4 100644 ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { - // that it doesn't exist. - if (st.st_mtime == 0) - return 1; --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) -+#if defined(_AIX) -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; -+#elif defined(__APPLE__) - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + - st.st_mtimespec.tv_nsec); --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar -- // For bionic, C and POSIX API is always enabled. -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; --#elif defined(_AIX) -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; - #else - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; - #endif --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb similarity index 87% rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8..bdc6365 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:15 +0000 Subject: [oe-commits] [openembedded-core] 14/19: systemd: Add a PACKAGECONFIG for libidn2 In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.DE9CB232918@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 43f37ede7a4169ebd5d25c466c4a2ab20a419666 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:32 2020 +0200 systemd: Add a PACKAGECONFIG for libidn2 Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index b686519..5d86341 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -138,6 +138,7 @@ PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2" PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:16 +0000 Subject: [oe-commits] [openembedded-core] 15/19: libidn: Move to meta-oe In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233502.EAD6923292B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 379bde7502cf13b07714f5880edd6705e04342b6 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:33 2020 +0200 libidn: Move to meta-oe There are no users left in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../libidn/0001-idn-format-security-warnings.patch | 181 --------------------- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 ---- .../libidn/libidn/dont-depend-on-help2man.patch | 23 --- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---- meta/recipes-extended/libidn/libidn_1.35.bb | 42 ----- 6 files changed, 316 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5f1dae9..8f612ac 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -340,7 +340,6 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton " RECIPE_MAINTAINER_pn-libical = "Ross Burton " RECIPE_MAINTAINER_pn-libice = "Armin Kuster " RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " -RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " diff --git a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch deleted file mode 100644 index 5adc7d9..0000000 --- a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Tue, 28 Jun 2016 12:43:31 +0100 -Subject: [PATCH] idn: fix printf() format security warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../../libidn-1.32/src/idn.c: In function 'main': -| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security] -| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security] -| fprintf (stderr, _("Type each input string on a line by itself, " -| ^~~~~~~ -| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, errno, _("input error")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ - -Signed-off-by: Andr? Draszik ---- -Upstream-Status: Pending - - src/idn.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/src/idn.c b/src/idn.c -index be1c7d1..68e4291 100644 ---- a/src/idn.c -+++ b/src/idn.c -@@ -170,7 +170,7 @@ main (int argc, char *argv[]) - (args_info.idna_to_unicode_given ? 1 : 0) + - (args_info.nfkc_given ? 1 : 0) != 1) - { -- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -+ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); - usage (EXIT_FAILURE); - } - -@@ -185,7 +185,7 @@ main (int argc, char *argv[]) - if (!args_info.quiet_given - && args_info.inputs_num == 0 - && isatty (fileno (stdin))) -- fprintf (stderr, _("Type each input string on a line by itself, " -+ fprintf (stderr, "%s", _("Type each input string on a line by itself, " - "terminated by a newline character.\n")); - - do -@@ -197,7 +197,7 @@ main (int argc, char *argv[]) - if (feof (stdin)) - break; - -- error (EXIT_FAILURE, errno, _("input error")); -+ error (EXIT_FAILURE, errno, "%s", _("input error")); - } - - if (strlen (line) > 0) -@@ -215,7 +215,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -240,7 +240,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -277,7 +277,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, &len); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - if (args_info.debug_given) -@@ -336,7 +336,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - p = stringprep_utf8_to_locale (r); -@@ -360,7 +360,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, NULL); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - if (args_info.debug_given) -@@ -438,7 +438,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - } - -@@ -494,7 +494,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - p = stringprep_utf8_to_locale (r); -@@ -523,7 +523,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -537,7 +537,8 @@ main (int argc, char *argv[]) - r = stringprep_utf8_nfkc_normalize (p, -1); - free (p); - if (!r) -- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -+ error (EXIT_FAILURE, 0, "%s", -+ _("could not do NFKC normalization")); - - if (args_info.debug_given) - { -@@ -547,7 +548,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - --- -2.8.1 - diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted file mode 100644 index 43bd232..0000000 --- a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Tue, 10 Jul 2012 02:44:30 -0700 -Subject: [PATCH] libidn: fix build with automake 1.12 - -Upstream-Status: Inappropriate - -automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, -and the warnings are treated as errors because of the -Werror parameter. - -These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not -eliminated these deprecated macros yet. So disable the treatment of warnings -as errors until gettext is updated to remove the deprecated macros. - -Signed-off-by: Nitin A Kamble -2012/07/10 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 261dad2..c4f935e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn at gnu.org]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Library code modified: REVISION++ diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch deleted file mode 100644 index 0863530..0000000 --- a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist -diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am ---- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 -+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 -@@ -49,15 +49,9 @@ - - # Man pages. - --dist_man_MANS = idn.1 $(gdoc_MANS) -+dist_man_MANS = $(gdoc_MANS) - MAINTAINERCLEANFILES = $(dist_man_MANS) - --idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ -- $(top_srcdir)/configure.ac -- $(HELP2MAN) \ -- --name="Internationalized Domain Names command line tool" \ -- --output=$@ $(top_builddir)/src/idn$(EXEEXT) -- - # GDOC - - GDOC_BIN = $(srcdir)/gdoc diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted file mode 100644 index 3c0559e..0000000 --- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Wed, 2 May 2012 18:05:19 -0700 -Subject: [PATCH] libtasn1: fix build with automake 1.12 - -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Nitin A Kamble -2012/05/03 - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8297649..7b9626e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) - AC_SUBST(LT_REVISION, 0) - AC_SUBST(LT_AGE, 6) - -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR -+ - AC_PROG_CC - gl_EARLY - lgl_EARLY diff --git a/meta/recipes-extended/libidn/libidn_1.35.bb b/meta/recipes-extended/libidn/libidn_1.35.bb deleted file mode 100644 index d5ce5b4..0000000 --- a/meta/recipes-extended/libidn/libidn_1.35.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Internationalized Domain Name support library" -DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." -HOMEPAGE = "http://www.gnu.org/software/libidn/" -SECTION = "libs" -LICENSE = "(LGPLv2.1+ | LGPLv3) & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ - file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ - file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" -DEPENDS = "virtual/libiconv autoconf-archive" - -inherit pkgconfig autotools gettext texinfo gtk-doc - -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ - file://dont-depend-on-help2man.patch \ - file://0001-idn-format-security-warnings.patch \ - " - -SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" -SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" - -# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 -# so package command into a separate package -PACKAGES =+ "idn" -FILES_idn = "${bindir}/*" - -LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" -LICENSE_idn = "GPLv3+" - -EXTRA_OECONF = "--disable-csharp" - -do_install_append() { - rm -rf ${D}${datadir}/emacs -} - -BBCLASSEXTEND = "native nativesdk" - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:18 +0000 Subject: [oe-commits] [openembedded-core] 17/19: clutter: Build cluter with the GDK backend In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233503.0DD71232954@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 49126bcba94d14908af7d90618682bdfba2479d8 Author: Alistair Francis AuthorDate: Sun Feb 23 12:24:53 2020 -0800 clutter: Build cluter with the GDK backend ClutterActors can crash with strange segfaults when built without the GDK backend but run ontop of GDK. To fix this let's add a PACKAGECONFIG to enable/disable GDK backend support and enable it by default. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter-1.0.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 5dc45eb..e0ac819 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -24,11 +24,11 @@ ERDEPENDS_EVDEV = "xkeyboard-config" # Disable pretty much everything, override in platform specific set up EXTRA_OECONF += "--disable-quartz-backend \ --disable-win32-backend \ - --disable-gdk-backend \ --disable-cex100-backend \ --disable-tslib-input \ " +PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" # Default configuration, distros might want to override -PACKAGECONFIG ??= "egl \ +PACKAGECONFIG ??= "egl gdk \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:17 +0000 Subject: [oe-commits] [openembedded-core] 16/19: Revert "psmisc: Fix dependency for USE_NLS=no" In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233503.0219623292C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e05f8f9856337bf3c27264683b0ded4ff4276142 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:30:25 2020 +0200 Revert "psmisc: Fix dependency for USE_NLS=no" This reverts commit 52971eeaaf0adcf859ab04853e9ab2e551e4998f. The original problem was later fix by psmisc: revert to default autopoint exclusion Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-extended/psmisc/psmisc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index a75b047..6ab1288 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -7,7 +7,7 @@ command sends a specified signal (SIGTERM if nothing is specified) to \ processes identified by name. The fuser command identifies the PIDs \ of processes that are using specified files or filesystems." SECTION = "base" -DEPENDS = "ncurses virtual/libintl gettext-native" +DEPENDS = "ncurses virtual/libintl" LICENSE = "GPLv2" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:19 +0000 Subject: [oe-commits] [openembedded-core] 18/19: wayland: add ptest In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233503.1A39A232955@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 34cf80418eeb3f759f42b40c7a755d6d2f7c25a3 Author: Alexander Kanavin AuthorDate: Sun Feb 23 23:11:11 2020 +0100 wayland: add ptest Sadly, meson makes it very difficult to install tests: the test configuration is written into host-specific binary files, which can't be transferred to the target. (unlike autotools where at least everything happens via Makefiles which can be patched and tweaked via sed and env vars) So the configuration has to be entirely recreated in shell. I managed this for wayland, but weston proved too difficult. I had filed bugs asking upstream to make the tests installable: https://gitlab.freedesktop.org/wayland/wayland/issues/146 https://gitlab.freedesktop.org/wayland/weston/issues/368 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/wayland/run-ptest | 17 +++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 14 +++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 6e77085..4afac58 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -47,6 +47,7 @@ PTESTS_FAST = "\ quilt-ptest \ sed-ptest \ slang-ptest \ + wayland-ptest \ zlib-ptest \ " diff --git a/meta/recipes-graphics/wayland/wayland/run-ptest b/meta/recipes-graphics/wayland/wayland/run-ptest new file mode 100644 index 0000000..7e8d9de --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +export WAYLAND_SCANNER=wayland-scanner +export TEST_DATA_DIR=tests/data +export TEST_OUTPUT_DIR=tests/output +export SED=sed +export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 +export NM=nm + +for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do + $i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 5dc3116..00be3aa 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://run-ptest \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ @@ -23,7 +24,7 @@ SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit meson pkgconfig +inherit meson pkgconfig ptest PACKAGECONFIG ??= "dtd-validation" PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," @@ -39,6 +40,15 @@ do_install_append_class-native() { -i ${D}/${datadir}/aclocal/wayland-scanner.m4 } +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests/data + cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests + cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} + cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ + cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ +} + sysroot_stage_all_append_class-target () { rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ @@ -48,3 +58,5 @@ FILES_${PN} = "${libdir}/*${SOLIBS}" FILES_${PN}-dev += "${bindir} ${datadir}/wayland" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN}-ptest += "binutils sed" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:35:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:35:20 +0000 Subject: [oe-commits] [openembedded-core] 19/19: apt: Inherit upstream-version-is-even In-Reply-To: <158250090190.30011.8260298492864380545@git.openembedded.org> References: <158250090190.30011.8260298492864380545@git.openembedded.org> Message-ID: <20200223233503.27252232958@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 970f6373030d7b857fb110030819da3e2ad070d2 Author: Adrian Bunk AuthorDate: Sun Feb 23 16:35:58 2020 +0200 apt: Inherit upstream-version-is-even Even versions are shipped in Ubuntu LTS and Debian releases. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 50c4d84..13f5969 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" -inherit autotools gettext useradd +inherit autotools gettext useradd upstream-version-is-even EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:46 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (970f637 -> 8566912) Message-ID: <158250124649.31862.13959742640087014996@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 970f637 apt: Inherit upstream-version-is-even new 4d2e767 bison: Upgrade 3.5.1 -> 3.5.2 new 3570c8f linux-firmware: Upgrade 20200117 -> 20200122 new ba1764d libcap: Upgrade 2.31 -> 2.32 new 1b3d719 lttng-tools: exclude one more test that sporadically fails new e688aab libinput: update 1.14.3 -> 1.15.2 new 800bc98 ptest: add an option to enforce a failure (e.g. ptests are required to pass) new 8566912 readline/ediline: Fix conflicting manpages. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/runtime/cases/ptest.py | 15 +- meta/recipes-core/readline/readline.inc | 8 +- .../bison/{bison_3.5.1.bb => bison_3.5.2.bb} | 4 +- .../libedit/libedit_20191231-3.1.bb | 6 + ...-for-64bit-time_t-for-32bit-architectures.patch | 386 --------------------- .../{libinput_1.14.3.bb => libinput_1.15.2.bb} | 8 +- ...ware_20200117.bb => linux-firmware_20200122.bb} | 11 +- ...s-regression-disable-the-tools-live-tests.patch | 15 +- .../images/core-image-sato-sdk-ptest.bb | 3 + .../libcap/{libcap_2.31.bb => libcap_2.32.bb} | 4 +- 10 files changed, 52 insertions(+), 408 deletions(-) rename meta/recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} (90%) delete mode 100644 meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch rename meta/recipes-graphics/wayland/{libinput_1.14.3.bb => libinput_1.15.2.bb} (86%) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200117.bb => linux-firmware_20200122.bb} (99%) rename meta/recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:47 +0000 Subject: [oe-commits] [openembedded-core] 01/07: bison: Upgrade 3.5.1 -> 3.5.2 In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234046.D819C23292B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4d2e767e0381c90bec22b68c0992b7cacc5b8414 Author: Adrian Bunk AuthorDate: Sun Feb 23 16:35:59 2020 +0200 bison: Upgrade 3.5.1 -> 3.5.2 Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.1.bb b/meta/recipes-devtools/bison/bison_3.5.2.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.1.bb rename to meta/recipes-devtools/bison/bison_3.5.2.bb index e70252d..b5b4a8e 100644 --- a/meta/recipes-devtools/bison/bison_3.5.1.bb +++ b/meta/recipes-devtools/bison/bison_3.5.2.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" -SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" +SRC_URI[md5sum] = "49fc2cf23e31e697d5072835e1662a97" +SRC_URI[sha256sum] = "24e273db9eb6da8bbb6f0648284d0724a5cbd6268a163db402f961350a4e50dd" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:48 +0000 Subject: [oe-commits] [openembedded-core] 02/07: linux-firmware: Upgrade 20200117 -> 20200122 In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234046.E36F423292C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3570c8fd7ed4f0ee1fcb70156e7c515332fe7ae3 Author: Adrian Bunk AuthorDate: Sun Feb 23 16:36:00 2020 +0200 linux-firmware: Upgrade 20200117 -> 20200122 Switch to using the tarballs of tagged releases. WHENCE changed due to firmware filename changes. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- ...{linux-firmware_20200117.bb => linux-firmware_20200122.bb} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 8111c41..0d1422c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ + file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -194,13 +194,10 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" +SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2" +SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986" inherit allarch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:49 +0000 Subject: [oe-commits] [openembedded-core] 03/07: libcap: Upgrade 2.31 -> 2.32 In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234046.EED88232932@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ba1764d041f8747bf30e5a72759990a80bd58269 Author: Adrian Bunk AuthorDate: Sun Feb 23 14:19:32 2020 +0200 libcap: Upgrade 2.31 -> 2.32 Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcap/libcap_2.31.bb b/meta/recipes-support/libcap/libcap_2.32.bb similarity index 93% rename from meta/recipes-support/libcap/libcap_2.31.bb rename to meta/recipes-support/libcap/libcap_2.32.bb index 97959c1..d78a58f 100644 --- a/meta/recipes-support/libcap/libcap_2.31.bb +++ b/meta/recipes-support/libcap/libcap_2.32.bb @@ -12,8 +12,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[md5sum] = "52120c05dc797b01f5a7ae70f4335e96" -SRC_URI[sha256sum] = "c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46" +SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9" +SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:50 +0000 Subject: [oe-commits] [openembedded-core] 04/07: lttng-tools: exclude one more test that sporadically fails In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234047.062F5232934@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1b3d719b1322bb9e22cfbd7d57365a6623a3c898 Author: Alexander Kanavin AuthorDate: Sun Feb 23 14:52:29 2020 +0100 lttng-tools: exclude one more test that sporadically fails Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...01-tests-regression-disable-the-tools-live-tests.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch index a558a09..f2c14ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch @@ -1,4 +1,4 @@ -From 5f0ef3e007ed83c1ce7ae817308e5942decc1230 Mon Sep 17 00:00:00 2001 +From c69b68e5c03f1d260025fb1dd9ab7345e31e15ef Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 24 Jan 2020 18:03:25 +0100 Subject: [PATCH] tests/regression: disable the tools/live tests @@ -10,14 +10,14 @@ https://bugs.lttng.org/issues/1217 Upstream-Status: Inappropriate [upstream is working on a real fix] Signed-off-by: Alexander Kanavin --- - tests/regression/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) + tests/regression/Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am -index 73eb9f7..92fc18f 100644 +index 73eb9f7..b92bdbd 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am -@@ -9,9 +9,6 @@ TESTS = tools/filtering/test_invalid_filter \ +@@ -9,14 +9,10 @@ TESTS = tools/filtering/test_invalid_filter \ tools/filtering/test_valid_filter \ tools/streaming/test_ust \ tools/health/test_thread_ok \ @@ -27,3 +27,8 @@ index 73eb9f7..92fc18f 100644 tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ tools/exclusion/test_exclusion \ + tools/snapshots/test_ust_fast \ +- tools/snapshots/test_ust_streaming \ + tools/save-load/test_save \ + tools/save-load/test_load \ + tools/save-load/test_autoload \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:53 +0000 Subject: [oe-commits] [openembedded-core] 07/07: readline/ediline: Fix conflicting manpages. In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234047.2AA78232941@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8566912d2a8b4836f8bd814c9372d36bb09292c6 Author: Jeremy Puhlman AuthorDate: Sat Feb 22 10:54:00 2020 -0800 readline/ediline: Fix conflicting manpages. file /usr/share/man/man3/history.3 conflicts between attempted installs of libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64 Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 8 +++++++- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 07f54a7..4babcbd 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk" CONFFILES_${PN} += "${sysconfdir}/inputrc" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" + # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. SRC_URI_append_class-native = " file://rl-native.map" -LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" \ No newline at end of file +LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 7116c9d..267fdcc 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" BBCLASSEXTEND = "native nativesdk" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:51 +0000 Subject: [oe-commits] [openembedded-core] 05/07: libinput: update 1.14.3 -> 1.15.2 In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234047.164F723293D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e688aabfae1c0cf08b666b3eda8fba44a70a6962 Author: Alexander Kanavin AuthorDate: Sun Feb 23 14:52:30 2020 +0100 libinput: update 1.14.3 -> 1.15.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-for-64bit-time_t-for-32bit-architectures.patch | 386 --------------------- .../{libinput_1.14.3.bb => libinput_1.15.2.bb} | 8 +- 2 files changed, 4 insertions(+), 390 deletions(-) diff --git a/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index 344e6aa..0000000 --- a/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,386 +0,0 @@ -From ab6ce09bfb669177c90cc5c10155eec44e9fc34b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Sat, 23 Nov 2019 17:23:56 -0800 -Subject: [PATCH] Adjust for 64bit time_t for 32bit architectures - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/libinput/libinput/merge_requests/346] -Signed-off-by: Peter Hutterer ---- - meson.build | 1 + - src/evdev-mt-touchpad-buttons.c | 15 ++++--- - src/evdev.c | 5 ++- - src/util-input-event.h | 69 +++++++++++++++++++++++++++++++++ - tools/libinput-record.c | 16 +++++--- - 5 files changed, 90 insertions(+), 16 deletions(-) - create mode 100644 src/util-input-event.h - ---- a/meson.build -+++ b/meson.build -@@ -220,7 +220,8 @@ endif - ############ libinput-util.a ############ - src_libinput_util = [ - 'src/libinput-util.c', -- 'src/libinput-util.h' -+ 'src/libinput-util.h', -+ 'src/util-input-event.h' - ] - libinput_util = static_library('libinput-util', - src_libinput_util, ---- a/src/evdev-mt-touchpad-buttons.c -+++ b/src/evdev-mt-touchpad-buttons.c -@@ -30,6 +30,7 @@ - #include - #include "linux/input.h" - -+#include "util-input-event.h" - #include "evdev-mt-touchpad.h" - - #define DEFAULT_BUTTON_ENTER_TIMEOUT ms2us(100) -@@ -1145,14 +1146,12 @@ tp_notify_clickpadbutton(struct tp_dispa - if (tp->buttons.trackpoint) { - if (is_topbutton) { - struct evdev_dispatch *dispatch = tp->buttons.trackpoint->dispatch; -- struct input_event event; -- struct input_event syn_report = {{ 0, 0 }, EV_SYN, SYN_REPORT, 0 }; -+ struct input_event event, syn_report; -+ int value; - -- event.time = us2tv(time); -- event.type = EV_KEY; -- event.code = button; -- event.value = (state == LIBINPUT_BUTTON_STATE_PRESSED) ? 1 : 0; -- syn_report.time = event.time; -+ value = (state == LIBINPUT_BUTTON_STATE_PRESSED) ? 1 : 0; -+ event = input_event_init(time, EV_KEY, button, value); -+ syn_report = input_event_init(time, EV_SYN, SYN_REPORT, 0); - dispatch->interface->process(dispatch, - tp->buttons.trackpoint, - &event, ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -44,6 +44,7 @@ - #include "filter.h" - #include "libinput-private.h" - #include "quirks.h" -+#include "util-input-event.h" - - #if HAVE_LIBWACOM - #include -@@ -859,7 +860,7 @@ evdev_print_event(struct evdev_device *d - { - static uint32_t offset = 0; - static uint32_t last_time = 0; -- uint32_t time = us2ms(tv2us(&e->time)); -+ uint32_t time = us2ms(input_event_time(e)); - - if (offset == 0) { - offset = time; -@@ -891,7 +892,7 @@ static inline void - evdev_process_event(struct evdev_device *device, struct input_event *e) - { - struct evdev_dispatch *dispatch = device->dispatch; -- uint64_t time = tv2us(&e->time); -+ uint64_t time = input_event_time(e); - - #if 0 - evdev_print_event(device, e); ---- /dev/null -+++ b/src/util-input-event.h -@@ -0,0 +1,69 @@ -+/* -+ * Copyright ? 2019 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#pragma once -+ -+#include "config.h" -+ -+#include "util-time.h" -+#include -+ -+static inline struct input_event -+input_event_init(uint64_t time, -+ unsigned int code, -+ unsigned int type, -+ int value) -+{ -+ struct input_event ev; -+ struct timeval tval = us2tv(time); -+ -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; -+ ev.type = type; -+ ev.code = code; -+ ev.value = value; -+ -+ return ev; -+} -+ -+static inline uint64_t -+input_event_time(const struct input_event *e) -+{ -+ struct timeval tval; -+ -+ tval.tv_sec = e->input_event_sec; -+ tval.tv_usec = e->input_event_usec; -+ -+ return tv2us(&tval); -+} -+ -+ -+static inline void -+input_event_set_time(struct input_event *e, -+ uint64_t time) -+{ -+ struct timeval tval = us2tv(time); -+ -+ e->input_event_sec = tval.tv_sec; -+ e->input_event_usec = tval.tv_usec; -+} ---- a/tools/libinput-record.c -+++ b/tools/libinput-record.c -@@ -41,6 +41,7 @@ - #include - - #include "libinput-versionsort.h" -+#include "util-input-event.h" - #include "libinput-util.h" - #include "libinput-version.h" - #include "libinput-git-version.h" -@@ -196,8 +197,9 @@ print_evdev_event(struct record_context - const char *cname; - bool was_modified = false; - char desc[1024]; -+ uint64_t time = input_event_time(ev) - ctx->offset; - -- ev->time = us2tv(tv2us(&ev->time) - ctx->offset); -+ input_event_set_time(ev, time); - - /* Don't leak passwords unless the user wants to */ - if (!ctx->show_keycodes) -@@ -215,7 +217,7 @@ print_evdev_event(struct record_context - static unsigned long last_ms = 0; - unsigned long time, dt; - -- time = us2ms(tv2us(&ev->time)); -+ time = us2ms(input_event_time(ev)); - dt = time - last_ms; - last_ms = time; - -@@ -239,8 +241,8 @@ print_evdev_event(struct record_context - - iprintf(ctx, - "- [%3lu, %6u, %3d, %3d, %6d] # %s\n", -- ev->time.tv_sec, -- (unsigned int)ev->time.tv_usec, -+ ev->input_event_sec, -+ (unsigned int)ev->input_event_usec, - ev->type, - ev->code, - ev->value, -@@ -268,16 +270,18 @@ handle_evdev_frame(struct record_context - while (libevdev_next_event(evdev, - LIBEVDEV_READ_FLAG_NORMAL, - &e) == LIBEVDEV_READ_STATUS_SUCCESS) { -+ uint64_t time; - - if (ctx->offset == 0) -- ctx->offset = tv2us(&e.time); -+ ctx->offset = input_event_time(&e); - - if (d->nevents == d->events_sz) - resize(d->events, d->events_sz); - - event = &d->events[d->nevents++]; - event->type = EVDEV; -- event->time = tv2us(&e.time) - ctx->offset; -+ time = input_event_time(&e); -+ input_event_set_time(&e, time - ctx->offset); - event->u.evdev = e; - count++; - ---- a/src/libinput-private.h -+++ b/src/libinput-private.h -@@ -39,6 +39,7 @@ - - #include "libinput.h" - #include "libinput-util.h" -+#include "util-time.h" - #include "libinput-version.h" - - #if LIBINPUT_VERSION_MICRO >= 90 ---- a/src/libinput-util.h -+++ b/src/libinput-util.h -@@ -206,12 +206,6 @@ clear_bit(unsigned char *array, int bit) - array[bit / 8] &= ~(1 << (bit % 8)); - } - --static inline void --msleep(unsigned int ms) --{ -- usleep(ms * 1000); --} -- - static inline bool - long_bit_is_set(const unsigned long *array, int bit) - { -@@ -453,53 +447,6 @@ bool - parse_switch_reliability_property(const char *prop, - enum switch_reliability *reliability); - --static inline uint64_t --us(uint64_t us) --{ -- return us; --} -- --static inline uint64_t --ns2us(uint64_t ns) --{ -- return us(ns / 1000); --} -- --static inline uint64_t --ms2us(uint64_t ms) --{ -- return us(ms * 1000); --} -- --static inline uint64_t --s2us(uint64_t s) --{ -- return ms2us(s * 1000); --} -- --static inline uint32_t --us2ms(uint64_t us) --{ -- return (uint32_t)(us / 1000); --} -- --static inline uint64_t --tv2us(const struct timeval *tv) --{ -- return s2us(tv->tv_sec) + tv->tv_usec; --} -- --static inline struct timeval --us2tv(uint64_t time) --{ -- struct timeval tv; -- -- tv.tv_sec = time / ms2us(1000); -- tv.tv_usec = time % ms2us(1000); -- -- return tv; --} -- - static inline bool - safe_atoi_base(const char *str, int *val, int base) - { ---- /dev/null -+++ b/src/util-time.h -@@ -0,0 +1,84 @@ -+/* -+ * Copyright ? 2013-2019 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#pragma once -+ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+ -+static inline void -+msleep(unsigned int ms) -+{ -+ usleep(ms * 1000); -+} -+ -+static inline uint64_t -+us(uint64_t us) -+{ -+ return us; -+} -+ -+static inline uint64_t -+ns2us(uint64_t ns) -+{ -+ return us(ns / 1000); -+} -+ -+static inline uint64_t -+ms2us(uint64_t ms) -+{ -+ return us(ms * 1000); -+} -+ -+static inline uint64_t -+s2us(uint64_t s) -+{ -+ return ms2us(s * 1000); -+} -+ -+static inline uint32_t -+us2ms(uint64_t us) -+{ -+ return (uint32_t)(us / 1000); -+} -+ -+static inline uint64_t -+tv2us(const struct timeval *tv) -+{ -+ return s2us(tv->tv_sec) + tv->tv_usec; -+} -+ -+static inline struct timeval -+us2tv(uint64_t time) -+{ -+ struct timeval tv; -+ -+ tv.tv_sec = time / ms2us(1000); -+ tv.tv_usec = time % ms2us(1000); -+ -+ return tv; -+} diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.15.2.bb similarity index 86% rename from meta/recipes-graphics/wayland/libinput_1.14.3.bb rename to meta/recipes-graphics/wayland/libinput_1.15.2.bb index bc5a76d..8105327 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.15.2.bb @@ -13,11 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ file://determinism.patch \ -" -SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" -SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" + " +SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" +SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" @@ -38,3 +37,4 @@ EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ RPROVIDES_${PN} = "libinput" RREPLACES_${PN} = "libinput" RCONFLICTS_${PN} = "libinput" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Feb 23 23:40:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 23 Feb 2020 23:40:52 +0000 Subject: [oe-commits] [openembedded-core] 06/07: ptest: add an option to enforce a failure (e.g. ptests are required to pass) In-Reply-To: <158250124649.31862.13959742640087014996@git.openembedded.org> References: <158250124649.31862.13959742640087014996@git.openembedded.org> Message-ID: <20200223234047.2045823293E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 800bc98aa1133b9e23d72d4a7afb6b9be350fd9e Author: Alexander Kanavin AuthorDate: Sun Feb 23 14:52:31 2020 +0100 ptest: add an option to enforce a failure (e.g. ptests are required to pass) This can be useful with a more specific, targeted and robust set of ptest packages; the benefit is that ptest regressions are caught as they happen and can be more easily traced to changes that caused them. The existing AB ptest image continues to be expected to fail, my observation of the AB runs is that the full set of ptests is not robust enough (particularly around socket/network related tests) and sporadically fails in random places. This can probably be addressed by making ptests exclusive to a worker (e.g. there is no other workload happening at the same time as ptests). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/ptest.py | 15 ++++++++++++++- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index eb284df..5626f70 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -18,7 +18,20 @@ class PtestRunnerTest(OERuntimeTestCase): @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['ptest-runner']) @unittest.expectedFailure - def test_ptestrunner(self): + def test_ptestrunner_expectfail(self): + if not self.td.get('PTEST_EXPECT_FAILURE'): + self.skipTest('Cannot run ptests with @expectedFailure as ptests are required to pass') + self.do_ptestrunner() + + @skipIfNotFeature('ptest', 'Test requires ptest to be in DISTRO_FEATURES') + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['ptest-runner']) + def test_ptestrunner_expectsuccess(self): + if self.td.get('PTEST_EXPECT_FAILURE'): + self.skipTest('Cannot run ptests without @expectedFailure as ptests are expected to fail') + self.do_ptestrunner() + + def do_ptestrunner(self): status, output = self.target.run('which ptest-runner', 0) if status != 0: self.skipTest("No -ptest packages are installed in the image") diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 58c257c..bf749ac 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -18,3 +18,6 @@ IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer # also lttng-tools needs /tmp that has at least 1G QB_MEM = "-m 2048" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 00:40:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 00:40:33 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (19f6227 -> f95eb5b) Message-ID: <158250483333.27168.10202649625878026544@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from 19f6227 syslog-ng: Remove config nag on boot add 4760719 spdlog: Update 1.3.1 to v1.5.0 add e4f3900 libmicrohttpd: upgrade 0.9.69 -> 0.9.70 add 87c2895 log4cpp: upgrade 1.1.2 -> 1.1.3 add 4e9f1a2 openldap: upgrade 2.4.48 -> 2.4.49 add 89efe60 snappy: upgrade 1.1.7 -> 1.1.8 add 2b88bf3 ttf-hunkyfonts: upgrade 0.3.0 -> 0.3.1 add 90a1362 libio-socket-ssl-perl: upgrade 2.066 -> 2.067 add 664f8e1 php: Security Advisory - php - CVE-2020-7059 add 7513625 meta-oe: onig: avoid using 'install' with both -D and -t options add 172be3f sshfs-fuse: 3.6.0 -> 3.7.0 add e10d2bd crash: upgrade 7.2.7 -> 7.2.8 add 247b9df kpatch: upgrade 0.8.0 -> 0.9.0 add aa90c09 uftrace: upgrade 0.9.3 -> 0.9.4 add 4e8fb9d ostree: upgrade 2019.6 -> 2020.2 add 2b36db7 mbedtls: upgrade 2.16.3 -> 2.16.5 add 6b6a18d dnfdragora: Inherit mime-xdg add d280be7 oprofile: Fix build with bfd 2.34+ add 975b6b2 libqmi: Upgrade 1.24.2 -> 1.24.4 add 3fd86f3 modemmanager: Upgrade 1.12.4 -> 1.12.6 add c87588d python-h2: Add missing RDEPENDS on hpack and hyperframe add df0745a Ply: Add recipe for git version add f95eb5b python3-networkx: upgrade 2.3 -> 2.4 No new revisions were added by this update. Summary of changes: .../{sshfs-fuse_3.6.0.bb => sshfs-fuse_3.7.0.bb} | 2 +- .../{mbedtls_2.16.3.bb => mbedtls_2.16.5.bb} | 4 +- .../libqmi/{libqmi_1.24.2.bb => libqmi_1.24.4.bb} | 4 +- ...demmanager_1.12.4.bb => modemmanager_1.12.6.bb} | 4 +- .../recipes-devtools/php/php/CVE-2020-7059.patch | 86 ++++++++++++++++++++++ meta-oe/recipes-devtools/php/php_7.3.11.bb | 1 + meta-oe/recipes-devtools/ply/ply_git.bb | 15 ++++ .../uftrace/{uftrace_0.9.3.bb => uftrace_0.9.4.bb} | 4 +- .../ostree/{ostree_2019.6.bb => ostree_2020.2.bb} | 28 +++++-- .../snappy/{snappy_1.1.7.bb => snappy_1.1.8.bb} | 6 +- .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 2 +- ...hunkyfonts_0.3.0.bb => ttf-hunkyfonts_0.3.1.bb} | 6 +- .../crash/{crash_7.2.7.bb => crash_7.2.8.bb} | 2 +- ...tch-build-allow-overriding-of-distro-name.patch | 6 +- meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 +- meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 + .../oprofile/0001-Use-new-bfd-APIs-from-2.34.patch | 79 ++++++++++++++++++++ ...icrohttpd_0.9.69.bb => libmicrohttpd_0.9.70.bb} | 4 +- .../log4cpp/{log4cpp_1.1.2.bb => log4cpp_1.1.3.bb} | 7 +- meta-oe/recipes-support/onig/onig_6.9.4.bb | 3 +- .../openldap/openldap/kill-icu.patch | 30 -------- .../{openldap_2.4.48.bb => openldap_2.4.49.bb} | 7 +- .../spdlog/{spdlog_1.3.1.bb => spdlog_1.5.0.bb} | 2 +- ...erl_2.066.bb => libio-socket-ssl-perl_2.067.bb} | 4 +- .../recipes-connectivity/python-h2/python-h2.inc | 2 + .../recipes-devtools/python/python-networkx.inc | 2 - .../python/python3-networkx_2.3.bb | 8 -- .../python/python3-networkx_2.4.bb | 8 ++ 28 files changed, 249 insertions(+), 82 deletions(-) rename meta-filesystems/recipes-filesystems/sshfs-fuse/{sshfs-fuse_3.6.0.bb => sshfs-fuse_3.7.0.bb} (88%) rename meta-networking/recipes-connectivity/mbedtls/{mbedtls_2.16.3.bb => mbedtls_2.16.5.bb} (92%) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.2.bb => libqmi_1.24.4.bb} (85%) rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.12.4.bb => modemmanager_1.12.6.bb} (93%) create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2020-7059.patch create mode 100644 meta-oe/recipes-devtools/ply/ply_git.bb rename meta-oe/recipes-devtools/uftrace/{uftrace_0.9.3.bb => uftrace_0.9.4.bb} (94%) rename meta-oe/recipes-extended/ostree/{ostree_2019.6.bb => ostree_2020.2.bb} (88%) rename meta-oe/recipes-extended/snappy/{snappy_1.1.7.bb => snappy_1.1.8.bb} (69%) rename meta-oe/recipes-graphics/ttf-fonts/{ttf-hunkyfonts_0.3.0.bb => ttf-hunkyfonts_0.3.1.bb} (68%) rename meta-oe/recipes-kernel/crash/{crash_7.2.7.bb => crash_7.2.8.bb} (98%) create mode 100644 meta-oe/recipes-kernel/oprofile/oprofile/0001-Use-new-bfd-APIs-from-2.34.patch rename meta-oe/recipes-support/libmicrohttpd/{libmicrohttpd_0.9.69.bb => libmicrohttpd_0.9.70.bb} (86%) rename meta-oe/recipes-support/log4cpp/{log4cpp_1.1.2.bb => log4cpp_1.1.3.bb} (68%) delete mode 100644 meta-oe/recipes-support/openldap/openldap/kill-icu.patch rename meta-oe/recipes-support/openldap/{openldap_2.4.48.bb => openldap_2.4.49.bb} (97%) rename meta-oe/recipes-support/spdlog/{spdlog_1.3.1.bb => spdlog_1.5.0.bb} (92%) rename meta-perl/recipes-perl/libio/{libio-socket-ssl-perl_2.066.bb => libio-socket-ssl-perl_2.067.bb} (91%) delete mode 100644 meta-python/recipes-devtools/python/python3-networkx_2.3.bb create mode 100644 meta-python/recipes-devtools/python/python3-networkx_2.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 06:31:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 06:31:39 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (5617b12 -> 7d06fdd) Message-ID: <158252589935.9639.4221470792848947261@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 5617b12 luajit: Upgrade to 2.1.0-beta3 new 6820d9e ipmiutil: gzip man pages with out timestamp new 7d06fdd libidn: Moved from OE-core This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5617b12) \ N -- N -- N refs/heads/master-next (7d06fdd) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../luajit/{luajit_git.bb => luajit_2.0.5.bb} | 12 +- .../libidn/0001-idn-format-security-warnings.patch | 181 +++++++++++++++++++++ ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 ++++ .../libidn/libidn/dont-depend-on-help2man.patch | 23 +++ .../libidn/libidn_fix_for_automake-1.12.patch | 35 ++++ meta-oe/recipes-extended/libidn/libidn_1.35.bb | 42 +++++ ...ess-times-from-changing-resulting-gzip-md.patch | 25 +++ meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb | 1 + 8 files changed, 349 insertions(+), 4 deletions(-) rename meta-oe/recipes-devtools/luajit/{luajit_git.bb => luajit_2.0.5.bb} (88%) create mode 100644 meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch create mode 100644 meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch create mode 100644 meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch create mode 100644 meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch create mode 100644 meta-oe/recipes-extended/libidn/libidn_1.35.bb create mode 100644 meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 06:31:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 06:31:40 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: ipmiutil: gzip man pages with out timestamp In-Reply-To: <158252589935.9639.4221470792848947261@git.openembedded.org> References: <158252589935.9639.4221470792848947261@git.openembedded.org> Message-ID: <20200224063139.DC147232932@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6820d9eceae2907ec12073abd0dee7c4daa29cc7 Author: Jeremy Puhlman AuthorDate: Sun Feb 23 11:02:46 2020 -0800 ipmiutil: gzip man pages with out timestamp A timestamp was getting encoded into the gzip header. This causes multilib conflicts when installed together, and would likely fail reproducablity tests. Signed-off-by: Khem Raj --- ...ess-times-from-changing-resulting-gzip-md.patch | 25 ++++++++++++++++++++++ meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb | 1 + 2 files changed, 26 insertions(+) diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch new file mode 100644 index 0000000..78c05ef --- /dev/null +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch @@ -0,0 +1,25 @@ +From da668e5bf1a721797361ab866d09913ee8e157c4 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 04:37:04 +0000 +Subject: [PATCH] Prevent access times from changing resulting gzip md5sum + +Upstream-Status: Pending +https://github.com/ipmitool/ipmitool/pull/186 +--- + doc/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index b792762..2c52ce6 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -59,5 +59,5 @@ install: + ${INSTALL_DATA_SH} iuser.8 ${manto} + ${INSTALL_DATA_SH} iseltime.8 ${manto} + ${INSTALL_DATA_SH} bmclanpet.mib ${datato} +- cd ${manto}; gzip -f *.8 ++ cd ${manto}; gzip -nf *.8 + +-- +2.13.3 + diff --git a/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb index 3e26340..d0f3688 100644 --- a/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb @@ -21,6 +21,7 @@ PARALLEL_MAKE = "" SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \ file://fix_systemd_path.patch \ + file://0001-Prevent-access-times-from-changing-resulting-gzip-md.patch \ " SRC_URI[md5sum] = "292d6df25cad678bb27e5c8cdc6748f9" SRC_URI[sha256sum] = "58ccdbd5755d7dd72478756715af09e9c73330dfad2b91dbf03d2ac504b301a3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 06:31:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 06:31:41 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: libidn: Moved from OE-core In-Reply-To: <158252589935.9639.4221470792848947261@git.openembedded.org> References: <158252589935.9639.4221470792848947261@git.openembedded.org> Message-ID: <20200224063139.E7B18232934@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7d06fdd77171c12a0f66b973eb2c3fcae14afa7d Author: Adrian Bunk AuthorDate: Mon Feb 24 06:10:25 2020 +0200 libidn: Moved from OE-core Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../libidn/0001-idn-format-security-warnings.patch | 181 +++++++++++++++++++++ ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 ++++ .../libidn/libidn/dont-depend-on-help2man.patch | 23 +++ .../libidn/libidn_fix_for_automake-1.12.patch | 35 ++++ meta-oe/recipes-extended/libidn/libidn_1.35.bb | 42 +++++ 5 files changed, 315 insertions(+) diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch new file mode 100644 index 0000000..5adc7d9 --- /dev/null +++ b/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch @@ -0,0 +1,181 @@ +From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Tue, 28 Jun 2016 12:43:31 +0100 +Subject: [PATCH] idn: fix printf() format security warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../../libidn-1.32/src/idn.c: In function 'main': +| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security] +| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); +| ^~~~~ +| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security] +| fprintf (stderr, _("Type each input string on a line by itself, " +| ^~~~~~~ +| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security] +| error (EXIT_FAILURE, errno, _("input error")); +| ^~~~~ +| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UTF-8 to UCS-4")); +| ^ +| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UTF-8 to UCS-4")); +| ^ +| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UTF-8 to UCS-4")); +| ^ +| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UCS-4 to UTF-8")); +| ^ +| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UCS-4 to UTF-8")); +| ^ +| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UCS-4 to UTF-8")); +| ^ +| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UTF-8 to UCS-4")); +| ^ +| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UTF-8 to UCS-4")); +| ^ +| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security] +| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); +| ^~~~~ +| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security] +| _("could not convert from UTF-8 to UCS-4")); +| ^ + +Signed-off-by: Andr? Draszik +--- +Upstream-Status: Pending + + src/idn.c | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +diff --git a/src/idn.c b/src/idn.c +index be1c7d1..68e4291 100644 +--- a/src/idn.c ++++ b/src/idn.c +@@ -170,7 +170,7 @@ main (int argc, char *argv[]) + (args_info.idna_to_unicode_given ? 1 : 0) + + (args_info.nfkc_given ? 1 : 0) != 1) + { +- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); ++ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); + usage (EXIT_FAILURE); + } + +@@ -185,7 +185,7 @@ main (int argc, char *argv[]) + if (!args_info.quiet_given + && args_info.inputs_num == 0 + && isatty (fileno (stdin))) +- fprintf (stderr, _("Type each input string on a line by itself, " ++ fprintf (stderr, "%s", _("Type each input string on a line by itself, " + "terminated by a newline character.\n")); + + do +@@ -197,7 +197,7 @@ main (int argc, char *argv[]) + if (feof (stdin)) + break; + +- error (EXIT_FAILURE, errno, _("input error")); ++ error (EXIT_FAILURE, errno, "%s", _("input error")); + } + + if (strlen (line) > 0) +@@ -215,7 +215,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (p); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +@@ -240,7 +240,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (r); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +@@ -277,7 +277,7 @@ main (int argc, char *argv[]) + q = stringprep_utf8_to_ucs4 (p, -1, &len); + free (p); + if (!q) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + + if (args_info.debug_given) +@@ -336,7 +336,7 @@ main (int argc, char *argv[]) + r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); + free (q); + if (!r) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UCS-4 to UTF-8")); + + p = stringprep_utf8_to_locale (r); +@@ -360,7 +360,7 @@ main (int argc, char *argv[]) + q = stringprep_utf8_to_ucs4 (p, -1, NULL); + free (p); + if (!q) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UCS-4 to UTF-8")); + + if (args_info.debug_given) +@@ -438,7 +438,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (p); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UCS-4 to UTF-8")); + } + +@@ -494,7 +494,7 @@ main (int argc, char *argv[]) + r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); + free (q); + if (!r) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + + p = stringprep_utf8_to_locale (r); +@@ -523,7 +523,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (p); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +@@ -537,7 +537,8 @@ main (int argc, char *argv[]) + r = stringprep_utf8_nfkc_normalize (p, -1); + free (p); + if (!r) +- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); ++ error (EXIT_FAILURE, 0, "%s", ++ _("could not do NFKC normalization")); + + if (args_info.debug_given) + { +@@ -547,7 +548,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (r); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +-- +2.8.1 + diff --git a/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch new file mode 100644 index 0000000..43bd232 --- /dev/null +++ b/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch @@ -0,0 +1,34 @@ +From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 +From: Nitin A Kamble +Date: Tue, 10 Jul 2012 02:44:30 -0700 +Subject: [PATCH] libidn: fix build with automake 1.12 + +Upstream-Status: Inappropriate + +automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, +and the warnings are treated as errors because of the -Werror parameter. + +These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not +eliminated these deprecated macros yet. So disable the treatment of warnings +as errors until gettext is updated to remove the deprecated macros. + +Signed-off-by: Nitin A Kamble +2012/07/10 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 261dad2..c4f935e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn at gnu.org]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS(config.h) +-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + # Library code modified: REVISION++ diff --git a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch new file mode 100644 index 0000000..0863530 --- /dev/null +++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist +diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am +--- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 ++++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 +@@ -49,15 +49,9 @@ + + # Man pages. + +-dist_man_MANS = idn.1 $(gdoc_MANS) ++dist_man_MANS = $(gdoc_MANS) + MAINTAINERCLEANFILES = $(dist_man_MANS) + +-idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ +- $(top_srcdir)/configure.ac +- $(HELP2MAN) \ +- --name="Internationalized Domain Names command line tool" \ +- --output=$@ $(top_builddir)/src/idn$(EXEEXT) +- + # GDOC + + GDOC_BIN = $(srcdir)/gdoc diff --git a/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch new file mode 100644 index 0000000..3c0559e --- /dev/null +++ b/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch @@ -0,0 +1,35 @@ +From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 +From: Nitin A Kamble +Date: Wed, 2 May 2012 18:05:19 -0700 +Subject: [PATCH] libtasn1: fix build with automake 1.12 + +Upstream-Status: Pending + +This patch fixes following issue with automake 1.12 + +| automake: warnings are treated as errors +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-off-by: Nitin A Kamble +2012/05/03 + +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 8297649..7b9626e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) + AC_SUBST(LT_REVISION, 0) + AC_SUBST(LT_AGE, 6) + ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ + AC_PROG_CC + gl_EARLY + lgl_EARLY diff --git a/meta-oe/recipes-extended/libidn/libidn_1.35.bb b/meta-oe/recipes-extended/libidn/libidn_1.35.bb new file mode 100644 index 0000000..d5ce5b4 --- /dev/null +++ b/meta-oe/recipes-extended/libidn/libidn_1.35.bb @@ -0,0 +1,42 @@ +SUMMARY = "Internationalized Domain Name support library" +DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." +HOMEPAGE = "http://www.gnu.org/software/libidn/" +SECTION = "libs" +LICENSE = "(LGPLv2.1+ | LGPLv3) & GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ + file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ + file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" +DEPENDS = "virtual/libiconv autoconf-archive" + +inherit pkgconfig autotools gettext texinfo gtk-doc + +SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ + file://libidn_fix_for_automake-1.12.patch \ + file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ + file://dont-depend-on-help2man.patch \ + file://0001-idn-format-security-warnings.patch \ + " + +SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" +SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" + +# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 +# so package command into a separate package +PACKAGES =+ "idn" +FILES_idn = "${bindir}/*" + +LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" +LICENSE_idn = "GPLv3+" + +EXTRA_OECONF = "--disable-csharp" + +do_install_append() { + rm -rf ${D}${datadir}/emacs +} + +BBCLASSEXTEND = "native nativesdk" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:17 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (7d06fdd -> 0793ac9) Message-ID: <158256739745.10366.13937617963473913402@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 7d06fdd libidn: Moved from OE-core new b60c61a xfsdump: 3.1.8 -> 3.1.9 new afe4470 daq: upgrade 2.0.6 -> 2.2.2 new 38f4919 dhcpcd: upgrade 8.1.5 -> 8.1.6 new 2b8e086 kea: upgrade 1.7.3 -> 1.7.4 new baf9de6 nginx.service: sleep 0.1 after nginx start new 2859c86 fluidsynth: upgrade 2.1.0 -> 2.1.1 new b418694 xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 new 0793ac9 xfce4-sensors-plugin: Change defaults to useful ones The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../files/work-with-new-version-of-xfsprogs.patch | 28 -------------- .../xfsdump/{xfsdump_3.1.8.bb => xfsdump_3.1.9.bb} | 5 +-- .../recipes-multimedia/fluidsynth/fluidsynth.inc | 4 +- .../daq/{daq_2.0.6.bb => daq_2.2.2.bb} | 4 +- .../dhcpcd/{dhcpcd_8.1.5.bb => dhcpcd_8.1.6.bb} | 4 +- .../kea/{kea_1.7.3.bb => kea_1.7.4.bb} | 6 +-- .../recipes-httpd/nginx/files/nginx.service | 1 + ...k-for-sys-class-power_supply-we-are-cross.patch | 44 ++++++++++++++++++++++ ...in_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} | 7 ++-- 9 files changed, 59 insertions(+), 44 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch rename meta-filesystems/recipes-utils/xfsdump/{xfsdump_3.1.8.bb => xfsdump_3.1.9.bb} (87%) rename meta-networking/recipes-connectivity/daq/{daq_2.0.6.bb => daq_2.2.2.bb} (88%) rename meta-networking/recipes-connectivity/dhcpcd/{dhcpcd_8.1.5.bb => dhcpcd_8.1.6.bb} (86%) rename meta-networking/recipes-connectivity/kea/{kea_1.7.3.bb => kea_1.7.4.bb} (90%) create mode 100644 meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch rename meta-xfce/recipes-panel-plugins/sensors/{xfce4-sensors-plugin_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} (78%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:18 +0000 Subject: [oe-commits] [meta-openembedded] 01/08: xfsdump: 3.1.8 -> 3.1.9 In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180317.F1DFD232962@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b60c61a62cbe0679828a062fbd81faf241707340 Author: Zheng Ruoqin AuthorDate: Mon Feb 24 17:27:29 2020 +0800 xfsdump: 3.1.8 -> 3.1.9 work-with-new-version-of-xfsprogs.patch is removed because it is included in 3.1.9. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../files/work-with-new-version-of-xfsprogs.patch | 28 ---------------------- .../xfsdump/{xfsdump_3.1.8.bb => xfsdump_3.1.9.bb} | 5 ++-- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch b/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch deleted file mode 100644 index 4ce23d7..0000000 --- a/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch +++ /dev/null @@ -1,28 +0,0 @@ -Make it work with xfsprogs 5.2.0. - -"xfs_fsop_geom_v1_t" has changed to "struct xfs_fsop_geom_v1" -in xfsprogs since version 5.2.0. - -Upstream-Status: Pending - -Signed-off-by: Yuan Chao ---- - common/fs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/fs.c b/common/fs.c -index 60cf0fd..2cc7031 100644 ---- a/common/fs.c -+++ b/common/fs.c -@@ -204,7 +204,7 @@ fs_mounted( char *typs, char *chrs, char *mnts, uuid_t *idp ) - int - fs_getid( char *mnts, uuid_t *idb ) - { -- xfs_fsop_geom_v1_t geo; -+ struct xfs_fsop_geom_v1 geo; - int fd; - - fd = open( mnts, O_RDONLY ); --- -2.7.4 - diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb similarity index 87% rename from meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb rename to meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb index 9c57558..3e18fba 100644 --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb @@ -12,11 +12,10 @@ DEPENDS = "xfsprogs attr" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ file://remove-install-as-user.patch \ - file://work-with-new-version-of-xfsprogs.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ " -SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" -SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" +SRC_URI[md5sum] = "086f7582875b14c17522867ffe3e202b" +SRC_URI[sha256sum] = "55aeede6232ddce6c9e79e2af88d6f808534df1552eb2bfaf7fb85b92add6dd1" inherit autotools-brokensep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:19 +0000 Subject: [oe-commits] [meta-openembedded] 02/08: daq: upgrade 2.0.6 -> 2.2.2 In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.0DC7D232966@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit afe4470a52ae2650e5ceab54a4957162f71fd77b Author: Zheng Ruoqin AuthorDate: Mon Feb 24 17:28:43 2020 +0800 daq: upgrade 2.0.6 -> 2.2.2 Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../recipes-connectivity/daq/{daq_2.0.6.bb => daq_2.2.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.2.2.bb similarity index 88% rename from meta-networking/recipes-connectivity/daq/daq_2.0.6.bb rename to meta-networking/recipes-connectivity/daq/daq_2.2.2.bb index 42ffb17..29ac5c7 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.2.2.bb @@ -25,8 +25,8 @@ EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${include PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" -SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb" +SRC_URI[md5sum] = "c61f60674a5f951f0c50faf33a611fee" +SRC_URI[sha256sum] = "7cd818cabb1ad35360e83076e54775f07165ee71407dc672d147e27d3cd37f7b" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:20 +0000 Subject: [oe-commits] [meta-openembedded] 03/08: dhcpcd: upgrade 8.1.5 -> 8.1.6 In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.1C00D232976@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 38f4919c9b45e1237cccc66046ba5a81b48fbb50 Author: Zheng Ruoqin AuthorDate: Mon Feb 24 17:29:08 2020 +0800 dhcpcd: upgrade 8.1.5 -> 8.1.6 Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../recipes-connectivity/dhcpcd/{dhcpcd_8.1.5.bb => dhcpcd_8.1.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb similarity index 86% rename from meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb rename to meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb index 3349ca1..1cb2af5 100644 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb +++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb @@ -12,8 +12,8 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" -SRC_URI[md5sum] = "57fd5dd4ff9722773ec67239db34d3b5" -SRC_URI[sha256sum] = "c5cbe15069cef347e72d0bf7a19b0255571ee0c184c6705859a09588a50a8ebd" +SRC_URI[md5sum] = "e1eea03388d12c9ad21ecd7c135fdf8b" +SRC_URI[sha256sum] = "6c2934a3e1e67a5cfd5bb15b1efa71f65c00314ac1ccb5c50da8eae3a0b8147f" inherit pkgconfig autotools-brokensep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:21 +0000 Subject: [oe-commits] [meta-openembedded] 04/08: kea: upgrade 1.7.3 -> 1.7.4 In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.286B9232977@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2b8e0867971672bb97002b5056fd7d73d18ab9eb Author: Zheng Ruoqin AuthorDate: Mon Feb 24 17:54:38 2020 +0800 kea: upgrade 1.7.3 -> 1.7.4 -License-Update: Copyright year updated to 2020. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../recipes-connectivity/kea/{kea_1.7.3.bb => kea_1.7.4.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.3.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb similarity index 90% rename from meta-networking/recipes-connectivity/kea/kea_1.7.3.bb rename to meta-networking/recipes-connectivity/kea/kea_1.7.4.bb index e230fd0..a2c9765 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.7.3.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org" SECTION = "connectivity" LICENSE = "MPL-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e5b01c848c7736a0c9e68f9c9cd0281" +LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" DEPENDS += "kea-native" @@ -14,8 +14,8 @@ SRC_URI = "\ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ " -SRC_URI[md5sum] = "fda03bf465818009b70dffc226da777d" -SRC_URI[sha256sum] = "30f82c548b844c12ed46c4eb3880d63b45ec04cecfcf2e4ab1d7bada7fff4f2a" +SRC_URI[md5sum] = "d2d0e3ad8064a5e6f3ba1e970d39f9cc" +SRC_URI[sha256sum] = "2b7f8d8cafdb9ad2be8df9aceb2de58c8f37c1544e47c28f05e84555d0015ef5" inherit autotools systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:23 +0000 Subject: [oe-commits] [meta-openembedded] 06/08: fluidsynth: upgrade 2.1.0 -> 2.1.1 In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.46E44232979@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2859c8683a1fe4325ca01469e65ad8e837be271b Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:42 2020 +0100 fluidsynth: upgrade 2.1.0 -> 2.1.1 >From announcement: * a regression introduced in 2.1.0 caused the jack audio driver to not correct a sample-rate mismatch (#607) * pkg-config is now being to used to find readline (#606, thanks to @ffontaine) * fix various typos in the documentation (#600, thanks to @luzpaz) * fix a memory leak in the file renderer * fix leaking memory when sequencer clients were not explicitly unregistered (#610) * fix a heap-based use-after-free in jack driver (#613) * fix the linker possibly not finding libinstpatch (#617, thanks to @realnc) Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 9ce6506..4fb622c 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "37c9ae2bf431a764032f023b3b2c0c0b86b7c272" +SRCREV = "3b851da6f721fcf15ec0b935eba72707bdb53d7b" S = "${WORKDIR}/git" -PV = "2.1.0" +PV = "2.1.1" inherit cmake pkgconfig lib_package -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:22 +0000 Subject: [oe-commits] [meta-openembedded] 05/08: nginx.service: sleep 0.1 after nginx start In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.35105232978@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit baf9de6f6b9a801bd09e6b955aee6558f79d65d3 Author: Changqing Li AuthorDate: Mon Feb 24 19:40:46 2020 +0800 nginx.service: sleep 0.1 after nginx start Fix error info: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/files/nginx.service | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service index 9a6ca96..65c7752 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx.service +++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service @@ -7,6 +7,7 @@ Type=forking PIDFile=/run/nginx/nginx.pid ExecStartPre=@SBINDIR@/nginx -t ExecStart=@SBINDIR@/nginx +ExecStartPost=/bin/sleep 0.1 ExecReload=@SBINDIR@/nginx -s reload ExecStop=@BASE_BINDIR@/kill -s QUIT $MAINPID PrivateTmp=true -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:24 +0000 Subject: [oe-commits] [meta-openembedded] 07/08: xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.599C423297A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b41869492485f23c2072d5c49609405d92248521 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:43 2020 +0100 xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 Although not explicitly mentioned in release announcement it seems that this is a develpoment release. It was tested and there could be no reason found not to use this version. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{xfce4-sensors-plugin_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb similarity index 86% rename from meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb rename to meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 4d78bb2..8b65014 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" -SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" +SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" +SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" EXTRA_OECONF = " \ --disable-procacpi \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Feb 24 18:03:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 24 Feb 2020 18:03:25 +0000 Subject: [oe-commits] [meta-openembedded] 08/08: xfce4-sensors-plugin: Change defaults to useful ones In-Reply-To: <158256739745.10366.13937617963473913402@git.openembedded.org> References: <158256739745.10366.13937617963473913402@git.openembedded.org> Message-ID: <20200224180318.6B23F23297B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0793ac9b25676a1ed9589424c82ee77ea944ceb7 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:44 2020 +0100 xfce4-sensors-plugin: Change defaults to useful ones Every time I added xfce4-sensors-plugin to panel xfce4-sensors-plugin suggested sensors not exactly useful. So change defaults: * remove lmsensors * make sysfsacpi work and don't disable it because that's where embedded machines drop useful information Background: Have spent lots of efforts to get Raspi4 cooled properly while running at gouvernor 'performance' and rendering music. Would like to see if it really wears a cool hat [1] [1] https://github.com/schnitzeltony/rpi-cool-hat Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...k-for-sys-class-power_supply-we-are-cross.patch | 44 ++++++++++++++++++++++ .../sensors/xfce4-sensors-plugin_1.3.92.bb | 3 +- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch new file mode 100644 index 0000000..ac1d603 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch @@ -0,0 +1,44 @@ +From 9b7e1beca872ca4a5fce8938c58379103787f79a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 23 Feb 2020 22:06:32 +0100 +Subject: [PATCH] Do not check for /sys/class/power_supply - we are cross + compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas M?ller +--- + configure.ac | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c281af9..60ba0c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -209,19 +209,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AC_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], + [], + [ +- enable_sysfsacpi=auto ++ enable_sysfsacpi=yes + ]) + +-if test x"$enable_sysfsacpi" = x"auto"; then +- AC_CHECK_FILE([/sys/class/power_supply], +- [ +- enable_sysfsacpi=yes +- ], +- [ +- enable_sysfsacpi=no +- ]) +-fi +- + if test x"$enable_sysfsacpi" = x"yes"; then + AC_DEFINE([HAVE_SYSFS_ACPI], [1], [Define to 1 if /sys/class/power_supply is found]) + enable_procacpi=yes +-- +2.21.0 + diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 8b65014..3fd0ff6 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -7,10 +7,10 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ --disable-procacpi \ - --disable-sysfsacpi \ --disable-xnvctrl \ " @@ -18,7 +18,6 @@ do_configure_prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } -PACKAGECONFIG ??= "libsensors" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (0793ac9 -> af89b26) Message-ID: <158260699050.21862.6922632341827146954@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 0793ac9 xfce4-sensors-plugin: Change defaults to useful ones discard b418694 xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 discard 2859c86 fluidsynth: upgrade 2.1.0 -> 2.1.1 discard baf9de6 nginx.service: sleep 0.1 after nginx start discard 2b8e086 kea: upgrade 1.7.3 -> 1.7.4 discard 38f4919 dhcpcd: upgrade 8.1.5 -> 8.1.6 discard afe4470 daq: upgrade 2.0.6 -> 2.2.2 new 1fd5ea4 dhcpcd: upgrade 8.1.5 -> 8.1.6 new 047737e kea: upgrade 1.7.3 -> 1.7.4 new 2e789ac nginx.service: sleep 0.1 after nginx start new 8ba21fc fluidsynth: upgrade 2.1.0 -> 2.1.1 new 1a6c12e xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 new ce24a05 xfce4-sensors-plugin: Change defaults to useful ones new e5d9279 span-lite: Add git version new c3b45b9 fdk-aac: add initial fdk-aac recipe new af89b26 ttf-noto-emoji: add recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0793ac9) \ N -- N -- N refs/heads/master-next (af89b26) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 ++++++++++++++++++++++ .../daq/{daq_2.2.2.bb => daq_2.0.6.bb} | 4 ++-- .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++++++++++++++++++ meta-oe/recipes-support/span-lite/span-lite_git.bb | 12 ++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb rename meta-networking/recipes-connectivity/daq/{daq_2.2.2.bb => daq_2.0.6.bb} (88%) create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb create mode 100644 meta-oe/recipes-support/span-lite/span-lite_git.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:11 +0000 Subject: [oe-commits] [meta-openembedded] 01/09: dhcpcd: upgrade 8.1.5 -> 8.1.6 In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.1F64423297F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1fd5ea4901c2d220ddd6b58f5c858a982d9c15dd Author: Zheng Ruoqin AuthorDate: Mon Feb 24 17:29:08 2020 +0800 dhcpcd: upgrade 8.1.5 -> 8.1.6 Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../recipes-connectivity/dhcpcd/{dhcpcd_8.1.5.bb => dhcpcd_8.1.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb similarity index 86% rename from meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb rename to meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb index 3349ca1..1cb2af5 100644 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.5.bb +++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb @@ -12,8 +12,8 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" -SRC_URI[md5sum] = "57fd5dd4ff9722773ec67239db34d3b5" -SRC_URI[sha256sum] = "c5cbe15069cef347e72d0bf7a19b0255571ee0c184c6705859a09588a50a8ebd" +SRC_URI[md5sum] = "e1eea03388d12c9ad21ecd7c135fdf8b" +SRC_URI[sha256sum] = "6c2934a3e1e67a5cfd5bb15b1efa71f65c00314ac1ccb5c50da8eae3a0b8147f" inherit pkgconfig autotools-brokensep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:12 +0000 Subject: [oe-commits] [meta-openembedded] 02/09: kea: upgrade 1.7.3 -> 1.7.4 In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.356B9232980@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 047737ec1d9b68c1d198ab8fa369ae17c685647b Author: Zheng Ruoqin AuthorDate: Mon Feb 24 17:54:38 2020 +0800 kea: upgrade 1.7.3 -> 1.7.4 -License-Update: Copyright year updated to 2020. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../recipes-connectivity/kea/{kea_1.7.3.bb => kea_1.7.4.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.3.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb similarity index 90% rename from meta-networking/recipes-connectivity/kea/kea_1.7.3.bb rename to meta-networking/recipes-connectivity/kea/kea_1.7.4.bb index e230fd0..a2c9765 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.7.3.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org" SECTION = "connectivity" LICENSE = "MPL-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e5b01c848c7736a0c9e68f9c9cd0281" +LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" DEPENDS += "kea-native" @@ -14,8 +14,8 @@ SRC_URI = "\ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ " -SRC_URI[md5sum] = "fda03bf465818009b70dffc226da777d" -SRC_URI[sha256sum] = "30f82c548b844c12ed46c4eb3880d63b45ec04cecfcf2e4ab1d7bada7fff4f2a" +SRC_URI[md5sum] = "d2d0e3ad8064a5e6f3ba1e970d39f9cc" +SRC_URI[sha256sum] = "2b7f8d8cafdb9ad2be8df9aceb2de58c8f37c1544e47c28f05e84555d0015ef5" inherit autotools systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:13 +0000 Subject: [oe-commits] [meta-openembedded] 03/09: nginx.service: sleep 0.1 after nginx start In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.427A5232981@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2e789ac3fbdf3c09d9e4e6e6cdff64386e7c631c Author: Changqing Li AuthorDate: Mon Feb 24 19:40:46 2020 +0800 nginx.service: sleep 0.1 after nginx start Fix error info: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/files/nginx.service | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service index 9a6ca96..65c7752 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx.service +++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service @@ -7,6 +7,7 @@ Type=forking PIDFile=/run/nginx/nginx.pid ExecStartPre=@SBINDIR@/nginx -t ExecStart=@SBINDIR@/nginx +ExecStartPost=/bin/sleep 0.1 ExecReload=@SBINDIR@/nginx -s reload ExecStop=@BASE_BINDIR@/kill -s QUIT $MAINPID PrivateTmp=true -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:14 +0000 Subject: [oe-commits] [meta-openembedded] 04/09: fluidsynth: upgrade 2.1.0 -> 2.1.1 In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.5046B232982@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8ba21fc860b8d8fe41791f8e4ee6039f6068f874 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:42 2020 +0100 fluidsynth: upgrade 2.1.0 -> 2.1.1 >From announcement: * a regression introduced in 2.1.0 caused the jack audio driver to not correct a sample-rate mismatch (#607) * pkg-config is now being to used to find readline (#606, thanks to @ffontaine) * fix various typos in the documentation (#600, thanks to @luzpaz) * fix a memory leak in the file renderer * fix leaking memory when sequencer clients were not explicitly unregistered (#610) * fix a heap-based use-after-free in jack driver (#613) * fix the linker possibly not finding libinstpatch (#617, thanks to @realnc) Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 9ce6506..4fb622c 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "37c9ae2bf431a764032f023b3b2c0c0b86b7c272" +SRCREV = "3b851da6f721fcf15ec0b935eba72707bdb53d7b" S = "${WORKDIR}/git" -PV = "2.1.0" +PV = "2.1.1" inherit cmake pkgconfig lib_package -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:15 +0000 Subject: [oe-commits] [meta-openembedded] 05/09: xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.5CA39232983@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1a6c12ebf3489894be6dfb32f99606e6d81d1322 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:43 2020 +0100 xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 Although not explicitly mentioned in release announcement it seems that this is a develpoment release. It was tested and there could be no reason found not to use this version. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{xfce4-sensors-plugin_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb similarity index 86% rename from meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb rename to meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 4d78bb2..8b65014 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" -SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" +SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" +SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" EXTRA_OECONF = " \ --disable-procacpi \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:18 +0000 Subject: [oe-commits] [meta-openembedded] 08/09: fdk-aac: add initial fdk-aac recipe In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.8195D232986@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c3b45b9217ad26aff47e7f7ed0cc2cb3468e2500 Author: Mircea Carausu AuthorDate: Mon Feb 24 16:09:53 2020 -0800 fdk-aac: add initial fdk-aac recipe Add Fraunhofer FDK AAC Codec Library recipe. Signed-off-by: Mircea Carausu Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb new file mode 100644 index 0000000..d791168 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "FDK-AAC audio codec" + +DESCRIPTION = "The Fraunhofer FDK AAC Codec Library for Android \ +(\"FDK AAC Codec\") is software that implements the MPEG \ +Advanced Audio Coding (\"AAC\") encoding and decoding scheme \ +for digital audio." + +HOMEPAGE = "https://www.iis.fraunhofer.de/en/ff/amm/impl.html" + +LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" + +SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master" +SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" + +S = "${WORKDIR}/git" + +SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7" +SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:17 +0000 Subject: [oe-commits] [meta-openembedded] 07/09: span-lite: Add git version In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.74F78232985@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e5d92792314849343bccc1bbfeb8d759ceb87933 Author: William A. Kennington III AuthorDate: Mon Feb 24 15:33:12 2020 -0800 span-lite: Add git version We would generally prefer to use stable releases, but there are fixes in master that have not yet been released for compiling the test cases against libc++. Signed-off-by: William A. Kennington III Signed-off-by: Khem Raj --- meta-oe/recipes-support/span-lite/span-lite_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-oe/recipes-support/span-lite/span-lite_git.bb b/meta-oe/recipes-support/span-lite/span-lite_git.bb new file mode 100644 index 0000000..96ec829 --- /dev/null +++ b/meta-oe/recipes-support/span-lite/span-lite_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "single-file header-only version of a C++20-like span for C++98, C++11 and later" +HOMEPAGE = "https://github.com/martinmoene/span-lite" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI += "git://github.com/martinmoene/span-lite" +SRCREV = "e03d1166ccc8481d993dc02aae703966301a5e6e" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:19 +0000 Subject: [oe-commits] [meta-openembedded] 09/09: ttf-noto-emoji: add recipe In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.8EE1C23298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit af89b262b455a1ab96f479dacb7fc7dd0a2166ce Author: Matt Ranostay AuthorDate: Tue Feb 25 05:59:49 2020 +0200 ttf-noto-emoji: add recipe Add both B/W and color emojis fonts from the noto-emoji project. Important note for the color emojis to render the pixmap PACKAGECONFIG option needs to be set in freetype package. Signed-off-by: Matt Ranostay Signed-off-by: Khem Raj --- .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb new file mode 100644 index 0000000..e74f7a7 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb @@ -0,0 +1,19 @@ +require ttf.inc + +SUMMARY = "Google noto emoji font pack" +HOMEPAGE = "https://github.com/googlefonts/noto-emoji" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" + +SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" +SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" + +PACKAGES = "${PN}-color ${PN}-regular" +FONT_PACKAGES = "${PN}-color ${PN}-regular" + +S = "${WORKDIR}/git" + +FILES_${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf" +FILES_${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf" + +do_compile[noexec] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:03:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:03:16 +0000 Subject: [oe-commits] [meta-openembedded] 06/09: xfce4-sensors-plugin: Change defaults to useful ones In-Reply-To: <158260699050.21862.6922632341827146954@git.openembedded.org> References: <158260699050.21862.6922632341827146954@git.openembedded.org> Message-ID: <20200225050311.69D5B232984@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ce24a054b3cf721f58620f30039626bdf0fba595 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:44 2020 +0100 xfce4-sensors-plugin: Change defaults to useful ones Every time I added xfce4-sensors-plugin to panel xfce4-sensors-plugin suggested sensors not exactly useful. So change defaults: * remove lmsensors * make sysfsacpi work and don't disable it because that's where embedded machines drop useful information Background: Have spent lots of efforts to get Raspi4 cooled properly while running at gouvernor 'performance' and rendering music. Would like to see if it really wears a cool hat [1] [1] https://github.com/schnitzeltony/rpi-cool-hat Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...k-for-sys-class-power_supply-we-are-cross.patch | 44 ++++++++++++++++++++++ .../sensors/xfce4-sensors-plugin_1.3.92.bb | 3 +- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch new file mode 100644 index 0000000..ac1d603 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch @@ -0,0 +1,44 @@ +From 9b7e1beca872ca4a5fce8938c58379103787f79a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 23 Feb 2020 22:06:32 +0100 +Subject: [PATCH] Do not check for /sys/class/power_supply - we are cross + compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas M?ller +--- + configure.ac | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c281af9..60ba0c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -209,19 +209,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AC_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], + [], + [ +- enable_sysfsacpi=auto ++ enable_sysfsacpi=yes + ]) + +-if test x"$enable_sysfsacpi" = x"auto"; then +- AC_CHECK_FILE([/sys/class/power_supply], +- [ +- enable_sysfsacpi=yes +- ], +- [ +- enable_sysfsacpi=no +- ]) +-fi +- + if test x"$enable_sysfsacpi" = x"yes"; then + AC_DEFINE([HAVE_SYSFS_ACPI], [1], [Define to 1 if /sys/class/power_supply is found]) + enable_procacpi=yes +-- +2.21.0 + diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 8b65014..3fd0ff6 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -7,10 +7,10 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ --disable-procacpi \ - --disable-sysfsacpi \ --disable-xnvctrl \ " @@ -18,7 +18,6 @@ do_configure_prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } -PACKAGECONFIG ??= "libsensors" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:14:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:14:00 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (af89b26 -> 926ead9) Message-ID: <158260764005.29262.18242760383634761093@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from af89b26 ttf-noto-emoji: add recipe new 16b981f inotify-tools: upgrade 3.20.1 -> 3.20.2.2 new 926ead9 libuv: upgrade 1.34.0 -> 1.34.2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} | 2 +- ...001-Makefile.am-add-build-rule-for-README.patch | 46 ++++++++++++++++++++++ .../inotify-nosys-fix-system-call-number.patch | 31 --------------- .../inotify-tools/inotify-tools_git.bb | 8 ++-- 4 files changed, 51 insertions(+), 36 deletions(-) rename meta-oe/recipes-connectivity/libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} (90%) create mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch delete mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:14:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:14:02 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: libuv: upgrade 1.34.0 -> 1.34.2 In-Reply-To: <158260764005.29262.18242760383634761093@git.openembedded.org> References: <158260764005.29262.18242760383634761093@git.openembedded.org> Message-ID: <20200225051400.A6055232984@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 926ead9e23143b6d8bfdb2c131dacef2161ed53b Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 22:10:29 2020 +0000 libuv: upgrade 1.34.0 -> 1.34.2 See full changelog https://github.com/libuv/libuv/releases/tag/v1.34.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb similarity index 90% rename from meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb rename to meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb index b842bbd..234cec3 100644 --- a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb +++ b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:14:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:14:01 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: inotify-tools: upgrade 3.20.1 -> 3.20.2.2 In-Reply-To: <158260764005.29262.18242760383634761093@git.openembedded.org> References: <158260764005.29262.18242760383634761093@git.openembedded.org> Message-ID: <20200225051400.92AE5232983@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 16b981f79e39d0887085eea7a63cffead7a299d1 Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 21:03:56 2020 +0000 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...001-Makefile.am-add-build-rule-for-README.patch | 46 ++++++++++++++++++++++ .../inotify-nosys-fix-system-call-number.patch | 31 --------------- .../inotify-tools/inotify-tools_git.bb | 8 ++-- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch new file mode 100644 index 0000000..2c7cd99 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch @@ -0,0 +1,46 @@ +From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Mon, 24 Feb 2020 21:44:45 +0100 +Subject: [PATCH] Makefile.am: add build rule for README + +Fixes: + +| configure.ac:17: installing 'config/config.sub' +| configure.ac:16: installing 'config/install-sh' +| configure.ac:16: installing 'config/missing' +| Makefile.am: error: required file './README' not found +| libinotifytools/src/Makefile.am: installing 'config/depcomp' + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] + +Signed-off-by: Pierre-Jean Texier +--- + Makefile.am | 2 ++ + autogen.sh | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 56e4531..d08c8fe 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = libinotifytools src man + ++README: README.md ++ + dist-hook: + # Automake official documentation states that dist-hook should assume files + # are not writable. +diff --git a/autogen.sh b/autogen.sh +index 48eb21d..31572c2 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,4 +1,3 @@ + #!/bin/sh + +-cp README.md README + autoreconf --install "$@" || exit 1 +-- +2.7.4 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch deleted file mode 100644 index 89b890d..0000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch +++ /dev/null @@ -1,31 +0,0 @@ -inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64 - -The correct value should be the same as defined in -linux/arch/mips/include/uapi/asm/unistd.h - -Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71] - -Signed-off-by: Roy Li -Signed-off-by: Jackie Huang ---- - libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h -index db76b2c..5f7b11b 100644 ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -100,8 +100,8 @@ struct inotify_event { - # endif - # if _MIPS_SIM == _MIPS_SIM_ABI64 - # define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 243) --# define __NR_inotify_rm_watch (__NR_Linux + 243) -+# define __NR_inotify_add_watch (__NR_Linux + 244) -+# define __NR_inotify_rm_watch (__NR_Linux + 245) - # endif - # if _MIPS_SIM == _MIPS_SIM_NABI32 - # define __NR_inotify_init (__NR_Linux + 247) --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index 05ca4b4..f42abeb 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -5,12 +5,12 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "e203934e46784bb34c213078423ba1678e0c4936" -PV = "3.20.1" +SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" +PV = "3.20.2.2" SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://inotify-nosys-fix-system-call-number.patch \ - " + file://0001-Makefile.am-add-build-rule-for-README.patch \ + " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 05:41:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 05:41:18 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: phoronix-test-suite: Do not mark it allarch Message-ID: <158260927848.6369.14892940285576475616@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 52429ce phoronix-test-suite: Do not mark it allarch 52429ce is described below commit 52429ce93bbc1d48193e09be19a1a8049d553b42 Author: Khem Raj AuthorDate: Mon Feb 24 21:38:32 2020 -0800 phoronix-test-suite: Do not mark it allarch This package depends on target packages due to mime/mime-xdg therefore it can no longer be marked as allarch Signed-off-by: Khem Raj --- .../recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb index 4a8e5b5..31b30bb 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "675e7ca96719e2f3b42a6c13421213a398f04da0f8e78f4691fa9261fd S = "${WORKDIR}/phoronix-test-suite" -inherit systemd allarch mime mime-xdg +inherit systemd mime mime-xdg do_install() { DESTDIR=${D} ./install-sh ${exec_prefix} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:55 +0000 Subject: [oe-commits] [openembedded-core] 04/19: webkitgtk: Remove unused DEPENDS on pulseaudio In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.B10CC2329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 33f24afdaa0cf94a6f1029ad919570de15354f51 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:29 2020 +0200 webkitgtk: Remove unused DEPENDS on pulseaudio Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a48a976..c76c410 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -33,7 +33,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+" DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:53 +0000 Subject: [oe-commits] [openembedded-core] 02/19: psplash: Fix systemd service dependencies In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.9AE2223298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e31ad1b58e8dbac2e299bc0cb872c3a82db14717 Author: Richard Purdie AuthorDate: Sat Feb 22 13:55:25 2020 +0000 psplash: Fix systemd service dependencies Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Also, psplash-systemd requires psplash-start, not the other way around as the splash creates the fifo which the other then needs to open. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 2 +- meta/recipes-core/psplash/files/psplash-systemd.service | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index 9de8f63..af9d5d6 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -1,7 +1,7 @@ [Unit] Description=Start psplash boot splash screen DefaultDependencies=no -Requires=psplash-systemd.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f420..249aa54 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,8 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:51 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (0bfb2e9 -> 23ad05b) Message-ID: <158262797113.16900.12196127223912737395@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 0bfb2e9 package_ipk: Add missing variables to the task hash new b4063b1 psplash: add systemd support new e31ad1b psplash: Fix systemd service dependencies new d1cd957 ninja: upgrade 1.9.0 -> 1.10.0 new 33f24af webkitgtk: Remove unused DEPENDS on pulseaudio new 1c16d4a webkitgtk: Remove obsolete gtk2 packageconfig new f29baac webkitgtk: Remove the unused DEPENDS on libidn new 08fa3d8 systemd: Add a PACKAGECONFIG for libidn2 new 2c5d140 libidn: Move to meta-oe new 007df9b Revert "psmisc: Fix dependency for USE_NLS=no" new cb03cce clutter: Build cluter with the GDK backend new 296ee10 wayland: add ptest new e190bf4 apt: Inherit upstream-version-is-even new dfd39d5 bison: Upgrade 3.5.1 -> 3.5.2 new 746438e linux-firmware: Upgrade 20200117 -> 20200122 new 8ad1e84 libcap: Upgrade 2.31 -> 2.32 new d06ea31 lttng-tools: exclude one more test that sporadically fails new 4abb2f2 libinput: update 1.14.3 -> 1.15.2 new 102afcc ptest: add an option to enforce a failure (e.g. ptests are required to pass) new 23ad05b readline/ediline: Fix conflicting manpages The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/maintainers.inc | 1 - meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/lib/oeqa/runtime/cases/ptest.py | 15 +- meta/recipes-core/psplash/files/psplash-init | 8 +- .../psplash/files/psplash-start.service | 10 + .../psplash/files/psplash-systemd.service | 12 + meta/recipes-core/psplash/psplash_git.bb | 38 +- meta/recipes-core/readline/readline.inc | 8 +- meta/recipes-core/systemd/systemd_244.3.bb | 1 + meta/recipes-devtools/apt/apt.inc | 2 +- .../bison/{bison_3.5.1.bb => bison_3.5.2.bb} | 4 +- .../libedit/libedit_20191231-3.1.bb | 6 + meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 --- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +- .../libidn/0001-idn-format-security-warnings.patch | 181 ---------- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 -- .../libidn/libidn/dont-depend-on-help2man.patch | 23 -- .../libidn/libidn_fix_for_automake-1.12.patch | 35 -- meta/recipes-extended/libidn/libidn_1.35.bb | 42 --- meta/recipes-extended/psmisc/psmisc.inc | 2 +- meta/recipes-graphics/clutter/clutter-1.0.inc | 4 +- ...-for-64bit-time_t-for-32bit-architectures.patch | 386 --------------------- .../{libinput_1.14.3.bb => libinput_1.15.2.bb} | 8 +- meta/recipes-graphics/wayland/wayland/run-ptest | 17 + meta/recipes-graphics/wayland/wayland_1.18.0.bb | 14 +- ...ware_20200117.bb => linux-firmware_20200122.bb} | 11 +- ...s-regression-disable-the-tools-live-tests.patch | 15 +- .../images/core-image-sato-sdk-ptest.bb | 3 + meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +- .../libcap/{libcap_2.31.bb => libcap_2.32.bb} | 4 +- 30 files changed, 141 insertions(+), 801 deletions(-) create mode 100644 meta/recipes-core/psplash/files/psplash-start.service create mode 100644 meta/recipes-core/psplash/files/psplash-systemd.service rename meta/recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} (90%) delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) delete mode 100644 meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch delete mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn_1.35.bb delete mode 100644 meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch rename meta/recipes-graphics/wayland/{libinput_1.14.3.bb => libinput_1.15.2.bb} (86%) create mode 100644 meta/recipes-graphics/wayland/wayland/run-ptest rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200117.bb => linux-firmware_20200122.bb} (99%) rename meta/recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:52 +0000 Subject: [oe-commits] [openembedded-core] 01/19: psplash: add systemd support In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.9038523298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b4063b16082604554c7c19b369ebddd27061f372 Author: Stefan Agner AuthorDate: Wed Jan 22 14:20:24 2020 +0000 psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++--- .../psplash/files/psplash-start.service | 10 ++++++ .../psplash/files/psplash-systemd.service | 10 ++++++ meta/recipes-core/psplash/psplash_git.bb | 38 +++++++++++++--------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866..f58e043 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000..9de8f63 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000..e14f420 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1..6ff0393 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -66,7 +68,11 @@ python __anonymous() { S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -97,8 +103,17 @@ python do_compile () { } do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,8 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." - -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:54 +0000 Subject: [oe-commits] [openembedded-core] 03/19: ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.A6B492329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d1cd957cea29f3ab111ae752bc9ad75a1324c255 Author: Upgrade Helper AuthorDate: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 ---------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch deleted file mode 100644 index 7fd7791..0000000 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -Date: Mon, 24 Dec 2018 03:13:16 +0200 -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 - -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward -compatibility macro. Should help avoid hardcoding platform detection. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/disk_interface.cc b/src/disk_interface.cc -index d4c2fb0..dc297c4 100644 ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { - // that it doesn't exist. - if (st.st_mtime == 0) - return 1; --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) -+#if defined(_AIX) -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; -+#elif defined(__APPLE__) - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + - st.st_mtimespec.tv_nsec); --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar -- // For bionic, C and POSIX API is always enabled. -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; --#elif defined(_AIX) -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; - #else - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; - #endif --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb similarity index 87% rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8..bdc6365 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:56 +0000 Subject: [oe-commits] [openembedded-core] 05/19: webkitgtk: Remove obsolete gtk2 packageconfig In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.BC1712329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1c16d4a210e89eb679b4b044c8f6f6fae96e1919 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:30 2020 +0200 webkitgtk: Remove obsolete gtk2 packageconfig Upstream no longer supports GTK2 plugins. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c76c410..145272c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -48,7 +48,6 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" -PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:57 +0000 Subject: [oe-commits] [openembedded-core] 06/19: webkitgtk: Remove the unused DEPENDS on libidn In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.C62272329B1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f29baac5297446495fd61ab4ce7d4d24eb0ba3bb Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:31 2020 +0200 webkitgtk: Remove the unused DEPENDS on libidn Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 145272c..b40699f 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,7 +30,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:58 +0000 Subject: [oe-commits] [openembedded-core] 07/19: systemd: Add a PACKAGECONFIG for libidn2 In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.CEC0F2329B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 08fa3d84fa2bd9ba0904419b2d3d6b0a2492b468 Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:32 2020 +0200 systemd: Add a PACKAGECONFIG for libidn2 Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index b686519..5d86341 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -138,6 +138,7 @@ PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2" PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:00 +0000 Subject: [oe-commits] [openembedded-core] 09/19: Revert "psmisc: Fix dependency for USE_NLS=no" In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.E2BFC2329B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 007df9bba56f885dd847b2f8b24fb250bcdd386f Author: Adrian Bunk AuthorDate: Sun Feb 23 20:30:25 2020 +0200 Revert "psmisc: Fix dependency for USE_NLS=no" This reverts commit 52971eeaaf0adcf859ab04853e9ab2e551e4998f. The original problem was later fix by psmisc: revert to default autopoint exclusion Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-extended/psmisc/psmisc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index a75b047..6ab1288 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -7,7 +7,7 @@ command sends a specified signal (SIGTERM if nothing is specified) to \ processes identified by name. The fuser command identifies the PIDs \ of processes that are using specified files or filesystems." SECTION = "base" -DEPENDS = "ncurses virtual/libintl gettext-native" +DEPENDS = "ncurses virtual/libintl" LICENSE = "GPLv2" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:01 +0000 Subject: [oe-commits] [openembedded-core] 10/19: clutter: Build cluter with the GDK backend In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.EC0CE2329D4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cb03ccec2926eae6d8eaf1606a7d11fcc54f1820 Author: Alistair Francis AuthorDate: Sun Feb 23 12:24:53 2020 -0800 clutter: Build cluter with the GDK backend ClutterActors can crash with strange segfaults when built without the GDK backend but run ontop of GDK. To fix this let's add a PACKAGECONFIG to enable/disable GDK backend support and enable it by default. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter-1.0.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 5dc45eb..e0ac819 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -24,11 +24,11 @@ ERDEPENDS_EVDEV = "xkeyboard-config" # Disable pretty much everything, override in platform specific set up EXTRA_OECONF += "--disable-quartz-backend \ --disable-win32-backend \ - --disable-gdk-backend \ --disable-cex100-backend \ --disable-tslib-input \ " +PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" # Default configuration, distros might want to override -PACKAGECONFIG ??= "egl \ +PACKAGECONFIG ??= "egl gdk \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:03 +0000 Subject: [oe-commits] [openembedded-core] 12/19: apt: Inherit upstream-version-is-even In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.109022329D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e190bf44ed2aef03ce8922dfbb0bb90a762bb41d Author: Adrian Bunk AuthorDate: Sun Feb 23 16:35:58 2020 +0200 apt: Inherit upstream-version-is-even Even versions are shipped in Ubuntu LTS and Debian releases. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 50c4d84..13f5969 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" -inherit autotools gettext useradd +inherit autotools gettext useradd upstream-version-is-even EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:52:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:52:59 +0000 Subject: [oe-commits] [openembedded-core] 08/19: libidn: Move to meta-oe In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105251.D8D8A2329B3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c5d140a8a2b794b36ed9535afc278cec2ef306f Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:33 2020 +0200 libidn: Move to meta-oe There are no users left in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../libidn/0001-idn-format-security-warnings.patch | 181 --------------------- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 ---- .../libidn/libidn/dont-depend-on-help2man.patch | 23 --- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---- meta/recipes-extended/libidn/libidn_1.35.bb | 42 ----- 6 files changed, 316 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5f1dae9..8f612ac 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -340,7 +340,6 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton " RECIPE_MAINTAINER_pn-libical = "Ross Burton " RECIPE_MAINTAINER_pn-libice = "Armin Kuster " RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " -RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " diff --git a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch deleted file mode 100644 index 5adc7d9..0000000 --- a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Tue, 28 Jun 2016 12:43:31 +0100 -Subject: [PATCH] idn: fix printf() format security warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../../libidn-1.32/src/idn.c: In function 'main': -| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security] -| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security] -| fprintf (stderr, _("Type each input string on a line by itself, " -| ^~~~~~~ -| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, errno, _("input error")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ - -Signed-off-by: Andr? Draszik ---- -Upstream-Status: Pending - - src/idn.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/src/idn.c b/src/idn.c -index be1c7d1..68e4291 100644 ---- a/src/idn.c -+++ b/src/idn.c -@@ -170,7 +170,7 @@ main (int argc, char *argv[]) - (args_info.idna_to_unicode_given ? 1 : 0) + - (args_info.nfkc_given ? 1 : 0) != 1) - { -- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -+ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); - usage (EXIT_FAILURE); - } - -@@ -185,7 +185,7 @@ main (int argc, char *argv[]) - if (!args_info.quiet_given - && args_info.inputs_num == 0 - && isatty (fileno (stdin))) -- fprintf (stderr, _("Type each input string on a line by itself, " -+ fprintf (stderr, "%s", _("Type each input string on a line by itself, " - "terminated by a newline character.\n")); - - do -@@ -197,7 +197,7 @@ main (int argc, char *argv[]) - if (feof (stdin)) - break; - -- error (EXIT_FAILURE, errno, _("input error")); -+ error (EXIT_FAILURE, errno, "%s", _("input error")); - } - - if (strlen (line) > 0) -@@ -215,7 +215,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -240,7 +240,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -277,7 +277,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, &len); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - if (args_info.debug_given) -@@ -336,7 +336,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - p = stringprep_utf8_to_locale (r); -@@ -360,7 +360,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, NULL); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - if (args_info.debug_given) -@@ -438,7 +438,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - } - -@@ -494,7 +494,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - p = stringprep_utf8_to_locale (r); -@@ -523,7 +523,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -537,7 +537,8 @@ main (int argc, char *argv[]) - r = stringprep_utf8_nfkc_normalize (p, -1); - free (p); - if (!r) -- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -+ error (EXIT_FAILURE, 0, "%s", -+ _("could not do NFKC normalization")); - - if (args_info.debug_given) - { -@@ -547,7 +548,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - --- -2.8.1 - diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted file mode 100644 index 43bd232..0000000 --- a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Tue, 10 Jul 2012 02:44:30 -0700 -Subject: [PATCH] libidn: fix build with automake 1.12 - -Upstream-Status: Inappropriate - -automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, -and the warnings are treated as errors because of the -Werror parameter. - -These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not -eliminated these deprecated macros yet. So disable the treatment of warnings -as errors until gettext is updated to remove the deprecated macros. - -Signed-off-by: Nitin A Kamble -2012/07/10 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 261dad2..c4f935e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn at gnu.org]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Library code modified: REVISION++ diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch deleted file mode 100644 index 0863530..0000000 --- a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist -diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am ---- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 -+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 -@@ -49,15 +49,9 @@ - - # Man pages. - --dist_man_MANS = idn.1 $(gdoc_MANS) -+dist_man_MANS = $(gdoc_MANS) - MAINTAINERCLEANFILES = $(dist_man_MANS) - --idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ -- $(top_srcdir)/configure.ac -- $(HELP2MAN) \ -- --name="Internationalized Domain Names command line tool" \ -- --output=$@ $(top_builddir)/src/idn$(EXEEXT) -- - # GDOC - - GDOC_BIN = $(srcdir)/gdoc diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted file mode 100644 index 3c0559e..0000000 --- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Wed, 2 May 2012 18:05:19 -0700 -Subject: [PATCH] libtasn1: fix build with automake 1.12 - -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Nitin A Kamble -2012/05/03 - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8297649..7b9626e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) - AC_SUBST(LT_REVISION, 0) - AC_SUBST(LT_AGE, 6) - -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR -+ - AC_PROG_CC - gl_EARLY - lgl_EARLY diff --git a/meta/recipes-extended/libidn/libidn_1.35.bb b/meta/recipes-extended/libidn/libidn_1.35.bb deleted file mode 100644 index d5ce5b4..0000000 --- a/meta/recipes-extended/libidn/libidn_1.35.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Internationalized Domain Name support library" -DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." -HOMEPAGE = "http://www.gnu.org/software/libidn/" -SECTION = "libs" -LICENSE = "(LGPLv2.1+ | LGPLv3) & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ - file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ - file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" -DEPENDS = "virtual/libiconv autoconf-archive" - -inherit pkgconfig autotools gettext texinfo gtk-doc - -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ - file://dont-depend-on-help2man.patch \ - file://0001-idn-format-security-warnings.patch \ - " - -SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" -SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" - -# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 -# so package command into a separate package -PACKAGES =+ "idn" -FILES_idn = "${bindir}/*" - -LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" -LICENSE_idn = "GPLv3+" - -EXTRA_OECONF = "--disable-csharp" - -do_install_append() { - rm -rf ${D}${datadir}/emacs -} - -BBCLASSEXTEND = "native nativesdk" - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:05 +0000 Subject: [oe-commits] [openembedded-core] 14/19: linux-firmware: Upgrade 20200117 -> 20200122 In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.321F82329F1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 746438e5e75d9fd4ccb461f92887a7b02a1c27d1 Author: Adrian Bunk AuthorDate: Sun Feb 23 16:36:00 2020 +0200 linux-firmware: Upgrade 20200117 -> 20200122 Switch to using the tarballs of tagged releases. WHENCE changed due to firmware filename changes. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- ...{linux-firmware_20200117.bb => linux-firmware_20200122.bb} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 8111c41..0d1422c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ + file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -194,13 +194,10 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" +SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2" +SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986" inherit allarch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:04 +0000 Subject: [oe-commits] [openembedded-core] 13/19: bison: Upgrade 3.5.1 -> 3.5.2 In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.1D3B92329D7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit dfd39d51cf712206e86060c5ff20ff35fd1dac80 Author: Adrian Bunk AuthorDate: Sun Feb 23 16:35:59 2020 +0200 bison: Upgrade 3.5.1 -> 3.5.2 Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.1.bb b/meta/recipes-devtools/bison/bison_3.5.2.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.1.bb rename to meta/recipes-devtools/bison/bison_3.5.2.bb index e70252d..b5b4a8e 100644 --- a/meta/recipes-devtools/bison/bison_3.5.1.bb +++ b/meta/recipes-devtools/bison/bison_3.5.2.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" -SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" +SRC_URI[md5sum] = "49fc2cf23e31e697d5072835e1662a97" +SRC_URI[sha256sum] = "24e273db9eb6da8bbb6f0648284d0724a5cbd6268a163db402f961350a4e50dd" inherit autotools gettext texinfo -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:02 +0000 Subject: [oe-commits] [openembedded-core] 11/19: wayland: add ptest In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.016E62329D5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 296ee10bb8491278f050fb9d55f42b0bcf663382 Author: Alexander Kanavin AuthorDate: Sun Feb 23 23:11:11 2020 +0100 wayland: add ptest Sadly, meson makes it very difficult to install tests: the test configuration is written into host-specific binary files, which can't be transferred to the target. (unlike autotools where at least everything happens via Makefiles which can be patched and tweaked via sed and env vars) So the configuration has to be entirely recreated in shell. I managed this for wayland, but weston proved too difficult. I had filed bugs asking upstream to make the tests installable: https://gitlab.freedesktop.org/wayland/wayland/issues/146 https://gitlab.freedesktop.org/wayland/weston/issues/368 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/wayland/run-ptest | 17 +++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 14 +++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 6e77085..4afac58 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -47,6 +47,7 @@ PTESTS_FAST = "\ quilt-ptest \ sed-ptest \ slang-ptest \ + wayland-ptest \ zlib-ptest \ " diff --git a/meta/recipes-graphics/wayland/wayland/run-ptest b/meta/recipes-graphics/wayland/wayland/run-ptest new file mode 100644 index 0000000..7e8d9de --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +export WAYLAND_SCANNER=wayland-scanner +export TEST_DATA_DIR=tests/data +export TEST_OUTPUT_DIR=tests/output +export SED=sed +export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 +export NM=nm + +for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do + $i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 5dc3116..00be3aa 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://run-ptest \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ @@ -23,7 +24,7 @@ SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit meson pkgconfig +inherit meson pkgconfig ptest PACKAGECONFIG ??= "dtd-validation" PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," @@ -39,6 +40,15 @@ do_install_append_class-native() { -i ${D}/${datadir}/aclocal/wayland-scanner.m4 } +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests/data + cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests + cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} + cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ + cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ +} + sysroot_stage_all_append_class-target () { rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ @@ -48,3 +58,5 @@ FILES_${PN} = "${libdir}/*${SOLIBS}" FILES_${PN}-dev += "${bindir} ${datadir}/wayland" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN}-ptest += "binutils sed" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:06 +0000 Subject: [oe-commits] [openembedded-core] 15/19: libcap: Upgrade 2.31 -> 2.32 In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.3FF9F23298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8ad1e843d178e62001147cf3c84bce8797b76b4b Author: Adrian Bunk AuthorDate: Sun Feb 23 14:19:32 2020 +0200 libcap: Upgrade 2.31 -> 2.32 Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcap/libcap_2.31.bb b/meta/recipes-support/libcap/libcap_2.32.bb similarity index 93% rename from meta/recipes-support/libcap/libcap_2.31.bb rename to meta/recipes-support/libcap/libcap_2.32.bb index 97959c1..d78a58f 100644 --- a/meta/recipes-support/libcap/libcap_2.31.bb +++ b/meta/recipes-support/libcap/libcap_2.32.bb @@ -12,8 +12,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[md5sum] = "52120c05dc797b01f5a7ae70f4335e96" -SRC_URI[sha256sum] = "c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46" +SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9" +SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:07 +0000 Subject: [oe-commits] [openembedded-core] 16/19: lttng-tools: exclude one more test that sporadically fails In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.4DC6C232986@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d06ea31f51de19056713377a2f0e9bdcccbd96d5 Author: Alexander Kanavin AuthorDate: Sun Feb 23 14:52:29 2020 +0100 lttng-tools: exclude one more test that sporadically fails Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...01-tests-regression-disable-the-tools-live-tests.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch index a558a09..f2c14ec 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch @@ -1,4 +1,4 @@ -From 5f0ef3e007ed83c1ce7ae817308e5942decc1230 Mon Sep 17 00:00:00 2001 +From c69b68e5c03f1d260025fb1dd9ab7345e31e15ef Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 24 Jan 2020 18:03:25 +0100 Subject: [PATCH] tests/regression: disable the tools/live tests @@ -10,14 +10,14 @@ https://bugs.lttng.org/issues/1217 Upstream-Status: Inappropriate [upstream is working on a real fix] Signed-off-by: Alexander Kanavin --- - tests/regression/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) + tests/regression/Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am -index 73eb9f7..92fc18f 100644 +index 73eb9f7..b92bdbd 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am -@@ -9,9 +9,6 @@ TESTS = tools/filtering/test_invalid_filter \ +@@ -9,14 +9,10 @@ TESTS = tools/filtering/test_invalid_filter \ tools/filtering/test_valid_filter \ tools/streaming/test_ust \ tools/health/test_thread_ok \ @@ -27,3 +27,8 @@ index 73eb9f7..92fc18f 100644 tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ tools/exclusion/test_exclusion \ + tools/snapshots/test_ust_fast \ +- tools/snapshots/test_ust_streaming \ + tools/save-load/test_save \ + tools/save-load/test_load \ + tools/save-load/test_autoload \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:09 +0000 Subject: [oe-commits] [openembedded-core] 18/19: ptest: add an option to enforce a failure (e.g. ptests are required to pass) In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.641892329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 102afcc7ea7d7673183f272a29ab233084ad168b Author: Alexander Kanavin AuthorDate: Sun Feb 23 14:52:31 2020 +0100 ptest: add an option to enforce a failure (e.g. ptests are required to pass) This can be useful with a more specific, targeted and robust set of ptest packages; the benefit is that ptest regressions are caught as they happen and can be more easily traced to changes that caused them. The existing AB ptest image continues to be expected to fail, my observation of the AB runs is that the full set of ptests is not robust enough (particularly around socket/network related tests) and sporadically fails in random places. This can probably be addressed by making ptests exclusive to a worker (e.g. there is no other workload happening at the same time as ptests). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/ptest.py | 15 ++++++++++++++- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index eb284df..5626f70 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -18,7 +18,20 @@ class PtestRunnerTest(OERuntimeTestCase): @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['ptest-runner']) @unittest.expectedFailure - def test_ptestrunner(self): + def test_ptestrunner_expectfail(self): + if not self.td.get('PTEST_EXPECT_FAILURE'): + self.skipTest('Cannot run ptests with @expectedFailure as ptests are required to pass') + self.do_ptestrunner() + + @skipIfNotFeature('ptest', 'Test requires ptest to be in DISTRO_FEATURES') + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['ptest-runner']) + def test_ptestrunner_expectsuccess(self): + if self.td.get('PTEST_EXPECT_FAILURE'): + self.skipTest('Cannot run ptests without @expectedFailure as ptests are expected to fail') + self.do_ptestrunner() + + def do_ptestrunner(self): status, output = self.target.run('which ptest-runner', 0) if status != 0: self.skipTest("No -ptest packages are installed in the image") diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 58c257c..bf749ac 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -18,3 +18,6 @@ IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer # also lttng-tools needs /tmp that has at least 1G QB_MEM = "-m 2048" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:10 +0000 Subject: [oe-commits] [openembedded-core] 19/19: readline/ediline: Fix conflicting manpages In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.6ECEA2329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 23ad05b98a2e1ced47aac3b1d7689c7146ff8c91 Author: Jeremy Puhlman AuthorDate: Sat Feb 22 10:54:00 2020 -0800 readline/ediline: Fix conflicting manpages file /usr/share/man/man3/history.3 conflicts between attempted installs of libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64 Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 8 +++++++- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 07f54a7..4babcbd 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk" CONFFILES_${PN} += "${sysconfdir}/inputrc" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" + # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. SRC_URI_append_class-native = " file://rl-native.map" -LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" \ No newline at end of file +LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 7116c9d..267fdcc 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" BBCLASSEXTEND = "native nativesdk" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:08 +0000 Subject: [oe-commits] [openembedded-core] 17/19: libinput: update 1.14.3 -> 1.15.2 In-Reply-To: <158262797113.16900.12196127223912737395@git.openembedded.org> References: <158262797113.16900.12196127223912737395@git.openembedded.org> Message-ID: <20200225105252.59AB023298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4abb2f270ba61e99993e53d292bcf5310a59dc19 Author: Alexander Kanavin AuthorDate: Sun Feb 23 14:52:30 2020 +0100 libinput: update 1.14.3 -> 1.15.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-for-64bit-time_t-for-32bit-architectures.patch | 386 --------------------- .../{libinput_1.14.3.bb => libinput_1.15.2.bb} | 8 +- 2 files changed, 4 insertions(+), 390 deletions(-) diff --git a/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index 344e6aa..0000000 --- a/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,386 +0,0 @@ -From ab6ce09bfb669177c90cc5c10155eec44e9fc34b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Sat, 23 Nov 2019 17:23:56 -0800 -Subject: [PATCH] Adjust for 64bit time_t for 32bit architectures - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/libinput/libinput/merge_requests/346] -Signed-off-by: Peter Hutterer ---- - meson.build | 1 + - src/evdev-mt-touchpad-buttons.c | 15 ++++--- - src/evdev.c | 5 ++- - src/util-input-event.h | 69 +++++++++++++++++++++++++++++++++ - tools/libinput-record.c | 16 +++++--- - 5 files changed, 90 insertions(+), 16 deletions(-) - create mode 100644 src/util-input-event.h - ---- a/meson.build -+++ b/meson.build -@@ -220,7 +220,8 @@ endif - ############ libinput-util.a ############ - src_libinput_util = [ - 'src/libinput-util.c', -- 'src/libinput-util.h' -+ 'src/libinput-util.h', -+ 'src/util-input-event.h' - ] - libinput_util = static_library('libinput-util', - src_libinput_util, ---- a/src/evdev-mt-touchpad-buttons.c -+++ b/src/evdev-mt-touchpad-buttons.c -@@ -30,6 +30,7 @@ - #include - #include "linux/input.h" - -+#include "util-input-event.h" - #include "evdev-mt-touchpad.h" - - #define DEFAULT_BUTTON_ENTER_TIMEOUT ms2us(100) -@@ -1145,14 +1146,12 @@ tp_notify_clickpadbutton(struct tp_dispa - if (tp->buttons.trackpoint) { - if (is_topbutton) { - struct evdev_dispatch *dispatch = tp->buttons.trackpoint->dispatch; -- struct input_event event; -- struct input_event syn_report = {{ 0, 0 }, EV_SYN, SYN_REPORT, 0 }; -+ struct input_event event, syn_report; -+ int value; - -- event.time = us2tv(time); -- event.type = EV_KEY; -- event.code = button; -- event.value = (state == LIBINPUT_BUTTON_STATE_PRESSED) ? 1 : 0; -- syn_report.time = event.time; -+ value = (state == LIBINPUT_BUTTON_STATE_PRESSED) ? 1 : 0; -+ event = input_event_init(time, EV_KEY, button, value); -+ syn_report = input_event_init(time, EV_SYN, SYN_REPORT, 0); - dispatch->interface->process(dispatch, - tp->buttons.trackpoint, - &event, ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -44,6 +44,7 @@ - #include "filter.h" - #include "libinput-private.h" - #include "quirks.h" -+#include "util-input-event.h" - - #if HAVE_LIBWACOM - #include -@@ -859,7 +860,7 @@ evdev_print_event(struct evdev_device *d - { - static uint32_t offset = 0; - static uint32_t last_time = 0; -- uint32_t time = us2ms(tv2us(&e->time)); -+ uint32_t time = us2ms(input_event_time(e)); - - if (offset == 0) { - offset = time; -@@ -891,7 +892,7 @@ static inline void - evdev_process_event(struct evdev_device *device, struct input_event *e) - { - struct evdev_dispatch *dispatch = device->dispatch; -- uint64_t time = tv2us(&e->time); -+ uint64_t time = input_event_time(e); - - #if 0 - evdev_print_event(device, e); ---- /dev/null -+++ b/src/util-input-event.h -@@ -0,0 +1,69 @@ -+/* -+ * Copyright ? 2019 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#pragma once -+ -+#include "config.h" -+ -+#include "util-time.h" -+#include -+ -+static inline struct input_event -+input_event_init(uint64_t time, -+ unsigned int code, -+ unsigned int type, -+ int value) -+{ -+ struct input_event ev; -+ struct timeval tval = us2tv(time); -+ -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; -+ ev.type = type; -+ ev.code = code; -+ ev.value = value; -+ -+ return ev; -+} -+ -+static inline uint64_t -+input_event_time(const struct input_event *e) -+{ -+ struct timeval tval; -+ -+ tval.tv_sec = e->input_event_sec; -+ tval.tv_usec = e->input_event_usec; -+ -+ return tv2us(&tval); -+} -+ -+ -+static inline void -+input_event_set_time(struct input_event *e, -+ uint64_t time) -+{ -+ struct timeval tval = us2tv(time); -+ -+ e->input_event_sec = tval.tv_sec; -+ e->input_event_usec = tval.tv_usec; -+} ---- a/tools/libinput-record.c -+++ b/tools/libinput-record.c -@@ -41,6 +41,7 @@ - #include - - #include "libinput-versionsort.h" -+#include "util-input-event.h" - #include "libinput-util.h" - #include "libinput-version.h" - #include "libinput-git-version.h" -@@ -196,8 +197,9 @@ print_evdev_event(struct record_context - const char *cname; - bool was_modified = false; - char desc[1024]; -+ uint64_t time = input_event_time(ev) - ctx->offset; - -- ev->time = us2tv(tv2us(&ev->time) - ctx->offset); -+ input_event_set_time(ev, time); - - /* Don't leak passwords unless the user wants to */ - if (!ctx->show_keycodes) -@@ -215,7 +217,7 @@ print_evdev_event(struct record_context - static unsigned long last_ms = 0; - unsigned long time, dt; - -- time = us2ms(tv2us(&ev->time)); -+ time = us2ms(input_event_time(ev)); - dt = time - last_ms; - last_ms = time; - -@@ -239,8 +241,8 @@ print_evdev_event(struct record_context - - iprintf(ctx, - "- [%3lu, %6u, %3d, %3d, %6d] # %s\n", -- ev->time.tv_sec, -- (unsigned int)ev->time.tv_usec, -+ ev->input_event_sec, -+ (unsigned int)ev->input_event_usec, - ev->type, - ev->code, - ev->value, -@@ -268,16 +270,18 @@ handle_evdev_frame(struct record_context - while (libevdev_next_event(evdev, - LIBEVDEV_READ_FLAG_NORMAL, - &e) == LIBEVDEV_READ_STATUS_SUCCESS) { -+ uint64_t time; - - if (ctx->offset == 0) -- ctx->offset = tv2us(&e.time); -+ ctx->offset = input_event_time(&e); - - if (d->nevents == d->events_sz) - resize(d->events, d->events_sz); - - event = &d->events[d->nevents++]; - event->type = EVDEV; -- event->time = tv2us(&e.time) - ctx->offset; -+ time = input_event_time(&e); -+ input_event_set_time(&e, time - ctx->offset); - event->u.evdev = e; - count++; - ---- a/src/libinput-private.h -+++ b/src/libinput-private.h -@@ -39,6 +39,7 @@ - - #include "libinput.h" - #include "libinput-util.h" -+#include "util-time.h" - #include "libinput-version.h" - - #if LIBINPUT_VERSION_MICRO >= 90 ---- a/src/libinput-util.h -+++ b/src/libinput-util.h -@@ -206,12 +206,6 @@ clear_bit(unsigned char *array, int bit) - array[bit / 8] &= ~(1 << (bit % 8)); - } - --static inline void --msleep(unsigned int ms) --{ -- usleep(ms * 1000); --} -- - static inline bool - long_bit_is_set(const unsigned long *array, int bit) - { -@@ -453,53 +447,6 @@ bool - parse_switch_reliability_property(const char *prop, - enum switch_reliability *reliability); - --static inline uint64_t --us(uint64_t us) --{ -- return us; --} -- --static inline uint64_t --ns2us(uint64_t ns) --{ -- return us(ns / 1000); --} -- --static inline uint64_t --ms2us(uint64_t ms) --{ -- return us(ms * 1000); --} -- --static inline uint64_t --s2us(uint64_t s) --{ -- return ms2us(s * 1000); --} -- --static inline uint32_t --us2ms(uint64_t us) --{ -- return (uint32_t)(us / 1000); --} -- --static inline uint64_t --tv2us(const struct timeval *tv) --{ -- return s2us(tv->tv_sec) + tv->tv_usec; --} -- --static inline struct timeval --us2tv(uint64_t time) --{ -- struct timeval tv; -- -- tv.tv_sec = time / ms2us(1000); -- tv.tv_usec = time % ms2us(1000); -- -- return tv; --} -- - static inline bool - safe_atoi_base(const char *str, int *val, int base) - { ---- /dev/null -+++ b/src/util-time.h -@@ -0,0 +1,84 @@ -+/* -+ * Copyright ? 2013-2019 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#pragma once -+ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+ -+static inline void -+msleep(unsigned int ms) -+{ -+ usleep(ms * 1000); -+} -+ -+static inline uint64_t -+us(uint64_t us) -+{ -+ return us; -+} -+ -+static inline uint64_t -+ns2us(uint64_t ns) -+{ -+ return us(ns / 1000); -+} -+ -+static inline uint64_t -+ms2us(uint64_t ms) -+{ -+ return us(ms * 1000); -+} -+ -+static inline uint64_t -+s2us(uint64_t s) -+{ -+ return ms2us(s * 1000); -+} -+ -+static inline uint32_t -+us2ms(uint64_t us) -+{ -+ return (uint32_t)(us / 1000); -+} -+ -+static inline uint64_t -+tv2us(const struct timeval *tv) -+{ -+ return s2us(tv->tv_sec) + tv->tv_usec; -+} -+ -+static inline struct timeval -+us2tv(uint64_t time) -+{ -+ struct timeval tv; -+ -+ tv.tv_sec = time / ms2us(1000); -+ tv.tv_usec = time % ms2us(1000); -+ -+ return tv; -+} diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.15.2.bb similarity index 86% rename from meta/recipes-graphics/wayland/libinput_1.14.3.bb rename to meta/recipes-graphics/wayland/libinput_1.15.2.bb index bc5a76d..8105327 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.15.2.bb @@ -13,11 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ file://determinism.patch \ -" -SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" -SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" + " +SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" +SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" @@ -38,3 +37,4 @@ EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ RPROVIDES_${PN} = "libinput" RREPLACES_${PN} = "libinput" RCONFLICTS_${PN} = "libinput" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:29 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (8566912 -> 2548807) Message-ID: <158262800920.17918.5760191824592490970@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 8566912 readline/ediline: Fix conflicting manpages. discard 800bc98 ptest: add an option to enforce a failure (e.g. ptests are required to pass) discard e688aab libinput: update 1.14.3 -> 1.15.2 discard 1b3d719 lttng-tools: exclude one more test that sporadically fails discard ba1764d libcap: Upgrade 2.31 -> 2.32 discard 3570c8f linux-firmware: Upgrade 20200117 -> 20200122 discard 4d2e767 bison: Upgrade 3.5.1 -> 3.5.2 discard 970f637 apt: Inherit upstream-version-is-even discard 34cf804 wayland: add ptest discard 49126bc clutter: Build cluter with the GDK backend discard e05f8f9 Revert "psmisc: Fix dependency for USE_NLS=no" discard 379bde7 libidn: Move to meta-oe discard 43f37ed systemd: Add a PACKAGECONFIG for libidn2 discard 869f5bb webkitgtk: Remove the unused DEPENDS on libidn discard 2364a41 webkitgtk: Remove obsolete gtk2 packageconfig discard a597632 webkitgtk: Remove unused DEPENDS on pulseaudio discard 4eace19 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements discard 3ebf982 psplash: Fix systemd service dependencies discard 36af6d5 ninja: upgrade 1.9.0 -> 1.10.0 discard eec514e psplash: add systemd support discard dadacb7 HACK: extra debug discard 5399c02 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 07ec86d sstatesig: Log timestamps for hashequiv in reprodubile builds discard df9eeec HACK: signing: Add extra test debug discard 14fabbb glew/curl: specify exclusive package configs discard c95d08b base.bbclass: extend PACKAGECONFIG for conflict package configs add b4063b1 psplash: add systemd support add e31ad1b psplash: Fix systemd service dependencies add d1cd957 ninja: upgrade 1.9.0 -> 1.10.0 add 33f24af webkitgtk: Remove unused DEPENDS on pulseaudio add 1c16d4a webkitgtk: Remove obsolete gtk2 packageconfig add f29baac webkitgtk: Remove the unused DEPENDS on libidn add 08fa3d8 systemd: Add a PACKAGECONFIG for libidn2 add 2c5d140 libidn: Move to meta-oe add 007df9b Revert "psmisc: Fix dependency for USE_NLS=no" add cb03cce clutter: Build cluter with the GDK backend add 296ee10 wayland: add ptest add e190bf4 apt: Inherit upstream-version-is-even add dfd39d5 bison: Upgrade 3.5.1 -> 3.5.2 add 746438e linux-firmware: Upgrade 20200117 -> 20200122 add 8ad1e84 libcap: Upgrade 2.31 -> 2.32 add d06ea31 lttng-tools: exclude one more test that sporadically fails add 4abb2f2 libinput: update 1.14.3 -> 1.15.2 add 102afcc ptest: add an option to enforce a failure (e.g. ptests are required to pass) add 23ad05b readline/ediline: Fix conflicting manpages new 62a07ae base.bbclass: extend PACKAGECONFIG for conflict package configs new 7609b45 glew/curl: specify exclusive package configs new edd3e92 HACK: signing: Add extra test debug new 6ba85fa sstatesig: Log timestamps for hashequiv in reprodubile builds new f18c46a rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 6662c87 HACK: extra debug new 1638216 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new b2228ca hosttools: add utilities for all supported checksums new 8aa356d ruby: install required files for ptest new 96aae95 ffmpeg: add PACKAGECONFIG support for fdk-aac new 12e73d5 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 new 3b9a4f5 libevdev: fix upstream check new 6af54ca perl: fix lib/warnings test on core-image-sato new 3df36c1 opensbi: Update to v0.6 new a44d26f weston: PACKAGECONFIG clients requires wayland new 3837479 make: 4.2.1 -> 4.3 new 9c26595 qemu: Fix CVE-2020-1711 new bc7fd11 docbook-xml: update recipe to stick with the upstream new 2548807 linux-yocto/5.2: update to v5.2.32 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8566912) \ N -- N -- N refs/heads/master-next (2548807) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/bitbake.conf | 3 +- ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 13 ++-- .../files/0001-build-Use-ffreestanding.patch | 28 -------- .../opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 ++++++++-------- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ ...CH-perl-134117-Close-DATA-in-loc_tools.pl.patch | 30 ++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- ...tive_3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 -------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 +++++++++ meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++ meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 +- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++--- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 + 29 files changed, 446 insertions(+), 246 deletions(-) delete mode 100644 meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch rename meta/recipes-bsp/opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} (88%) delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch create mode 100644 meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch create mode 100644 meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch create mode 100644 meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb create mode 100644 meta/recipes-devtools/make/make_4.3.bb create mode 100644 meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch rename meta/recipes-devtools/python/{python3-scons-native_3.1.1.bb => python3-scons-native_3.1.2.bb} (79%) delete mode 100644 meta/recipes-devtools/python/python3-scons_3.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-scons_3.1.2.bb create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:30 +0000 Subject: [oe-commits] [openembedded-core] 01/19: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105329.9F7AC23298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 62a07aebeee4042b807f37aa9a8841061aa0c463 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:32 +0000 Subject: [oe-commits] [openembedded-core] 03/19: HACK: signing: Add extra test debug In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105329.D30E02329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit edd3e92cb487c61dde6e7572b4baa1f5c7fb3925 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:31 +0000 Subject: [oe-commits] [openembedded-core] 02/19: glew/curl: specify exclusive package configs In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105329.B9C6023298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7609b4566785cd81048664daaffb12f0fbaa05b8 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:33 +0000 Subject: [oe-commits] [openembedded-core] 04/19: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105329.EC7FC2329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6ba85fab834c86295b821d2ee6a4b00190f0b344 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..0ff6777 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,7 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -548,6 +549,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:35 +0000 Subject: [oe-commits] [openembedded-core] 06/19: HACK: extra debug In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.2CFE2232986@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6662c8766fa4e07a6caa26687b93a0e1851b6a67 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:34 +0000 Subject: [oe-commits] [openembedded-core] 05/19: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.129D02329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f18c46a1b756df44555e878f4a4a332424968f6d Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:36 +0000 Subject: [oe-commits] [openembedded-core] 07/19: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.4744623298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 16382161d2a93b836b21e31209b2cb93e731a17d Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:28 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements opengl is optional. x11 can be replaced with wayland. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7b3d16d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:37 +0000 Subject: [oe-commits] [openembedded-core] 08/19: hosttools: add utilities for all supported checksums In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.61F3F23298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b2228cad980f907bf6a2b93c45d9fc2a0fb5ecb1 Author: Bartosz Golaszewski AuthorDate: Tue Feb 25 09:18:52 2020 +0100 hosttools: add utilities for all supported checksums Only md5sum and sha256sum are currently provided by HOSTTOOLS. Trying to use any other checksum conversion will result in a build failure. Fix it by adding other supported checksum utilities to HOSTTOOLS. Signed-off-by: Bartosz Golaszewski Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b..e201b67 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -489,7 +489,8 @@ HOSTTOOLS += " \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ - python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ + python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ + sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:38 +0000 Subject: [oe-commits] [openembedded-core] 09/19: ruby: install required files for ptest In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.7CF5E2329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8aa356dc4adc7ba941a1a06f27c848fa2045dda8 Author: Kai Kang AuthorDate: Tue Feb 25 17:06:19 2020 +0800 ruby: install required files for ptest After update to 2.7.0, it fails to start ptest of ruby with errors: | ./test/runner.rb:11:in `require_relative': cannot load such file -- /usr/lib64/ruby/ptest/tool/test/runner (LoadError) and | test/rdoc/test_rdoc_attr.rb: cannot load such file -- rdoc/version | test/did_you_mean/spell_checking/test_key_name_check.rb: cannot load such file -- /usr/lib64/ruby/ptest/lib/did_you_mean Install the required files for the ptest. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index c796318..268b4be 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -45,6 +45,12 @@ do_install_append_class-target () { do_install_ptest () { cp -rf ${S}/test ${D}${PTEST_PATH}/ + + install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb + cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ + mkdir -p ${D}${PTEST_PATH}/lib + cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib + # install test-binaries find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \ | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:41 +0000 Subject: [oe-commits] [openembedded-core] 12/19: libevdev: fix upstream check In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.B15D42329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b9a4f57d02367382c2cf66f84b4c58c91033bde Author: Anuj Mittal AuthorDate: Tue Feb 25 14:45:26 2020 +0800 libevdev: fix upstream check Ignore the ones ending in .90x as they are -rc releases. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 46ed5d7..3523dc0 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -12,3 +12,5 @@ SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:40 +0000 Subject: [oe-commits] [openembedded-core] 11/19: python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.A69E7232986@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12e73d5b24c8c505f5d254e83211d995a83a4322 Author: Tim Orling AuthorDate: Mon Feb 24 20:21:42 2020 -0800 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 THis release is a mix of improvements and fixes: https://github.com/SCons/scons/blob/3.1.2/src/RELEASE.txt * Changed to inherit pypi rather than relying on SOURCEFORGE_MIRROR. * Add SRC_URI for LICENSE file (not included in pypi tarball). * Make it more obvious that RDEPENDS are for class-target and drop empty RDEPENDS from -native * python3-scons-native now DEPENDS on python3-setuptools-native * Tested with core-image-base + packagegroup-core-buildessential with "scons" oe-selftest via testimage. * Tested build of "serf" (which uses python3-scons-native via the scons.bbclass). License-Update: Added "MIT License" text, updated copyright years Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...tive_3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 ------------------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb similarity index 79% rename from meta/recipes-devtools/python/python3-scons-native_3.1.1.bb rename to meta/recipes-devtools/python/python3-scons-native_3.1.2.bb index 5cd5956..9e12730 100644 --- a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb @@ -1,7 +1,6 @@ require python3-scons_${PV}.bb inherit native python3native -DEPENDS = "python3-native" -RDEPENDS_${PN} = "" +DEPENDS = "python3-native python3-setuptools-native" do_install_append() { create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' diff --git a/meta/recipes-devtools/python/python3-scons_3.1.1.bb b/meta/recipes-devtools/python/python3-scons_3.1.1.bb deleted file mode 100644 index 0c7aaea..0000000 --- a/meta/recipes-devtools/python/python3-scons_3.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284" - -SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "35b2a3993313bbedd221d4d5758fd2fd" -SRC_URI[sha256sum] = "4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5" - -S = "${WORKDIR}/scons-${PV}" - -UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -do_install_prepend() { - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* -} - -RDEPENDS_${PN} = "\ - python3-core \ - python3-fcntl \ - python3-io \ - python3-json \ - python3-shell \ - python3-pickle \ - python3-pprint \ - " diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb new file mode 100644 index 0000000..aa7a2a8 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" + +# pypi package does not have a valid license file +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" + +SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" +SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" +SRC_URI[license.md5sum] = "e14e1b33428df24a40a782ae142785d0" +SRC_URI[license.sha256sum] = "72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6" + +S = "${WORKDIR}/scons-${PV}" + +UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +inherit pypi setuptools3 + +do_install_prepend() { + sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* +} + +RDEPENDS_${PN}_class-target = "\ + python3-core \ + python3-fcntl \ + python3-io \ + python3-json \ + python3-shell \ + python3-pickle \ + python3-pprint \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:39 +0000 Subject: [oe-commits] [openembedded-core] 10/19: ffmpeg: add PACKAGECONFIG support for fdk-aac In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.95D0E2329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 96aae95eff5cb3e4917305b9cbce2bc147864355 Author: Scott Branden AuthorDate: Mon Feb 24 16:11:15 2020 -0800 ffmpeg: add PACKAGECONFIG support for fdk-aac Add PACKAGECONFIG support for fdk-aac in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index 20a8249..d7b0641 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -59,6 +59,7 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" +PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:44 +0000 Subject: [oe-commits] [openembedded-core] 15/19: weston: PACKAGECONFIG clients requires wayland In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.D181A2329B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a44d26f681a5637796e8a5e5a967aa45afa97e8b Author: Robert Yang AuthorDate: Mon Feb 24 16:57:06 2020 +0800 weston: PACKAGECONFIG clients requires wayland Fixed: DISTRO_FEATURES_remove = "wayland" $ bitbake weston clients/meson.build:141:4: ERROR: Problem encountered: weston-simple-dmabuf-egl requires option renderer-gl which is not enabled. If you rather not build this, drop "dmabuf-egl" from simple-clients option. WARNING: exit code 1 from a shell command. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb index 83aee87..f8e9e15 100644 --- a/meta/recipes-graphics/wayland/weston_8.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb @@ -27,11 +27,11 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - clients launch" + launch" # # Compositor choices # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:42 +0000 Subject: [oe-commits] [openembedded-core] 13/19: perl: fix lib/warnings test on core-image-sato In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.BC3A723298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6af54ca8f9f4e4d603d839f6a3f0b8138c8b839e Author: Mingde (Matthew) Zeng AuthorDate: Mon Feb 24 13:10:08 2020 -0500 perl: fix lib/warnings test on core-image-sato Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng Signed-off-by: Richard Purdie --- ...CH-perl-134117-Close-DATA-in-loc_tools.pl.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000..79cae0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-by: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012..9d747aa 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:43 +0000 Subject: [oe-commits] [openembedded-core] 14/19: opensbi: Update to v0.6 In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.C723E2329B1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3df36c14ce4827b1e24cc66479d61714527324c6 Author: Alistair Francis AuthorDate: Mon Feb 24 10:35:43 2020 -0800 opensbi: Update to v0.6 Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 13 ++++++---- .../files/0001-build-Use-ffreestanding.patch | 28 ---------------------- .../opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +---- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch index 74d9361..d2a8048 100644 --- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -1,4 +1,4 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 15 Feb 2019 14:57:41 -0800 Subject: [PATCH] Makefile: Don't specify mabi or march @@ -7,23 +7,26 @@ To avoid can't link double-float modules with soft-float modules errors when building 32-bit openSBI don't specify mabi or march. -Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] Signed-off-by: Alistair Francis + --- Makefile | 2 -- 1 file changed, 2 deletions(-) +diff --git a/Makefile b/Makefile +index ccf8ea3..69e5b38 100644 --- a/Makefile +++ b/Makefile -@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -mno-save-restore -mstrict-align -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) CFLAGS += $(GENFLAGS) CFLAGS += $(platform-cflags-y) -@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -mno-save-restore -mstrict-align diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch deleted file mode 100644 index 4899fad..0000000 --- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Jan 2020 18:21:02 -0800 -Subject: [PATCH] build: Use -ffreestanding - -this is a stand-alone/baremetal application, therefore demanding --ffreestanding would help it compile with hosted toolchains e.g. ( linux -toolchains ), it also ensures that it won't be using platform -optimizations like inlining mem* str* functions which gcc might decide -especially with wrapper string functions in opensbi code - -Upstream-Status: Accepted [https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961] -Signed-off-by: Khem Raj ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb similarity index 88% rename from meta/recipes-bsp/opensbi/opensbi_0.5.bb rename to meta/recipes-bsp/opensbi/opensbi_0.6.bb index 71d64fa..56f2d4b 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb @@ -7,17 +7,13 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" +SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" SRC_URI = "git://github.com/riscv/opensbi.git \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ - file://0001-build-Use-ffreestanding.patch \ " S = "${WORKDIR}/git" -SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df" -SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300" - EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:47 +0000 Subject: [oe-commits] [openembedded-core] 18/19: docbook-xml: update recipe to stick with the upstream In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.F2FD62329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bc7fd1153be96d7f0d769fd5b44497c51ab929a1 Author: Gregor Zatko AuthorDate: Sun Feb 23 14:22:57 2020 +0100 docbook-xml: update recipe to stick with the upstream Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko Signed-off-by: Richard Purdie --- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++++----------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 6452c8d..dbea697 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -1,52 +1,50 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set. It ships with the latest DocBook 4.5 \ +XML DTD." +HOMEPAGE = "https://www.docbook.org/xml/" + +PR = "r1" LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +ARCHIVE_NAME = "docbook-xml-${PV}.zip" + # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When # upgrading this recipe, please verify whether this is still needed. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ +SRC_URI = "\ + https://docbook.org/xml/${PV}/${ARCHIVE_NAME} \ + file://LICENSE-OASIS \ " +SRC_URI[md5sum] = "03083e288e87a7e829e437358da7ef9e" +SRC_URI[sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" - -S = "${WORKDIR}/docbook-xml-4.5.c31424" +UPSTREAM_CHECK_URI = "https://docbook.org/xml/${PV}/" -inherit allarch +inherit allarch xmlcatalog BBCLASSEXTEND = "native" -do_configure (){ - : -} +# the XMLCATALOGS variable is used in xmlcatalog BB class +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -do_compile (){ - : -} +S = "${WORKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" do_install () { + install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION - install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml - done + DEST=${datadir}/xml/docbook/schema/dtd/${PV} + install -d -m 755 ${D}$DEST + cp -v catalog.xml ${D}$DEST + xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml } -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES_${PN} = "\ + ${datadir}/* \ + ${XMLCATALOGS} \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:48 +0000 Subject: [oe-commits] [openembedded-core] 19/19: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105331.0AD4F2329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2548807b23302aada037178459928f6deb50974d Author: Bruce Ashfield AuthorDate: Mon Feb 24 15:02:02 2020 -0500 linux-yocto/5.2: update to v5.2.32 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:45 +0000 Subject: [oe-commits] [openembedded-core] 16/19: make: 4.2.1 -> 4.3 In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.DD60B23298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 38374792ace2dd1c2483944e2fc82c646e1f505e Author: Jens Rehsack AuthorDate: Mon Feb 24 15:39:20 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Fix incompatibility issues between gnulib bundled with updated make fix issues in w32 compat sources. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ 10 files changed, 246 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch new file mode 100644 index 0000000..096bcfd --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch @@ -0,0 +1,38 @@ +From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 17:39:56 +0100 +Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX + +When cross compiling for a system without getloadavg, do not try add +additional linker paths unless it's absolutely necessary. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + m4/getloadavg.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 3bd2a14..696c5de 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], + fi + + if test $gl_func_getloadavg_done = no; then ++ AS_CASE([$host_os], ++ [aix*], [ + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + gl_getloadavg_LIBS=$LIBS +@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], + AC_CHECK_LIB([getloadavg], [getloadavg], + [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], + [LIBS=$gl_getloadavg_LIBS]) ++ ], [:]) + fi + + # Set up the replacement function if necessary. +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch new file mode 100644 index 0000000..5797082 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch @@ -0,0 +1,41 @@ +From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 10:52:21 +0100 +Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning + +Fix compiler warning: + src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the + length of the source argument [-Wstringop-overflow=] + +The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the +size of the buffer is increased by 1 to hold a path with the length of +`MAXPATHLEN` and trailing `0`. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/dir.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dir.c b/src/dir.c +index 862a18e..cad4c4a 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) + if (plen > 1 && path[plen - 1] == '.' + && (path[plen - 2] == '/' || path[plen - 2] == '\\')) + { +- char parent[MAXPATHLEN]; ++ char parent[MAXPATHLEN+1]; + +- strncpy (parent, path, plen - 2); +- parent[plen - 2] = '\0'; ++ strncpy (parent, path, MAXPATHLEN); ++ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; + if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) + return -1; + } +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch new file mode 100644 index 0000000..b3d97f9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch @@ -0,0 +1,33 @@ +From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 12:10:06 +0100 +Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing + projects + +GNU project `make` relies on gnulib but provides some own compatibility +functions - including an `fcntl`, which fails on mingw. +The intension of gnulib is providing these functions and being wider tested, +but silently injecting a function opens battle of compatibility layers. + +So adding a hint into target `config.h` to allow deciding whether using +an own compatibility implementation or not. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + + m4/gnulib-comp.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 3ee0811..cf75541 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -147,6 +147,7 @@ + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) ++ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch new file mode 100644 index 0000000..9ecc445 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch @@ -0,0 +1,36 @@ +From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 11:12:43 +0100 +Subject: [PATCH 2/3] w32: compat: dirent.c: follow header + +src/w32/include/dirent.h completely delegates to mingw dirent implementation, +gnulib detects it as fine and completely usable - trust in that. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/w32/compat/dirent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c +index b8ec615..de80f72 100644 +--- a/src/w32/compat/dirent.c ++++ b/src/w32/compat/dirent.c +@@ -23,7 +23,7 @@ this program. If not, see . */ + #include + #include "dirent.h" + +- ++#ifndef __MINGW32__ + DIR* + opendir(const char* pDirName) + { +@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) + + return; + } ++#endif /* !__MINGW32__ */ +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch new file mode 100644 index 0000000..70414c5 --- /dev/null +++ b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch @@ -0,0 +1,79 @@ +From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 19:29:49 +0100 +Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated + +Rate the fcntl emulation from gnulib higher than the own one. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/output.h | 19 ++++++++++++++----- + src/w32/compat/posixfcn.c | 2 ++ + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/output.h b/src/output.h +index a506505..d3ce6b7 100644 +--- a/src/output.h ++++ b/src/output.h +@@ -67,14 +67,21 @@ void output_dump (struct output *out); + + # ifdef WINDOWS32 + /* For emulations in w32/compat/posixfcn.c. */ +-# define F_GETFD 1 +-# define F_SETLKW 2 ++# ifndef F_GETFD ++# define F_GETFD 1 ++# endif ++# ifndef F_SETLKW ++# define F_SETLKW 2 ++# endif + /* Implementation note: None of the values of l_type below can be zero + -- they are compared with a static instance of the struct, so zero + means unknown/invalid, see w32/compat/posixfcn.c. */ +-# define F_WRLCK 1 +-# define F_UNLCK 2 +- ++# ifndef F_WRLCK ++# define F_WRLCK 1 ++# endif ++# ifndef F_UNLCK ++# define F_UNLCK 2 ++# endif + struct flock + { + short l_type; +@@ -89,7 +96,9 @@ struct flock + typedef intptr_t sync_handle_t; + + /* Public functions emulated/provided in posixfcn.c. */ ++# ifndef HAVE_GNULIB_FCNTL + int fcntl (intptr_t fd, int cmd, ...); ++# endif + intptr_t create_mutex (void); + int same_stream (FILE *f1, FILE *f2); + +diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c +index 975dfb7..d337b9c 100644 +--- a/src/w32/compat/posixfcn.c ++++ b/src/w32/compat/posixfcn.c +@@ -29,6 +29,7 @@ this program. If not, see . */ + #ifndef NO_OUTPUT_SYNC + /* Support for OUTPUT_SYNC and related functionality. */ + ++#ifndef HAVE_GNULIB_FCNTL + /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ + int + fcntl (intptr_t fd, int cmd, ...) +@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) + return -1; + } + } ++#endif /* GNULIB_TEST_FCNTL */ + + static intptr_t mutex_handle = -1; + +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..70caf0a --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,18 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +SRC_URI += "\ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ + file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ + file://0002-w32-compat-dirent.c-follow-header.patch \ + file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ +" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 10:53:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 10:53:46 +0000 Subject: [oe-commits] [openembedded-core] 17/19: qemu: Fix CVE-2020-1711 In-Reply-To: <158262800920.17918.5760191824592490970@git.openembedded.org> References: <158262800920.17918.5760191824592490970@git.openembedded.org> Message-ID: <20200225105330.E82F72329B3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9c2659503dc5aa8b8d7af1bad15895657115a974 Author: Lee Chee Yang AuthorDate: Mon Feb 24 13:46:53 2020 +0800 qemu: Fix CVE-2020-1711 see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..f26e722 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:15 +0000 Subject: [oe-commits] [openembedded-core] 01/20: abi_version/sstatesig: Introduce HASHEQUIV_HASH_VERSION In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110314.E963E23298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1c2d5aeae2fa2dfc16bc60b6cf0b310f826337fd Author: Richard Purdie AuthorDate: Tue Feb 25 11:01:02 2020 +0000 abi_version/sstatesig: Introduce HASHEQUIV_HASH_VERSION We've found we need a way to cause a change in signatures and move to a new hash 'namespace' with hashequiv. This introduces a variable which allows us to do this. Signed-off-by: Richard Purdie --- meta/conf/abi_version.conf | 8 ++++++++ meta/lib/oe/sstatesig.py | 3 +++ 2 files changed, 11 insertions(+) diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index 4964880..2bdc556 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -5,3 +5,11 @@ # with general agreement from the core team. # OELAYOUT_ABI = "12" + +# +# HASHEQUIV_HASH_VERSION is injected into the output hash calculation used by +# hashequiv. Changing this means previous hashes will no longer match, allowing +# a reset of the equivalence, for example when reproducibility issues break the +# existing match data. Distros can also append to this value for the same effect. +# +HASHEQUIV_HASH_VERSION = "1" diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66..d24e373 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,11 +477,14 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + extra_content = d.getVar('HASHEQUIV_HASH_VERSION') try: os.chdir(path) update_hash("OEOuthashBasic\n") + if extra_content: + update_hash(extra_content + "\n") # It is only currently useful to get equivalent hashes for things that # can be restored from sstate. Since the sstate object is named using -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:14 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2548807 -> a9678aa) Message-ID: <158262859469.3281.10508557083334769608@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 2548807 linux-yocto/5.2: update to v5.2.32 discard bc7fd11 docbook-xml: update recipe to stick with the upstream discard 9c26595 qemu: Fix CVE-2020-1711 discard 3837479 make: 4.2.1 -> 4.3 discard a44d26f weston: PACKAGECONFIG clients requires wayland discard 3df36c1 opensbi: Update to v0.6 discard 6af54ca perl: fix lib/warnings test on core-image-sato discard 3b9a4f5 libevdev: fix upstream check discard 12e73d5 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 discard 96aae95 ffmpeg: add PACKAGECONFIG support for fdk-aac discard 8aa356d ruby: install required files for ptest discard b2228ca hosttools: add utilities for all supported checksums discard 1638216 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements discard 6662c87 HACK: extra debug discard f18c46a rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 6ba85fa sstatesig: Log timestamps for hashequiv in reprodubile builds discard edd3e92 HACK: signing: Add extra test debug discard 7609b45 glew/curl: specify exclusive package configs discard 62a07ae base.bbclass: extend PACKAGECONFIG for conflict package configs new 1c2d5ae abi_version/sstatesig: Introduce HASHEQUIV_HASH_VERSION new 6b3e550 base.bbclass: extend PACKAGECONFIG for conflict package configs new ac8d2375 glew/curl: specify exclusive package configs new af1ac2a HACK: signing: Add extra test debug new b7b2d94 sstatesig: Log timestamps for hashequiv in reprodubile builds new 2802967 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 654306b HACK: extra debug new 341fc35 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new 20d505e hosttools: add utilities for all supported checksums new 2d5dc1c ruby: install required files for ptest new d9c14b7 ffmpeg: add PACKAGECONFIG support for fdk-aac new f357df5 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 new 876488e libevdev: fix upstream check new cf0e6ca perl: fix lib/warnings test on core-image-sato new ec2b3b2 opensbi: Update to v0.6 new 77fe7ef weston: PACKAGECONFIG clients requires wayland new eec0cbc make: 4.2.1 -> 4.3 new 01b30ef qemu: Fix CVE-2020-1711 new 41a23aa docbook-xml: update recipe to stick with the upstream new a9678aa linux-yocto/5.2: update to v5.2.32 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2548807) \ N -- N -- N refs/heads/master-next (a9678aa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/abi_version.conf | 8 ++++++++ meta/lib/oe/sstatesig.py | 3 +++ 2 files changed, 11 insertions(+) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:18 +0000 Subject: [oe-commits] [openembedded-core] 04/20: HACK: signing: Add extra test debug In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.2AB452329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af1ac2af403bdb9416129fb6812c935c445a3d90 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:16 +0000 Subject: [oe-commits] [openembedded-core] 02/20: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.0D61623298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6b3e550690b289f7f1a6e7a92abf2653d9b206f9 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:17 +0000 Subject: [oe-commits] [openembedded-core] 03/20: glew/curl: specify exclusive package configs In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.1DAD82329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ac8d2375d096dce893856f5e8a505d137105fba7 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:19 +0000 Subject: [oe-commits] [openembedded-core] 05/20: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.37EAE2329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b7b2d940708ca4aa270a41181713bd5bfd171023 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..4fc75a9 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -478,6 +478,7 @@ def OEOuthashBasic(path, sigfile, task, d): prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' extra_content = d.getVar('HASHEQUIV_HASH_VERSION') + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -551,6 +552,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:21 +0000 Subject: [oe-commits] [openembedded-core] 07/20: HACK: extra debug In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.556FD2329B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 654306b10f3aab88789921b1c84a22272bb0e193 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:22 +0000 Subject: [oe-commits] [openembedded-core] 08/20: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.60EED2329B3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 341fc3564594a49be67c0976f1f9eead445ec83d Author: Adrian Bunk AuthorDate: Sun Feb 23 20:29:28 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements opengl is optional. x11 can be replaced with wayland. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7b3d16d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:20 +0000 Subject: [oe-commits] [openembedded-core] 06/20: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.45FED2329B1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 28029675e9f8087c0b71259f9992ed52897de62a Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:23 +0000 Subject: [oe-commits] [openembedded-core] 09/20: hosttools: add utilities for all supported checksums In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.70D772329B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 20d505e4a9ec85b4c77f1eeab221d010b8652ef7 Author: Bartosz Golaszewski AuthorDate: Tue Feb 25 09:18:52 2020 +0100 hosttools: add utilities for all supported checksums Only md5sum and sha256sum are currently provided by HOSTTOOLS. Trying to use any other checksum conversion will result in a build failure. Fix it by adding other supported checksum utilities to HOSTTOOLS. Signed-off-by: Bartosz Golaszewski Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b..e201b67 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -489,7 +489,8 @@ HOSTTOOLS += " \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ - python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ + python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ + sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:24 +0000 Subject: [oe-commits] [openembedded-core] 10/20: ruby: install required files for ptest In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.7DB3423298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2d5dc1cc00f7fb66b88f89f82365c4a9230a1a51 Author: Kai Kang AuthorDate: Tue Feb 25 17:06:19 2020 +0800 ruby: install required files for ptest After update to 2.7.0, it fails to start ptest of ruby with errors: | ./test/runner.rb:11:in `require_relative': cannot load such file -- /usr/lib64/ruby/ptest/tool/test/runner (LoadError) and | test/rdoc/test_rdoc_attr.rb: cannot load such file -- rdoc/version | test/did_you_mean/spell_checking/test_key_name_check.rb: cannot load such file -- /usr/lib64/ruby/ptest/lib/did_you_mean Install the required files for the ptest. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index c796318..268b4be 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -45,6 +45,12 @@ do_install_append_class-target () { do_install_ptest () { cp -rf ${S}/test ${D}${PTEST_PATH}/ + + install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb + cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ + mkdir -p ${D}${PTEST_PATH}/lib + cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib + # install test-binaries find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \ | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:25 +0000 Subject: [oe-commits] [openembedded-core] 11/20: ffmpeg: add PACKAGECONFIG support for fdk-aac In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.880492329D4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d9c14b79d1504f055e843d0521e68f5f2c1bdf87 Author: Scott Branden AuthorDate: Mon Feb 24 16:11:15 2020 -0800 ffmpeg: add PACKAGECONFIG support for fdk-aac Add PACKAGECONFIG support for fdk-aac in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index 20a8249..d7b0641 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -59,6 +59,7 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" +PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:27 +0000 Subject: [oe-commits] [openembedded-core] 13/20: libevdev: fix upstream check In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.A7AA82329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 876488e119e344f0e1d8f5e23f3e681894c1a280 Author: Anuj Mittal AuthorDate: Tue Feb 25 14:45:26 2020 +0800 libevdev: fix upstream check Ignore the ones ending in .90x as they are -rc releases. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 46ed5d7..3523dc0 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -12,3 +12,5 @@ SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:26 +0000 Subject: [oe-commits] [openembedded-core] 12/20: python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.9867E232986@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f357df5a01f4e1e298f9d5f247334e9c3c97edf2 Author: Tim Orling AuthorDate: Mon Feb 24 20:21:42 2020 -0800 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 THis release is a mix of improvements and fixes: https://github.com/SCons/scons/blob/3.1.2/src/RELEASE.txt * Changed to inherit pypi rather than relying on SOURCEFORGE_MIRROR. * Add SRC_URI for LICENSE file (not included in pypi tarball). * Make it more obvious that RDEPENDS are for class-target and drop empty RDEPENDS from -native * python3-scons-native now DEPENDS on python3-setuptools-native * Tested with core-image-base + packagegroup-core-buildessential with "scons" oe-selftest via testimage. * Tested build of "serf" (which uses python3-scons-native via the scons.bbclass). License-Update: Added "MIT License" text, updated copyright years Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...tive_3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 ------------------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb similarity index 79% rename from meta/recipes-devtools/python/python3-scons-native_3.1.1.bb rename to meta/recipes-devtools/python/python3-scons-native_3.1.2.bb index 5cd5956..9e12730 100644 --- a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb @@ -1,7 +1,6 @@ require python3-scons_${PV}.bb inherit native python3native -DEPENDS = "python3-native" -RDEPENDS_${PN} = "" +DEPENDS = "python3-native python3-setuptools-native" do_install_append() { create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' diff --git a/meta/recipes-devtools/python/python3-scons_3.1.1.bb b/meta/recipes-devtools/python/python3-scons_3.1.1.bb deleted file mode 100644 index 0c7aaea..0000000 --- a/meta/recipes-devtools/python/python3-scons_3.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284" - -SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "35b2a3993313bbedd221d4d5758fd2fd" -SRC_URI[sha256sum] = "4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5" - -S = "${WORKDIR}/scons-${PV}" - -UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -do_install_prepend() { - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* -} - -RDEPENDS_${PN} = "\ - python3-core \ - python3-fcntl \ - python3-io \ - python3-json \ - python3-shell \ - python3-pickle \ - python3-pprint \ - " diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb new file mode 100644 index 0000000..aa7a2a8 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" + +# pypi package does not have a valid license file +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" + +SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" +SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" +SRC_URI[license.md5sum] = "e14e1b33428df24a40a782ae142785d0" +SRC_URI[license.sha256sum] = "72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6" + +S = "${WORKDIR}/scons-${PV}" + +UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +inherit pypi setuptools3 + +do_install_prepend() { + sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* +} + +RDEPENDS_${PN}_class-target = "\ + python3-core \ + python3-fcntl \ + python3-io \ + python3-json \ + python3-shell \ + python3-pickle \ + python3-pprint \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:29 +0000 Subject: [oe-commits] [openembedded-core] 15/20: opensbi: Update to v0.6 In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.CC6C82329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ec2b3b266ef73ae5418ecdffbf9da515eb810742 Author: Alistair Francis AuthorDate: Mon Feb 24 10:35:43 2020 -0800 opensbi: Update to v0.6 Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 13 ++++++---- .../files/0001-build-Use-ffreestanding.patch | 28 ---------------------- .../opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +---- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch index 74d9361..d2a8048 100644 --- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -1,4 +1,4 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 15 Feb 2019 14:57:41 -0800 Subject: [PATCH] Makefile: Don't specify mabi or march @@ -7,23 +7,26 @@ To avoid can't link double-float modules with soft-float modules errors when building 32-bit openSBI don't specify mabi or march. -Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] Signed-off-by: Alistair Francis + --- Makefile | 2 -- 1 file changed, 2 deletions(-) +diff --git a/Makefile b/Makefile +index ccf8ea3..69e5b38 100644 --- a/Makefile +++ b/Makefile -@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -mno-save-restore -mstrict-align -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) CFLAGS += $(GENFLAGS) CFLAGS += $(platform-cflags-y) -@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -mno-save-restore -mstrict-align diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch deleted file mode 100644 index 4899fad..0000000 --- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Jan 2020 18:21:02 -0800 -Subject: [PATCH] build: Use -ffreestanding - -this is a stand-alone/baremetal application, therefore demanding --ffreestanding would help it compile with hosted toolchains e.g. ( linux -toolchains ), it also ensures that it won't be using platform -optimizations like inlining mem* str* functions which gcc might decide -especially with wrapper string functions in opensbi code - -Upstream-Status: Accepted [https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961] -Signed-off-by: Khem Raj ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb similarity index 88% rename from meta/recipes-bsp/opensbi/opensbi_0.5.bb rename to meta/recipes-bsp/opensbi/opensbi_0.6.bb index 71d64fa..56f2d4b 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb @@ -7,17 +7,13 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" +SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" SRC_URI = "git://github.com/riscv/opensbi.git \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ - file://0001-build-Use-ffreestanding.patch \ " S = "${WORKDIR}/git" -SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df" -SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300" - EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:28 +0000 Subject: [oe-commits] [openembedded-core] 14/20: perl: fix lib/warnings test on core-image-sato In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.BBBAE23298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cf0e6ca30e39ae88fd25460b2669649b51f1afb0 Author: Mingde (Matthew) Zeng AuthorDate: Mon Feb 24 13:10:08 2020 -0500 perl: fix lib/warnings test on core-image-sato Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng Signed-off-by: Richard Purdie --- ...CH-perl-134117-Close-DATA-in-loc_tools.pl.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000..79cae0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-by: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012..9d747aa 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:30 +0000 Subject: [oe-commits] [openembedded-core] 16/20: weston: PACKAGECONFIG clients requires wayland In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110315.E74532329D5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 77fe7effea7646ac1b29487fbae3c036eac932ef Author: Robert Yang AuthorDate: Mon Feb 24 16:57:06 2020 +0800 weston: PACKAGECONFIG clients requires wayland Fixed: DISTRO_FEATURES_remove = "wayland" $ bitbake weston clients/meson.build:141:4: ERROR: Problem encountered: weston-simple-dmabuf-egl requires option renderer-gl which is not enabled. If you rather not build this, drop "dmabuf-egl" from simple-clients option. WARNING: exit code 1 from a shell command. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb index 83aee87..f8e9e15 100644 --- a/meta/recipes-graphics/wayland/weston_8.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb @@ -27,11 +27,11 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - clients launch" + launch" # # Compositor choices # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:31 +0000 Subject: [oe-commits] [openembedded-core] 17/20: make: 4.2.1 -> 4.3 In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110316.0CD092329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eec0cbce4ce4f6d42f54b56f3a137c76343652d3 Author: Jens Rehsack AuthorDate: Mon Feb 24 15:39:20 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Fix incompatibility issues between gnulib bundled with updated make fix issues in w32 compat sources. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ 10 files changed, 246 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch new file mode 100644 index 0000000..096bcfd --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch @@ -0,0 +1,38 @@ +From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 17:39:56 +0100 +Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX + +When cross compiling for a system without getloadavg, do not try add +additional linker paths unless it's absolutely necessary. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + m4/getloadavg.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 3bd2a14..696c5de 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], + fi + + if test $gl_func_getloadavg_done = no; then ++ AS_CASE([$host_os], ++ [aix*], [ + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + gl_getloadavg_LIBS=$LIBS +@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], + AC_CHECK_LIB([getloadavg], [getloadavg], + [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], + [LIBS=$gl_getloadavg_LIBS]) ++ ], [:]) + fi + + # Set up the replacement function if necessary. +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch new file mode 100644 index 0000000..5797082 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch @@ -0,0 +1,41 @@ +From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 10:52:21 +0100 +Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning + +Fix compiler warning: + src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the + length of the source argument [-Wstringop-overflow=] + +The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the +size of the buffer is increased by 1 to hold a path with the length of +`MAXPATHLEN` and trailing `0`. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/dir.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dir.c b/src/dir.c +index 862a18e..cad4c4a 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) + if (plen > 1 && path[plen - 1] == '.' + && (path[plen - 2] == '/' || path[plen - 2] == '\\')) + { +- char parent[MAXPATHLEN]; ++ char parent[MAXPATHLEN+1]; + +- strncpy (parent, path, plen - 2); +- parent[plen - 2] = '\0'; ++ strncpy (parent, path, MAXPATHLEN); ++ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; + if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) + return -1; + } +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch new file mode 100644 index 0000000..b3d97f9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch @@ -0,0 +1,33 @@ +From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 12:10:06 +0100 +Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing + projects + +GNU project `make` relies on gnulib but provides some own compatibility +functions - including an `fcntl`, which fails on mingw. +The intension of gnulib is providing these functions and being wider tested, +but silently injecting a function opens battle of compatibility layers. + +So adding a hint into target `config.h` to allow deciding whether using +an own compatibility implementation or not. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + + m4/gnulib-comp.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 3ee0811..cf75541 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -147,6 +147,7 @@ + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) ++ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch new file mode 100644 index 0000000..9ecc445 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch @@ -0,0 +1,36 @@ +From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 11:12:43 +0100 +Subject: [PATCH 2/3] w32: compat: dirent.c: follow header + +src/w32/include/dirent.h completely delegates to mingw dirent implementation, +gnulib detects it as fine and completely usable - trust in that. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/w32/compat/dirent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c +index b8ec615..de80f72 100644 +--- a/src/w32/compat/dirent.c ++++ b/src/w32/compat/dirent.c +@@ -23,7 +23,7 @@ this program. If not, see . */ + #include + #include "dirent.h" + +- ++#ifndef __MINGW32__ + DIR* + opendir(const char* pDirName) + { +@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) + + return; + } ++#endif /* !__MINGW32__ */ +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch new file mode 100644 index 0000000..70414c5 --- /dev/null +++ b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch @@ -0,0 +1,79 @@ +From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 19:29:49 +0100 +Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated + +Rate the fcntl emulation from gnulib higher than the own one. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/output.h | 19 ++++++++++++++----- + src/w32/compat/posixfcn.c | 2 ++ + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/output.h b/src/output.h +index a506505..d3ce6b7 100644 +--- a/src/output.h ++++ b/src/output.h +@@ -67,14 +67,21 @@ void output_dump (struct output *out); + + # ifdef WINDOWS32 + /* For emulations in w32/compat/posixfcn.c. */ +-# define F_GETFD 1 +-# define F_SETLKW 2 ++# ifndef F_GETFD ++# define F_GETFD 1 ++# endif ++# ifndef F_SETLKW ++# define F_SETLKW 2 ++# endif + /* Implementation note: None of the values of l_type below can be zero + -- they are compared with a static instance of the struct, so zero + means unknown/invalid, see w32/compat/posixfcn.c. */ +-# define F_WRLCK 1 +-# define F_UNLCK 2 +- ++# ifndef F_WRLCK ++# define F_WRLCK 1 ++# endif ++# ifndef F_UNLCK ++# define F_UNLCK 2 ++# endif + struct flock + { + short l_type; +@@ -89,7 +96,9 @@ struct flock + typedef intptr_t sync_handle_t; + + /* Public functions emulated/provided in posixfcn.c. */ ++# ifndef HAVE_GNULIB_FCNTL + int fcntl (intptr_t fd, int cmd, ...); ++# endif + intptr_t create_mutex (void); + int same_stream (FILE *f1, FILE *f2); + +diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c +index 975dfb7..d337b9c 100644 +--- a/src/w32/compat/posixfcn.c ++++ b/src/w32/compat/posixfcn.c +@@ -29,6 +29,7 @@ this program. If not, see . */ + #ifndef NO_OUTPUT_SYNC + /* Support for OUTPUT_SYNC and related functionality. */ + ++#ifndef HAVE_GNULIB_FCNTL + /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ + int + fcntl (intptr_t fd, int cmd, ...) +@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) + return -1; + } + } ++#endif /* GNULIB_TEST_FCNTL */ + + static intptr_t mutex_handle = -1; + +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..70caf0a --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,18 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +SRC_URI += "\ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ + file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ + file://0002-w32-compat-dirent.c-follow-header.patch \ + file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ +" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:32 +0000 Subject: [oe-commits] [openembedded-core] 18/20: qemu: Fix CVE-2020-1711 In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110316.2346B2329B1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 01b30efba2e6e6feaf2cd9a45ef77bd2d711b3e0 Author: Lee Chee Yang AuthorDate: Mon Feb 24 13:46:53 2020 +0800 qemu: Fix CVE-2020-1711 see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..f26e722 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:33 +0000 Subject: [oe-commits] [openembedded-core] 19/20: docbook-xml: update recipe to stick with the upstream In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110316.3970023298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41a23aa3f9d4bcda29b3a11225a33f89b73e17d1 Author: Gregor Zatko AuthorDate: Sun Feb 23 14:22:57 2020 +0100 docbook-xml: update recipe to stick with the upstream Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko Signed-off-by: Richard Purdie --- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++++----------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 6452c8d..dbea697 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -1,52 +1,50 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set. It ships with the latest DocBook 4.5 \ +XML DTD." +HOMEPAGE = "https://www.docbook.org/xml/" + +PR = "r1" LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +ARCHIVE_NAME = "docbook-xml-${PV}.zip" + # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When # upgrading this recipe, please verify whether this is still needed. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ +SRC_URI = "\ + https://docbook.org/xml/${PV}/${ARCHIVE_NAME} \ + file://LICENSE-OASIS \ " +SRC_URI[md5sum] = "03083e288e87a7e829e437358da7ef9e" +SRC_URI[sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" - -S = "${WORKDIR}/docbook-xml-4.5.c31424" +UPSTREAM_CHECK_URI = "https://docbook.org/xml/${PV}/" -inherit allarch +inherit allarch xmlcatalog BBCLASSEXTEND = "native" -do_configure (){ - : -} +# the XMLCATALOGS variable is used in xmlcatalog BB class +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -do_compile (){ - : -} +S = "${WORKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" do_install () { + install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION - install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml - done + DEST=${datadir}/xml/docbook/schema/dtd/${PV} + install -d -m 755 ${D}$DEST + cp -v catalog.xml ${D}$DEST + xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml } -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES_${PN} = "\ + ${datadir}/* \ + ${XMLCATALOGS} \ +" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 11:03:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 11:03:34 +0000 Subject: [oe-commits] [openembedded-core] 20/20: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158262859469.3281.10508557083334769608@git.openembedded.org> References: <158262859469.3281.10508557083334769608@git.openembedded.org> Message-ID: <20200225110316.538A5232986@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a9678aaf88aca819db46b6c84168e5a84c80a235 Author: Bruce Ashfield AuthorDate: Mon Feb 24 15:02:02 2020 -0500 linux-yocto/5.2: update to v5.2.32 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:53 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (a9678aa -> 9cbd600) Message-ID: <158263751314.28089.15269858208232254697@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard a9678aa linux-yocto/5.2: update to v5.2.32 discard 41a23aa docbook-xml: update recipe to stick with the upstream discard 01b30ef qemu: Fix CVE-2020-1711 discard eec0cbc make: 4.2.1 -> 4.3 discard 77fe7ef weston: PACKAGECONFIG clients requires wayland discard ec2b3b2 opensbi: Update to v0.6 discard cf0e6ca perl: fix lib/warnings test on core-image-sato discard 876488e libevdev: fix upstream check discard f357df5 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 discard d9c14b7 ffmpeg: add PACKAGECONFIG support for fdk-aac discard 2d5dc1c ruby: install required files for ptest discard 20d505e hosttools: add utilities for all supported checksums discard 341fc35 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new e91f785 hosttools: add utilities for all supported checksums new bdc121b ruby: install required files for ptest new 23d67f4 ffmpeg: add PACKAGECONFIG support for fdk-aac new 83248d5 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 new d4ca89a libevdev: fix upstream check new 2541a5c perl: fix lib/warnings test on core-image-sato new 13a0d12 opensbi: Update to v0.6 new 9d2f67f weston: PACKAGECONFIG clients requires wayland new 7bde6c9 make: 4.2.1 -> 4.3 new 450ce14 qemu: Fix CVE-2020-1711 new 9cbd600 linux-yocto/5.2: update to v5.2.32 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a9678aa) \ N -- N -- N refs/heads/master-next (9cbd600) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++++----------- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 2 files changed, 32 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:54 +0000 Subject: [oe-commits] [openembedded-core] 01/11: hosttools: add utilities for all supported checksums In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.4EFED23298B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e91f785109f27bb3b8e07e44f7a622218263966e Author: Bartosz Golaszewski AuthorDate: Tue Feb 25 09:18:52 2020 +0100 hosttools: add utilities for all supported checksums Only md5sum and sha256sum are currently provided by HOSTTOOLS. Trying to use any other checksum conversion will result in a build failure. Fix it by adding other supported checksum utilities to HOSTTOOLS. Signed-off-by: Bartosz Golaszewski Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b..e201b67 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -489,7 +489,8 @@ HOSTTOOLS += " \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ - python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ + python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ + sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:55 +0000 Subject: [oe-commits] [openembedded-core] 02/11: ruby: install required files for ptest In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.5A9A823298C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bdc121b2fb418b786f954e6649b451169fad1ab0 Author: Kai Kang AuthorDate: Tue Feb 25 17:06:19 2020 +0800 ruby: install required files for ptest After update to 2.7.0, it fails to start ptest of ruby with errors: | ./test/runner.rb:11:in `require_relative': cannot load such file -- /usr/lib64/ruby/ptest/tool/test/runner (LoadError) and | test/rdoc/test_rdoc_attr.rb: cannot load such file -- rdoc/version | test/did_you_mean/spell_checking/test_key_name_check.rb: cannot load such file -- /usr/lib64/ruby/ptest/lib/did_you_mean Install the required files for the ptest. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index c796318..268b4be 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -45,6 +45,12 @@ do_install_append_class-target () { do_install_ptest () { cp -rf ${S}/test ${D}${PTEST_PATH}/ + + install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb + cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ + mkdir -p ${D}${PTEST_PATH}/lib + cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib + # install test-binaries find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \ | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:56 +0000 Subject: [oe-commits] [openembedded-core] 03/11: ffmpeg: add PACKAGECONFIG support for fdk-aac In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.651922329AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 23d67f4c6f57653fe7ed467d22fbd966f3b23a2b Author: Scott Branden AuthorDate: Mon Feb 24 16:11:15 2020 -0800 ffmpeg: add PACKAGECONFIG support for fdk-aac Add PACKAGECONFIG support for fdk-aac in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index 20a8249..d7b0641 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -59,6 +59,7 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" +PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:57 +0000 Subject: [oe-commits] [openembedded-core] 04/11: python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.704FA2329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 83248d57d3d670e2ebcde27fb5ad91284ebf1ab8 Author: Tim Orling AuthorDate: Mon Feb 24 20:21:42 2020 -0800 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 THis release is a mix of improvements and fixes: https://github.com/SCons/scons/blob/3.1.2/src/RELEASE.txt * Changed to inherit pypi rather than relying on SOURCEFORGE_MIRROR. * Add SRC_URI for LICENSE file (not included in pypi tarball). * Make it more obvious that RDEPENDS are for class-target and drop empty RDEPENDS from -native * python3-scons-native now DEPENDS on python3-setuptools-native * Tested with core-image-base + packagegroup-core-buildessential with "scons" oe-selftest via testimage. * Tested build of "serf" (which uses python3-scons-native via the scons.bbclass). License-Update: Added "MIT License" text, updated copyright years Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...tive_3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 ------------------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb similarity index 79% rename from meta/recipes-devtools/python/python3-scons-native_3.1.1.bb rename to meta/recipes-devtools/python/python3-scons-native_3.1.2.bb index 5cd5956..9e12730 100644 --- a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb @@ -1,7 +1,6 @@ require python3-scons_${PV}.bb inherit native python3native -DEPENDS = "python3-native" -RDEPENDS_${PN} = "" +DEPENDS = "python3-native python3-setuptools-native" do_install_append() { create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' diff --git a/meta/recipes-devtools/python/python3-scons_3.1.1.bb b/meta/recipes-devtools/python/python3-scons_3.1.1.bb deleted file mode 100644 index 0c7aaea..0000000 --- a/meta/recipes-devtools/python/python3-scons_3.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284" - -SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "35b2a3993313bbedd221d4d5758fd2fd" -SRC_URI[sha256sum] = "4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5" - -S = "${WORKDIR}/scons-${PV}" - -UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -do_install_prepend() { - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* -} - -RDEPENDS_${PN} = "\ - python3-core \ - python3-fcntl \ - python3-io \ - python3-json \ - python3-shell \ - python3-pickle \ - python3-pprint \ - " diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb new file mode 100644 index 0000000..aa7a2a8 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" + +# pypi package does not have a valid license file +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" + +SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" +SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" +SRC_URI[license.md5sum] = "e14e1b33428df24a40a782ae142785d0" +SRC_URI[license.sha256sum] = "72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6" + +S = "${WORKDIR}/scons-${PV}" + +UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +inherit pypi setuptools3 + +do_install_prepend() { + sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* +} + +RDEPENDS_${PN}_class-target = "\ + python3-core \ + python3-fcntl \ + python3-io \ + python3-json \ + python3-shell \ + python3-pickle \ + python3-pprint \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:58 +0000 Subject: [oe-commits] [openembedded-core] 05/11: libevdev: fix upstream check In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.7F2902329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d4ca89afab17021bb3e11ca0728da25a1d2507cf Author: Anuj Mittal AuthorDate: Tue Feb 25 14:45:26 2020 +0800 libevdev: fix upstream check Ignore the ones ending in .90x as they are -rc releases. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 46ed5d7..3523dc0 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -12,3 +12,5 @@ SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:32:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:32:01 +0000 Subject: [oe-commits] [openembedded-core] 08/11: weston: PACKAGECONFIG clients requires wayland In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.A07902329B3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9d2f67f4579e359a49de0dd38e65334031c3d175 Author: Robert Yang AuthorDate: Mon Feb 24 16:57:06 2020 +0800 weston: PACKAGECONFIG clients requires wayland Fixed: DISTRO_FEATURES_remove = "wayland" $ bitbake weston clients/meson.build:141:4: ERROR: Problem encountered: weston-simple-dmabuf-egl requires option renderer-gl which is not enabled. If you rather not build this, drop "dmabuf-egl" from simple-clients option. WARNING: exit code 1 from a shell command. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb index 83aee87..f8e9e15 100644 --- a/meta/recipes-graphics/wayland/weston_8.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb @@ -27,11 +27,11 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - clients launch" + launch" # # Compositor choices # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:32:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:32:00 +0000 Subject: [oe-commits] [openembedded-core] 07/11: opensbi: Update to v0.6 In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.962AB2329B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 13a0d1242b3238e398c4130181696a36a7636f2b Author: Alistair Francis AuthorDate: Mon Feb 24 10:35:43 2020 -0800 opensbi: Update to v0.6 Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 13 ++++++---- .../files/0001-build-Use-ffreestanding.patch | 28 ---------------------- .../opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +---- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch index 74d9361..d2a8048 100644 --- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -1,4 +1,4 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 15 Feb 2019 14:57:41 -0800 Subject: [PATCH] Makefile: Don't specify mabi or march @@ -7,23 +7,26 @@ To avoid can't link double-float modules with soft-float modules errors when building 32-bit openSBI don't specify mabi or march. -Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] Signed-off-by: Alistair Francis + --- Makefile | 2 -- 1 file changed, 2 deletions(-) +diff --git a/Makefile b/Makefile +index ccf8ea3..69e5b38 100644 --- a/Makefile +++ b/Makefile -@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -mno-save-restore -mstrict-align -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) CFLAGS += $(GENFLAGS) CFLAGS += $(platform-cflags-y) -@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -mno-save-restore -mstrict-align diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch deleted file mode 100644 index 4899fad..0000000 --- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Jan 2020 18:21:02 -0800 -Subject: [PATCH] build: Use -ffreestanding - -this is a stand-alone/baremetal application, therefore demanding --ffreestanding would help it compile with hosted toolchains e.g. ( linux -toolchains ), it also ensures that it won't be using platform -optimizations like inlining mem* str* functions which gcc might decide -especially with wrapper string functions in opensbi code - -Upstream-Status: Accepted [https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961] -Signed-off-by: Khem Raj ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb similarity index 88% rename from meta/recipes-bsp/opensbi/opensbi_0.5.bb rename to meta/recipes-bsp/opensbi/opensbi_0.6.bb index 71d64fa..56f2d4b 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb @@ -7,17 +7,13 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" +SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" SRC_URI = "git://github.com/riscv/opensbi.git \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ - file://0001-build-Use-ffreestanding.patch \ " S = "${WORKDIR}/git" -SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df" -SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300" - EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:31:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:31:59 +0000 Subject: [oe-commits] [openembedded-core] 06/11: perl: fix lib/warnings test on core-image-sato In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.8A22D2329B1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2541a5c2536ff9677705226c1f2063145d9f312e Author: Mingde (Matthew) Zeng AuthorDate: Mon Feb 24 13:10:08 2020 -0500 perl: fix lib/warnings test on core-image-sato Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng Signed-off-by: Richard Purdie --- ...CH-perl-134117-Close-DATA-in-loc_tools.pl.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000..79cae0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-by: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012..9d747aa 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:32:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:32:02 +0000 Subject: [oe-commits] [openembedded-core] 09/11: make: 4.2.1 -> 4.3 In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.B05CF2329B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7bde6c9a16c16f955700692061b5472127303644 Author: Jens Rehsack AuthorDate: Mon Feb 24 15:39:20 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Fix incompatibility issues between gnulib bundled with updated make fix issues in w32 compat sources. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ 10 files changed, 246 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch new file mode 100644 index 0000000..096bcfd --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch @@ -0,0 +1,38 @@ +From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 17:39:56 +0100 +Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX + +When cross compiling for a system without getloadavg, do not try add +additional linker paths unless it's absolutely necessary. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + m4/getloadavg.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 3bd2a14..696c5de 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], + fi + + if test $gl_func_getloadavg_done = no; then ++ AS_CASE([$host_os], ++ [aix*], [ + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + gl_getloadavg_LIBS=$LIBS +@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], + AC_CHECK_LIB([getloadavg], [getloadavg], + [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], + [LIBS=$gl_getloadavg_LIBS]) ++ ], [:]) + fi + + # Set up the replacement function if necessary. +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch new file mode 100644 index 0000000..5797082 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch @@ -0,0 +1,41 @@ +From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 10:52:21 +0100 +Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning + +Fix compiler warning: + src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the + length of the source argument [-Wstringop-overflow=] + +The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the +size of the buffer is increased by 1 to hold a path with the length of +`MAXPATHLEN` and trailing `0`. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/dir.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dir.c b/src/dir.c +index 862a18e..cad4c4a 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) + if (plen > 1 && path[plen - 1] == '.' + && (path[plen - 2] == '/' || path[plen - 2] == '\\')) + { +- char parent[MAXPATHLEN]; ++ char parent[MAXPATHLEN+1]; + +- strncpy (parent, path, plen - 2); +- parent[plen - 2] = '\0'; ++ strncpy (parent, path, MAXPATHLEN); ++ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; + if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) + return -1; + } +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch new file mode 100644 index 0000000..b3d97f9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch @@ -0,0 +1,33 @@ +From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 12:10:06 +0100 +Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing + projects + +GNU project `make` relies on gnulib but provides some own compatibility +functions - including an `fcntl`, which fails on mingw. +The intension of gnulib is providing these functions and being wider tested, +but silently injecting a function opens battle of compatibility layers. + +So adding a hint into target `config.h` to allow deciding whether using +an own compatibility implementation or not. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + + m4/gnulib-comp.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 3ee0811..cf75541 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -147,6 +147,7 @@ + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) ++ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch new file mode 100644 index 0000000..9ecc445 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch @@ -0,0 +1,36 @@ +From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 11:12:43 +0100 +Subject: [PATCH 2/3] w32: compat: dirent.c: follow header + +src/w32/include/dirent.h completely delegates to mingw dirent implementation, +gnulib detects it as fine and completely usable - trust in that. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/w32/compat/dirent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c +index b8ec615..de80f72 100644 +--- a/src/w32/compat/dirent.c ++++ b/src/w32/compat/dirent.c +@@ -23,7 +23,7 @@ this program. If not, see . */ + #include + #include "dirent.h" + +- ++#ifndef __MINGW32__ + DIR* + opendir(const char* pDirName) + { +@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) + + return; + } ++#endif /* !__MINGW32__ */ +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch new file mode 100644 index 0000000..70414c5 --- /dev/null +++ b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch @@ -0,0 +1,79 @@ +From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 19:29:49 +0100 +Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated + +Rate the fcntl emulation from gnulib higher than the own one. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/output.h | 19 ++++++++++++++----- + src/w32/compat/posixfcn.c | 2 ++ + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/output.h b/src/output.h +index a506505..d3ce6b7 100644 +--- a/src/output.h ++++ b/src/output.h +@@ -67,14 +67,21 @@ void output_dump (struct output *out); + + # ifdef WINDOWS32 + /* For emulations in w32/compat/posixfcn.c. */ +-# define F_GETFD 1 +-# define F_SETLKW 2 ++# ifndef F_GETFD ++# define F_GETFD 1 ++# endif ++# ifndef F_SETLKW ++# define F_SETLKW 2 ++# endif + /* Implementation note: None of the values of l_type below can be zero + -- they are compared with a static instance of the struct, so zero + means unknown/invalid, see w32/compat/posixfcn.c. */ +-# define F_WRLCK 1 +-# define F_UNLCK 2 +- ++# ifndef F_WRLCK ++# define F_WRLCK 1 ++# endif ++# ifndef F_UNLCK ++# define F_UNLCK 2 ++# endif + struct flock + { + short l_type; +@@ -89,7 +96,9 @@ struct flock + typedef intptr_t sync_handle_t; + + /* Public functions emulated/provided in posixfcn.c. */ ++# ifndef HAVE_GNULIB_FCNTL + int fcntl (intptr_t fd, int cmd, ...); ++# endif + intptr_t create_mutex (void); + int same_stream (FILE *f1, FILE *f2); + +diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c +index 975dfb7..d337b9c 100644 +--- a/src/w32/compat/posixfcn.c ++++ b/src/w32/compat/posixfcn.c +@@ -29,6 +29,7 @@ this program. If not, see . */ + #ifndef NO_OUTPUT_SYNC + /* Support for OUTPUT_SYNC and related functionality. */ + ++#ifndef HAVE_GNULIB_FCNTL + /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ + int + fcntl (intptr_t fd, int cmd, ...) +@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) + return -1; + } + } ++#endif /* GNULIB_TEST_FCNTL */ + + static intptr_t mutex_handle = -1; + +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..70caf0a --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,18 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +SRC_URI += "\ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ + file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ + file://0002-w32-compat-dirent.c-follow-header.patch \ + file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ +" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:32:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:32:04 +0000 Subject: [oe-commits] [openembedded-core] 11/11: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.CD8322329D5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9cbd6008b706362f2ef2aa9e5aac1bc1826da5f8 Author: Bruce Ashfield AuthorDate: Mon Feb 24 15:02:02 2020 -0500 linux-yocto/5.2: update to v5.2.32 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 13:32:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 13:32:03 +0000 Subject: [oe-commits] [openembedded-core] 10/11: qemu: Fix CVE-2020-1711 In-Reply-To: <158263751314.28089.15269858208232254697@git.openembedded.org> References: <158263751314.28089.15269858208232254697@git.openembedded.org> Message-ID: <20200225133153.BEC662329D4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 450ce1483c3555b167c84311d236eb6d5cc2a8cc Author: Lee Chee Yang AuthorDate: Mon Feb 24 13:46:53 2020 +0800 qemu: Fix CVE-2020-1711 see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..f26e722 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 15:33:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 15:33:15 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (52429ce -> 9212bc6) Message-ID: <158264479546.17173.12339874594341889573@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 52429ce phoronix-test-suite: Do not mark it allarch new 164ee4c luajit: Upgrade to 2.1.0-beta3 new 9212bc6 ngnix: fix error during service startup The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ----- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 4 files changed, 106 insertions(+), 27 deletions(-) delete mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (89%) create mode 100644 meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 15:33:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 15:33:17 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: ngnix: fix error during service startup In-Reply-To: <158264479546.17173.12339874594341889573@git.openembedded.org> References: <158264479546.17173.12339874594341889573@git.openembedded.org> Message-ID: <20200225153315.D33212329B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9212bc63bd4437008a33c0247609910065ec92a1 Author: Changqing Li AuthorDate: Tue Feb 25 15:56:16 2020 +0800 ngnix: fix error during service startup fix below error: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 100 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch new file mode 100644 index 0000000..90159a6 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch @@ -0,0 +1,99 @@ +Description: Fix NGINX pidfile handling +Author: Tj +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864 +Last-Update: 2019-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Upstream-Status: Pending + +This patch is from ubuntu, https://github.com/aroth-arsoft/pkg-nginx/blob +/master/debian/patches/nginx-fix-pidfile.patch, for fix below +error info: +nginx.service: failed to parse pid from file /run/nginx/nginx.pid: +invalid argument + +Signed-off-by: Changqing Li + +diff --git a/src/core/nginx.c b/src/core/nginx.c +index 9fcb0eb2..083eba1d 100644 +--- a/src/core/nginx.c ++++ b/src/core/nginx.c +@@ -338,14 +338,21 @@ main(int argc, char *const *argv) + ngx_process = NGX_PROCESS_MASTER; + } + ++ /* tell-tale to detect if this is parent or child process */ ++ ngx_int_t child_pid = NGX_BUSY; ++ + #if !(NGX_WIN32) + + if (ngx_init_signals(cycle->log) != NGX_OK) { + return 1; + } + ++ /* tell-tale that this code has been executed */ ++ child_pid--; ++ + if (!ngx_inherited && ccf->daemon) { +- if (ngx_daemon(cycle->log) != NGX_OK) { ++ child_pid = ngx_daemon(cycle->log); ++ if (child_pid == NGX_ERROR) { + return 1; + } + +@@ -358,8 +365,19 @@ main(int argc, char *const *argv) + + #endif + +- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { +- return 1; ++ /* If ngx_daemon() returned the child's PID in the parent process ++ * after the fork() set ngx_pid to the child_pid, which gets ++ * written to the PID file, then exit. ++ * For NGX_WIN32 always write the PID file ++ * For others, only write it from the parent process */ ++ if (child_pid < NGX_OK || child_pid > NGX_OK) { ++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid; ++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { ++ return 1; ++ } ++ } ++ if (child_pid > NGX_OK) { ++ exit(0); + } + + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { +diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c +index 385c49b6..3719854c 100644 +--- a/src/os/unix/ngx_daemon.c ++++ b/src/os/unix/ngx_daemon.c +@@ -7,14 +7,17 @@ + + #include + #include ++#include + + + ngx_int_t + ngx_daemon(ngx_log_t *log) + { + int fd; ++ /* retain the return value for passing back to caller */ ++ pid_t pid_child = fork(); + +- switch (fork()) { ++ switch (pid_child) { + case -1: + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); + return NGX_ERROR; +@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log) + break; + + default: +- exit(0); ++ /* let caller do the exit() */ ++ return pid_child; + } + + ngx_parent = ngx_pid; diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 0d229ff..2824c66 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -21,6 +21,7 @@ SRC_URI = " \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ + file://nginx-fix-pidfile.patch \ " inherit siteinfo update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 15:33:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 15:33:16 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158264479546.17173.12339874594341889573@git.openembedded.org> References: <158264479546.17173.12339874594341889573@git.openembedded.org> Message-ID: <20200225153315.C4F392329AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 164ee4c026c073f854dc8041d4614dab57f5cc79 Author: Leo Yan AuthorDate: Tue Feb 25 06:37:11 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ------------------- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++-------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch deleted file mode 100644 index c39ef6f..0000000 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ /dev/null @@ -1,19 +0,0 @@ -clang pretends to be gcc 4.2.0 which is a big lie when it comes -to features, its same as latest gcc - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: LuaJIT-2.0.5/src/lj_arch.h -=================================================================== ---- LuaJIT-2.0.5.orig/src/lj_arch.h -+++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" - #endif - #elif !LJ_TARGET_PS3 --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__) - #error "Need at least GCC 4.3 or newer" - #endif - #endif diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 89% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..da79832 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,13 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 15:48:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 15:48:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: cfengine-masterfiles: Make the expression dash friendly Message-ID: <158264569001.1939.8952062021477188640@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 2402b5d cfengine-masterfiles: Make the expression dash friendly 2402b5d is described below commit 2402b5d96a97014841ecafeb8ce0b58543209d89 Author: Khem Raj AuthorDate: Tue Feb 25 07:46:39 2020 -0800 cfengine-masterfiles: Make the expression dash friendly dash does not understand {} expressions like this, therefore simplify Signed-off-by: Khem Raj --- meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 79269d3..35ac855 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -33,7 +33,7 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" do_install_append() { - rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } FILES_${PN} = "${datadir}/cfengine" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 16:42:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 16:42:13 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: cfengine-masterfiles: Make the expression dash friendly In-Reply-To: <158264893048.917.11540246047677399992@git.openembedded.org> References: <158264893048.917.11540246047677399992@git.openembedded.org> Message-ID: <20200225164210.B8FC2232A1D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1f8a515e0b49c58085933d7c8063ee0c66b67ffc Author: Khem Raj AuthorDate: Tue Feb 25 07:46:39 2020 -0800 cfengine-masterfiles: Make the expression dash friendly dash does not understand {} expressions like this, therefore simplify Signed-off-by: Khem Raj --- meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 79269d3..35ac855 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -33,7 +33,7 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" do_install_append() { - rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } FILES_${PN} = "${datadir}/cfengine" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 16:42:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 16:42:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (2402b5d -> 1f8a515) Message-ID: <158264893048.917.11540246047677399992@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 2402b5d cfengine-masterfiles: Make the expression dash friendly discard 9212bc6 ngnix: fix error during service startup discard 164ee4c luajit: Upgrade to 2.1.0-beta3 discard 52429ce phoronix-test-suite: Do not mark it allarch new cdfbc6f luajit: Upgrade to 2.1.0-beta3 new 1a7c0fd ngnix: fix error during service startup new 1f8a515 cfengine-masterfiles: Make the expression dash friendly This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2402b5d) \ N -- N -- N refs/heads/master-next (1f8a515) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 16:42:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 16:42:11 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158264893048.917.11540246047677399992@git.openembedded.org> References: <158264893048.917.11540246047677399992@git.openembedded.org> Message-ID: <20200225164210.9C9832329F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cdfbc6f9959ef86962655f910ae185b0a1e8c1d3 Author: Leo Yan AuthorDate: Tue Feb 25 06:37:11 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ------------------- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++-------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch deleted file mode 100644 index c39ef6f..0000000 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ /dev/null @@ -1,19 +0,0 @@ -clang pretends to be gcc 4.2.0 which is a big lie when it comes -to features, its same as latest gcc - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: LuaJIT-2.0.5/src/lj_arch.h -=================================================================== ---- LuaJIT-2.0.5.orig/src/lj_arch.h -+++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" - #endif - #elif !LJ_TARGET_PS3 --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__) - #error "Need at least GCC 4.3 or newer" - #endif - #endif diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 89% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..da79832 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,13 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 16:42:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 16:42:12 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: ngnix: fix error during service startup In-Reply-To: <158264893048.917.11540246047677399992@git.openembedded.org> References: <158264893048.917.11540246047677399992@git.openembedded.org> Message-ID: <20200225164210.AA09C2329F5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1a7c0fdf8c7cd157b83e04a36f289aacba6fe442 Author: Changqing Li AuthorDate: Tue Feb 25 15:56:16 2020 +0800 ngnix: fix error during service startup fix below error: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 100 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch new file mode 100644 index 0000000..90159a6 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch @@ -0,0 +1,99 @@ +Description: Fix NGINX pidfile handling +Author: Tj +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864 +Last-Update: 2019-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Upstream-Status: Pending + +This patch is from ubuntu, https://github.com/aroth-arsoft/pkg-nginx/blob +/master/debian/patches/nginx-fix-pidfile.patch, for fix below +error info: +nginx.service: failed to parse pid from file /run/nginx/nginx.pid: +invalid argument + +Signed-off-by: Changqing Li + +diff --git a/src/core/nginx.c b/src/core/nginx.c +index 9fcb0eb2..083eba1d 100644 +--- a/src/core/nginx.c ++++ b/src/core/nginx.c +@@ -338,14 +338,21 @@ main(int argc, char *const *argv) + ngx_process = NGX_PROCESS_MASTER; + } + ++ /* tell-tale to detect if this is parent or child process */ ++ ngx_int_t child_pid = NGX_BUSY; ++ + #if !(NGX_WIN32) + + if (ngx_init_signals(cycle->log) != NGX_OK) { + return 1; + } + ++ /* tell-tale that this code has been executed */ ++ child_pid--; ++ + if (!ngx_inherited && ccf->daemon) { +- if (ngx_daemon(cycle->log) != NGX_OK) { ++ child_pid = ngx_daemon(cycle->log); ++ if (child_pid == NGX_ERROR) { + return 1; + } + +@@ -358,8 +365,19 @@ main(int argc, char *const *argv) + + #endif + +- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { +- return 1; ++ /* If ngx_daemon() returned the child's PID in the parent process ++ * after the fork() set ngx_pid to the child_pid, which gets ++ * written to the PID file, then exit. ++ * For NGX_WIN32 always write the PID file ++ * For others, only write it from the parent process */ ++ if (child_pid < NGX_OK || child_pid > NGX_OK) { ++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid; ++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { ++ return 1; ++ } ++ } ++ if (child_pid > NGX_OK) { ++ exit(0); + } + + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { +diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c +index 385c49b6..3719854c 100644 +--- a/src/os/unix/ngx_daemon.c ++++ b/src/os/unix/ngx_daemon.c +@@ -7,14 +7,17 @@ + + #include + #include ++#include + + + ngx_int_t + ngx_daemon(ngx_log_t *log) + { + int fd; ++ /* retain the return value for passing back to caller */ ++ pid_t pid_child = fork(); + +- switch (fork()) { ++ switch (pid_child) { + case -1: + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); + return NGX_ERROR; +@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log) + break; + + default: +- exit(0); ++ /* let caller do the exit() */ ++ return pid_child; + } + + ngx_parent = ngx_pid; diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 0d229ff..2824c66 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -21,6 +21,7 @@ SRC_URI = " \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ + file://nginx-fix-pidfile.patch \ " inherit siteinfo update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:34 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (1f8a515 -> 76e1b1a) Message-ID: <158265945401.32038.13829244337991550768@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 1f8a515 cfengine-masterfiles: Make the expression dash friendly discard 1a7c0fd ngnix: fix error during service startup discard cdfbc6f luajit: Upgrade to 2.1.0-beta3 discard 926ead9 libuv: upgrade 1.34.0 -> 1.34.2 discard 16b981f inotify-tools: upgrade 3.20.1 -> 3.20.2.2 discard af89b26 ttf-noto-emoji: add recipe new 119f100 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 new 494702e libuv: upgrade 1.34.0 -> 1.34.2 new 56b33c8 luajit: Upgrade to 2.1.0-beta3 new b95b39a ngnix: fix error during service startup new 05c7368 cfengine-masterfiles: Make the expression dash friendly new b50e6d5 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite new d3b9b49 nodejs: don't enable ares support by default new 76e1b1a libvncserver: don't enable sasl support by default This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1f8a515) \ N -- N -- N refs/heads/master-next (76e1b1a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/conf/layer.conf | 2 ++ meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 2 +- .../libvncserver/libvncserver_0.9.12.bb | 1 - .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 ------------------- 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:36 +0000 Subject: [oe-commits] [meta-openembedded] 02/08: libuv: upgrade 1.34.0 -> 1.34.2 In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.53EF4232A7F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 494702e4adc85542e3c9a8bc6652fda6a8428996 Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 22:10:29 2020 +0000 libuv: upgrade 1.34.0 -> 1.34.2 See full changelog https://github.com/libuv/libuv/releases/tag/v1.34.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb similarity index 90% rename from meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb rename to meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb index b842bbd..234cec3 100644 --- a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb +++ b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:35 +0000 Subject: [oe-commits] [meta-openembedded] 01/08: inotify-tools: upgrade 3.20.1 -> 3.20.2.2 In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.4195C232A7E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 119f10099647945119c6e975c3bc60c46740c09b Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 21:03:56 2020 +0000 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...001-Makefile.am-add-build-rule-for-README.patch | 46 ++++++++++++++++++++++ .../inotify-nosys-fix-system-call-number.patch | 31 --------------- .../inotify-tools/inotify-tools_git.bb | 8 ++-- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch new file mode 100644 index 0000000..2c7cd99 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch @@ -0,0 +1,46 @@ +From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Mon, 24 Feb 2020 21:44:45 +0100 +Subject: [PATCH] Makefile.am: add build rule for README + +Fixes: + +| configure.ac:17: installing 'config/config.sub' +| configure.ac:16: installing 'config/install-sh' +| configure.ac:16: installing 'config/missing' +| Makefile.am: error: required file './README' not found +| libinotifytools/src/Makefile.am: installing 'config/depcomp' + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] + +Signed-off-by: Pierre-Jean Texier +--- + Makefile.am | 2 ++ + autogen.sh | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 56e4531..d08c8fe 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = libinotifytools src man + ++README: README.md ++ + dist-hook: + # Automake official documentation states that dist-hook should assume files + # are not writable. +diff --git a/autogen.sh b/autogen.sh +index 48eb21d..31572c2 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,4 +1,3 @@ + #!/bin/sh + +-cp README.md README + autoreconf --install "$@" || exit 1 +-- +2.7.4 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch deleted file mode 100644 index 89b890d..0000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch +++ /dev/null @@ -1,31 +0,0 @@ -inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64 - -The correct value should be the same as defined in -linux/arch/mips/include/uapi/asm/unistd.h - -Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71] - -Signed-off-by: Roy Li -Signed-off-by: Jackie Huang ---- - libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h -index db76b2c..5f7b11b 100644 ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -100,8 +100,8 @@ struct inotify_event { - # endif - # if _MIPS_SIM == _MIPS_SIM_ABI64 - # define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 243) --# define __NR_inotify_rm_watch (__NR_Linux + 243) -+# define __NR_inotify_add_watch (__NR_Linux + 244) -+# define __NR_inotify_rm_watch (__NR_Linux + 245) - # endif - # if _MIPS_SIM == _MIPS_SIM_NABI32 - # define __NR_inotify_init (__NR_Linux + 247) --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index 05ca4b4..f42abeb 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -5,12 +5,12 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "e203934e46784bb34c213078423ba1678e0c4936" -PV = "3.20.1" +SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" +PV = "3.20.2.2" SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://inotify-nosys-fix-system-call-number.patch \ - " + file://0001-Makefile.am-add-build-rule-for-README.patch \ + " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:37 +0000 Subject: [oe-commits] [meta-openembedded] 03/08: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.67C5C232A80@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 56b33c8e895122af01a3be5783559f6b00f74096 Author: Leo Yan AuthorDate: Tue Feb 25 06:37:11 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ------------------- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++-------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch deleted file mode 100644 index c39ef6f..0000000 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ /dev/null @@ -1,19 +0,0 @@ -clang pretends to be gcc 4.2.0 which is a big lie when it comes -to features, its same as latest gcc - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: LuaJIT-2.0.5/src/lj_arch.h -=================================================================== ---- LuaJIT-2.0.5.orig/src/lj_arch.h -+++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" - #endif - #elif !LJ_TARGET_PS3 --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__) - #error "Need at least GCC 4.3 or newer" - #endif - #endif diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 89% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..da79832 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,13 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:38 +0000 Subject: [oe-commits] [meta-openembedded] 04/08: ngnix: fix error during service startup In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.7A71B232A81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b95b39a157cde11d5fbaaeb275a4efe6db0fdbc0 Author: Changqing Li AuthorDate: Tue Feb 25 15:56:16 2020 +0800 ngnix: fix error during service startup fix below error: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 100 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch new file mode 100644 index 0000000..90159a6 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch @@ -0,0 +1,99 @@ +Description: Fix NGINX pidfile handling +Author: Tj +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864 +Last-Update: 2019-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Upstream-Status: Pending + +This patch is from ubuntu, https://github.com/aroth-arsoft/pkg-nginx/blob +/master/debian/patches/nginx-fix-pidfile.patch, for fix below +error info: +nginx.service: failed to parse pid from file /run/nginx/nginx.pid: +invalid argument + +Signed-off-by: Changqing Li + +diff --git a/src/core/nginx.c b/src/core/nginx.c +index 9fcb0eb2..083eba1d 100644 +--- a/src/core/nginx.c ++++ b/src/core/nginx.c +@@ -338,14 +338,21 @@ main(int argc, char *const *argv) + ngx_process = NGX_PROCESS_MASTER; + } + ++ /* tell-tale to detect if this is parent or child process */ ++ ngx_int_t child_pid = NGX_BUSY; ++ + #if !(NGX_WIN32) + + if (ngx_init_signals(cycle->log) != NGX_OK) { + return 1; + } + ++ /* tell-tale that this code has been executed */ ++ child_pid--; ++ + if (!ngx_inherited && ccf->daemon) { +- if (ngx_daemon(cycle->log) != NGX_OK) { ++ child_pid = ngx_daemon(cycle->log); ++ if (child_pid == NGX_ERROR) { + return 1; + } + +@@ -358,8 +365,19 @@ main(int argc, char *const *argv) + + #endif + +- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { +- return 1; ++ /* If ngx_daemon() returned the child's PID in the parent process ++ * after the fork() set ngx_pid to the child_pid, which gets ++ * written to the PID file, then exit. ++ * For NGX_WIN32 always write the PID file ++ * For others, only write it from the parent process */ ++ if (child_pid < NGX_OK || child_pid > NGX_OK) { ++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid; ++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { ++ return 1; ++ } ++ } ++ if (child_pid > NGX_OK) { ++ exit(0); + } + + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { +diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c +index 385c49b6..3719854c 100644 +--- a/src/os/unix/ngx_daemon.c ++++ b/src/os/unix/ngx_daemon.c +@@ -7,14 +7,17 @@ + + #include + #include ++#include + + + ngx_int_t + ngx_daemon(ngx_log_t *log) + { + int fd; ++ /* retain the return value for passing back to caller */ ++ pid_t pid_child = fork(); + +- switch (fork()) { ++ switch (pid_child) { + case -1: + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); + return NGX_ERROR; +@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log) + break; + + default: +- exit(0); ++ /* let caller do the exit() */ ++ return pid_child; + } + + ngx_parent = ngx_pid; diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 0d229ff..2824c66 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -21,6 +21,7 @@ SRC_URI = " \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ + file://nginx-fix-pidfile.patch \ " inherit siteinfo update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:40 +0000 Subject: [oe-commits] [meta-openembedded] 06/08: layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.9C7BA232A83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b50e6d59bce58bb46c416c5e80b796299e5a8ea0 Author: Khem Raj AuthorDate: Tue Feb 25 11:24:44 2020 -0800 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite This is to avoid sstate signature failures where dependencies on shared-mime-info and desktop-file-utils is added via mime and mime-xdg classes which are target packages and not allarch Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index bad8785..a93d239 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -54,6 +54,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ + phoronix-test-suite->shared-mime-info \ + phoronix-test-suite->desktop-file-utils \ " # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:39 +0000 Subject: [oe-commits] [meta-openembedded] 05/08: cfengine-masterfiles: Make the expression dash friendly In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.8B5BD232A82@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 05c73686b41ee5d908dc28bac02b7cea9189794a Author: Khem Raj AuthorDate: Tue Feb 25 07:46:39 2020 -0800 cfengine-masterfiles: Make the expression dash friendly dash does not understand {} expressions like this, therefore simplify Signed-off-by: Khem Raj --- meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 79269d3..35ac855 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -33,7 +33,7 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" do_install_append() { - rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } FILES_${PN} = "${datadir}/cfengine" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:42 +0000 Subject: [oe-commits] [meta-openembedded] 08/08: libvncserver: don't enable sasl support by default In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.B7039232A85@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 76e1b1ae52ed3740b8ac04f7333e98404614f947 Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:10 2020 +0100 libvncserver: don't enable sasl support by default * cyrus-sasl is in meta-networking and meta-oe doesn't depend on meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb index 22fc83a..dfdf824 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb @@ -17,7 +17,6 @@ PACKAGECONFIG ??= " \ pthread \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sasl \ sdl \ websockets \ zlib \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 19:37:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 19:37:41 +0000 Subject: [oe-commits] [meta-openembedded] 07/08: nodejs: don't enable ares support by default In-Reply-To: <158265945401.32038.13829244337991550768@git.openembedded.org> References: <158265945401.32038.13829244337991550768@git.openembedded.org> Message-ID: <20200225193734.A8837232A84@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d3b9b4934b1b9c742ad50852b78ad87b8fb2f77c Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:09 2020 +0100 nodejs: don't enable ares support by default * c-ares is in meta-networking and meta-oe doesn't depend on meta-networking * fixes: ERROR: Nothing PROVIDES 'c-ares' (but meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb DEPENDS on or otherwise requires it) in builds without meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb index 6eb52c2..9f91a3f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb @@ -51,7 +51,7 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '- GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" -PACKAGECONFIG ??= "ares icu libuv zlib" +PACKAGECONFIG ??= "icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:22 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (76e1b1a -> e735812) Message-ID: <158266574202.15681.9378221674340872770@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 76e1b1a libvncserver: don't enable sasl support by default discard d3b9b49 nodejs: don't enable ares support by default discard b50e6d5 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite discard 05c7368 cfengine-masterfiles: Make the expression dash friendly discard b95b39a ngnix: fix error during service startup discard 56b33c8 luajit: Upgrade to 2.1.0-beta3 discard 494702e libuv: upgrade 1.34.0 -> 1.34.2 discard 119f100 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 discard c3b45b9 fdk-aac: add initial fdk-aac recipe new 9cd1351 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 new 5a1138c libuv: upgrade 1.34.0 -> 1.34.2 new 6c42c82 luajit: Upgrade to 2.1.0-beta3 new 51c3d00 ngnix: fix error during service startup new 8f8de92 cfengine-masterfiles: Make the expression dash friendly new 3749d22 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite new 016e5b8 nodejs: don't enable ares support by default new 77112e0 libvncserver: don't enable sasl support by default new d15fd2c c-ares: move from meta-networking to meta-oe new e735812 fdk-aac: add initial fdk-aac recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (76e1b1a) \ N -- N -- N refs/heads/master-next (e735812) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../Fraunhofer_FDK_AAC_Codec_Library_for_Android | 92 ++++++++++++++++++++++ .../packagegroups/packagegroup-meta-networking.bb | 2 +- .../packagegroups/packagegroup-meta-oe.bb | 2 +- .../c-ares/c-ares/cmake-install-libcares.pc.patch | 0 .../recipes-support/c-ares/c-ares_1.15.0.bb | 0 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android rename {meta-networking => meta-oe}/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch (100%) rename {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:24 +0000 Subject: [oe-commits] [meta-openembedded] 02/10: libuv: upgrade 1.34.0 -> 1.34.2 In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.58A9A232A84@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5a1138c8d26e63146561f48b97690d4c99f853fc Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 22:10:29 2020 +0000 libuv: upgrade 1.34.0 -> 1.34.2 See full changelog https://github.com/libuv/libuv/releases/tag/v1.34.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb similarity index 90% rename from meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb rename to meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb index b842bbd..234cec3 100644 --- a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb +++ b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:23 +0000 Subject: [oe-commits] [meta-openembedded] 01/10: inotify-tools: upgrade 3.20.1 -> 3.20.2.2 In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.4ACFA232A83@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9cd1351ed5cba4adc620fab3f33e38f536d10a68 Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 21:03:56 2020 +0000 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...001-Makefile.am-add-build-rule-for-README.patch | 46 ++++++++++++++++++++++ .../inotify-nosys-fix-system-call-number.patch | 31 --------------- .../inotify-tools/inotify-tools_git.bb | 8 ++-- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch new file mode 100644 index 0000000..2c7cd99 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch @@ -0,0 +1,46 @@ +From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Mon, 24 Feb 2020 21:44:45 +0100 +Subject: [PATCH] Makefile.am: add build rule for README + +Fixes: + +| configure.ac:17: installing 'config/config.sub' +| configure.ac:16: installing 'config/install-sh' +| configure.ac:16: installing 'config/missing' +| Makefile.am: error: required file './README' not found +| libinotifytools/src/Makefile.am: installing 'config/depcomp' + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] + +Signed-off-by: Pierre-Jean Texier +--- + Makefile.am | 2 ++ + autogen.sh | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 56e4531..d08c8fe 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = libinotifytools src man + ++README: README.md ++ + dist-hook: + # Automake official documentation states that dist-hook should assume files + # are not writable. +diff --git a/autogen.sh b/autogen.sh +index 48eb21d..31572c2 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,4 +1,3 @@ + #!/bin/sh + +-cp README.md README + autoreconf --install "$@" || exit 1 +-- +2.7.4 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch deleted file mode 100644 index 89b890d..0000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch +++ /dev/null @@ -1,31 +0,0 @@ -inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64 - -The correct value should be the same as defined in -linux/arch/mips/include/uapi/asm/unistd.h - -Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71] - -Signed-off-by: Roy Li -Signed-off-by: Jackie Huang ---- - libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h -index db76b2c..5f7b11b 100644 ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -100,8 +100,8 @@ struct inotify_event { - # endif - # if _MIPS_SIM == _MIPS_SIM_ABI64 - # define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 243) --# define __NR_inotify_rm_watch (__NR_Linux + 243) -+# define __NR_inotify_add_watch (__NR_Linux + 244) -+# define __NR_inotify_rm_watch (__NR_Linux + 245) - # endif - # if _MIPS_SIM == _MIPS_SIM_NABI32 - # define __NR_inotify_init (__NR_Linux + 247) --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index 05ca4b4..f42abeb 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -5,12 +5,12 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "e203934e46784bb34c213078423ba1678e0c4936" -PV = "3.20.1" +SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" +PV = "3.20.2.2" SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://inotify-nosys-fix-system-call-number.patch \ - " + file://0001-Makefile.am-add-build-rule-for-README.patch \ + " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:25 +0000 Subject: [oe-commits] [meta-openembedded] 03/10: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.650C0232A85@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6c42c829e25378a1c5dce7de07233b22badbc4b1 Author: Leo Yan AuthorDate: Tue Feb 25 06:37:11 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ------------------- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++-------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch deleted file mode 100644 index c39ef6f..0000000 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ /dev/null @@ -1,19 +0,0 @@ -clang pretends to be gcc 4.2.0 which is a big lie when it comes -to features, its same as latest gcc - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: LuaJIT-2.0.5/src/lj_arch.h -=================================================================== ---- LuaJIT-2.0.5.orig/src/lj_arch.h -+++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" - #endif - #elif !LJ_TARGET_PS3 --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__) - #error "Need at least GCC 4.3 or newer" - #endif - #endif diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 89% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..da79832 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,13 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:26 +0000 Subject: [oe-commits] [meta-openembedded] 04/10: ngnix: fix error during service startup In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.7132E232A94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 51c3d00838588502550951b51c4a440538d922b5 Author: Changqing Li AuthorDate: Tue Feb 25 15:56:16 2020 +0800 ngnix: fix error during service startup fix below error: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 100 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch new file mode 100644 index 0000000..90159a6 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch @@ -0,0 +1,99 @@ +Description: Fix NGINX pidfile handling +Author: Tj +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864 +Last-Update: 2019-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Upstream-Status: Pending + +This patch is from ubuntu, https://github.com/aroth-arsoft/pkg-nginx/blob +/master/debian/patches/nginx-fix-pidfile.patch, for fix below +error info: +nginx.service: failed to parse pid from file /run/nginx/nginx.pid: +invalid argument + +Signed-off-by: Changqing Li + +diff --git a/src/core/nginx.c b/src/core/nginx.c +index 9fcb0eb2..083eba1d 100644 +--- a/src/core/nginx.c ++++ b/src/core/nginx.c +@@ -338,14 +338,21 @@ main(int argc, char *const *argv) + ngx_process = NGX_PROCESS_MASTER; + } + ++ /* tell-tale to detect if this is parent or child process */ ++ ngx_int_t child_pid = NGX_BUSY; ++ + #if !(NGX_WIN32) + + if (ngx_init_signals(cycle->log) != NGX_OK) { + return 1; + } + ++ /* tell-tale that this code has been executed */ ++ child_pid--; ++ + if (!ngx_inherited && ccf->daemon) { +- if (ngx_daemon(cycle->log) != NGX_OK) { ++ child_pid = ngx_daemon(cycle->log); ++ if (child_pid == NGX_ERROR) { + return 1; + } + +@@ -358,8 +365,19 @@ main(int argc, char *const *argv) + + #endif + +- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { +- return 1; ++ /* If ngx_daemon() returned the child's PID in the parent process ++ * after the fork() set ngx_pid to the child_pid, which gets ++ * written to the PID file, then exit. ++ * For NGX_WIN32 always write the PID file ++ * For others, only write it from the parent process */ ++ if (child_pid < NGX_OK || child_pid > NGX_OK) { ++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid; ++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { ++ return 1; ++ } ++ } ++ if (child_pid > NGX_OK) { ++ exit(0); + } + + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { +diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c +index 385c49b6..3719854c 100644 +--- a/src/os/unix/ngx_daemon.c ++++ b/src/os/unix/ngx_daemon.c +@@ -7,14 +7,17 @@ + + #include + #include ++#include + + + ngx_int_t + ngx_daemon(ngx_log_t *log) + { + int fd; ++ /* retain the return value for passing back to caller */ ++ pid_t pid_child = fork(); + +- switch (fork()) { ++ switch (pid_child) { + case -1: + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); + return NGX_ERROR; +@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log) + break; + + default: +- exit(0); ++ /* let caller do the exit() */ ++ return pid_child; + } + + ngx_parent = ngx_pid; diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 0d229ff..2824c66 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -21,6 +21,7 @@ SRC_URI = " \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ + file://nginx-fix-pidfile.patch \ " inherit siteinfo update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:28 +0000 Subject: [oe-commits] [meta-openembedded] 06/10: layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.877C4232A9D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3749d220a7bf7df89fddd370f9b39ee60a9501f5 Author: Khem Raj AuthorDate: Tue Feb 25 11:24:44 2020 -0800 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite This is to avoid sstate signature failures where dependencies on shared-mime-info and desktop-file-utils is added via mime and mime-xdg classes which are target packages and not allarch Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index bad8785..a93d239 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -54,6 +54,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ + phoronix-test-suite->shared-mime-info \ + phoronix-test-suite->desktop-file-utils \ " # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:27 +0000 Subject: [oe-commits] [meta-openembedded] 05/10: cfengine-masterfiles: Make the expression dash friendly In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.7C299232A95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8f8de92d5c1ab8f7ef5c62997037239ced6a2c55 Author: Khem Raj AuthorDate: Tue Feb 25 07:46:39 2020 -0800 cfengine-masterfiles: Make the expression dash friendly dash does not understand {} expressions like this, therefore simplify Signed-off-by: Khem Raj --- meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 79269d3..35ac855 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -33,7 +33,7 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" do_install_append() { - rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } FILES_${PN} = "${datadir}/cfengine" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:29 +0000 Subject: [oe-commits] [meta-openembedded] 07/10: nodejs: don't enable ares support by default In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.91446232AA3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 016e5b8925ddd57eedbf87383e5434e47c088c28 Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:09 2020 +0100 nodejs: don't enable ares support by default * c-ares is in meta-networking and meta-oe doesn't depend on meta-networking * fixes: ERROR: Nothing PROVIDES 'c-ares' (but meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb DEPENDS on or otherwise requires it) in builds without meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb index 6eb52c2..9f91a3f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb @@ -51,7 +51,7 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '- GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" -PACKAGECONFIG ??= "ares icu libuv zlib" +PACKAGECONFIG ??= "icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:30 +0000 Subject: [oe-commits] [meta-openembedded] 08/10: libvncserver: don't enable sasl support by default In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.9BE91232AA4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 77112e0a7777405663ea62e7b9b3d5761e070ced Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:10 2020 +0100 libvncserver: don't enable sasl support by default * cyrus-sasl is in meta-networking and meta-oe doesn't depend on meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb index 22fc83a..dfdf824 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb @@ -17,7 +17,6 @@ PACKAGECONFIG ??= " \ pthread \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sasl \ sdl \ websockets \ zlib \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:31 +0000 Subject: [oe-commits] [meta-openembedded] 09/10: c-ares: move from meta-networking to meta-oe In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.A6EF3232AA5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d15fd2cfb6bcd2472a8b346cc6fe4bc070675d13 Author: Martin Jansa AuthorDate: Tue Feb 25 20:36:15 2020 +0100 c-ares: move from meta-networking to meta-oe * nodejs from meta-oe depends on this since: commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641 Author: Andr? Draszik Date: Tue Oct 29 16:42:24 2019 +0000 nodejs: allow use of system c-ares (and make default) Use system c-ares via PACKAGECONFIG by default. So far, nodejs had been built using its embedded copy of c-ares, which we generally try to avoid, for the known reasons (independent updates, cve & license checks, etc). Notes: * otherwise nodejs uses its bundled version of c-ares * the PACKAGECONFIG variable is 'ares' so as to be in line with other uses of this (wget & curl recipes in OE core) Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../recipes-core/packagegroups/packagegroup-meta-networking.bb | 2 +- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- .../recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch | 0 {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb | 0 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index fa9bf2d..103c99b 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -107,7 +107,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tunctl dovecot ipvsadm stunnel chrony spice-protocol \ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ - libmemcached smcroute libtevent ipcalc c-ares uftp \ + libmemcached smcroute libtevent ipcalc uftp \ ntimed linux-atm ssmtp openvpn rdma-core \ iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0bda946..d096539 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -238,7 +238,7 @@ NE10_armv7a = "ne10" NE10_armv7ve = "ne10" RDEPENDS_packagegroup-meta-oe-support ="\ - anthy asio atop augeas avro-c bdwgc frame grail \ + anthy asio atop augeas avro-c bdwgc frame grail c-ares \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ dstat eject enca epeg espeak fbset fbset-modes \ diff --git a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch rename to meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 21:22:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 21:22:32 +0000 Subject: [oe-commits] [meta-openembedded] 10/10: fdk-aac: add initial fdk-aac recipe In-Reply-To: <158266574202.15681.9378221674340872770@git.openembedded.org> References: <158266574202.15681.9378221674340872770@git.openembedded.org> Message-ID: <20200225212222.B0F24232AA6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e735812bc56dff1a4ed18f31117c3a9907a3b997 Author: Mircea Carausu AuthorDate: Tue Feb 25 11:41:03 2020 -0800 fdk-aac: add initial fdk-aac recipe Add Fraunhofer FDK AAC Codec Library recipe. Signed-off-by: Mircea Carausu Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../Fraunhofer_FDK_AAC_Codec_Library_for_Android | 92 ++++++++++++++++++++++ .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 ++++++ 2 files changed, 114 insertions(+) diff --git a/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android new file mode 100644 index 0000000..05b32bd --- /dev/null +++ b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android @@ -0,0 +1,92 @@ +Software License for The Fraunhofer FDK AAC Codec Library for Android + +? Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur F?rderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info at iis.fraunhofer.de + diff --git a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb new file mode 100644 index 0000000..d791168 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "FDK-AAC audio codec" + +DESCRIPTION = "The Fraunhofer FDK AAC Codec Library for Android \ +(\"FDK AAC Codec\") is software that implements the MPEG \ +Advanced Audio Coding (\"AAC\") encoding and decoding scheme \ +for digital audio." + +HOMEPAGE = "https://www.iis.fraunhofer.de/en/ff/amm/impl.html" + +LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" + +SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master" +SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" + +S = "${WORKDIR}/git" + +SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7" +SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 22:31:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 22:31:19 +0000 Subject: [oe-commits] [bitbake] annotated tag 2019-10.1-zeus created (now a34d663) Message-ID: <158266987830.5045.5271549651959594215@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 2019-10.1-zeus in repository bitbake. at a34d663 (tag) tagging 8569ccb5e9fbdeaaf96b78bd02a263b26de54059 (commit) replaces 2019-10-zeus by Vineela Tummalapalli on Tue Feb 25 14:30:57 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 1.44.1 (yocto-3.0.1) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5VoCEACgkQXGgH0cJ5 dnPIAAf/e01GGxymJgw33Ljw4y3z4dY/m1WFU4Crisepu8gP2JaKqol9F9NsFidd UJ5pG0FzvChZhV/tkLErfYuz74ySW/ulXWF9kJYzb2pBqgTGT8sj3FvwiaJ+8Bx6 bK5qahQ6uWIILYsYD/PMxv/ccP6Hx0mKpQf27YGoVj668UEjM0rY1BqVinxcQ7Eb oNgHSpAsifAXFGnA6P+n+hReM7lD0LNvh3oXQJtX7eO2TfbHABoquJP+0NxoC7GS eMkGuGEs0v/u5x1zJg/lVDNQDl49honp82E0ZGucu/qPXP/yEGt4Emh587NVjKnp aBlvWyomwYksGpi/bu3osk8PhNiIHg== =9NY0 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 22:31:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 22:31:18 +0000 Subject: [oe-commits] [bitbake] annotated tag 1.44.2 created (now 8c51e6d) Message-ID: <158266987833.5045.14416724645660015384@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 1.44.2 in repository bitbake. at 8c51e6d (tag) tagging ef29309d0b512b64d024e383e7baff22c727711c (commit) replaces 2019-10.1-zeus by Vineela Tummalapalli on Tue Feb 25 14:25:29 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 1.44.2 (yocto-3.0.2) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5VntkACgkQXGgH0cJ5 dnPVvwf/QM537KjWera8QIXcZTWmY2jWPcSy+LOShZD9B+zhACam7D/6mzWul1Ce 0c0zhMKdpmOT290JAqmk6izesJd3tYQCIZmPnA+ItBdQXmht8WwrEn0NsQoLrhDi D07ZSEzPgAZnPQyXCUwe5T1xLrGVC5p1fD++u1eUrRN/Yz1TkEz12sWwn3MNu5nb Ri5fI1Wm8OW8eSX8BNTQepIr4nrHIhiFNfgLBW0UqWpyTGO+VfXHG3ynW/l3w08+ Eo92jaxrnRT0qP2zfCq/i6Q+mx6r3xY9eW3d0f/nZWnn1hgrI675AhTsPHFsnFJL 0whoRGx8fDUgph5mM1UizB3zWxGf4g== =Qvk5 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 22:31:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 22:31:20 +0000 Subject: [oe-commits] [bitbake] annotated tag 2019-10.2-zeus created (now 983fe64) Message-ID: <158266987832.5045.1122702475513749373@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 2019-10.2-zeus in repository bitbake. at 983fe64 (tag) tagging ef29309d0b512b64d024e383e7baff22c727711c (commit) replaces 2019-10.1-zeus by Vineela Tummalapalli on Tue Feb 25 14:30:17 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 1.44.2 (yocto-3.0.2) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5Vn/kACgkQXGgH0cJ5 dnMXswf9HHVFYuXYCWZOhfDe/JQAyDJr2axlUcCCccWWVuJQRjGbu9prnl2duLvm FMpOJOy/n7I422TFB3gFyqJ2xzFlojf0wmfwScR+7sP7Qmz2I7sD46SHAwFLVrbw n7NoTWcI8eJt3ZGIyeuHB12D42tPbxEEesaUiVeysGygKPNkqFq9/gHGZvo8eAq+ hBi5Y5XG5ZwmcApk0saL1bcUbOFKrLFG6rJrQAVOmsQ+bG9/mLNCKQMNnvLnUpfo 0PqcUdOPEGb11pSSJX0+BA40BCca9BISyoUcH2HvfYtItV02VL9Z0Zy5eQ8XM3Ma OjkNn3Iw5lxU43Ab28FNSWadLxU8aQ== =sA4D -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 22:46:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 22:46:07 +0000 Subject: [oe-commits] [openembedded-core] annotated tag 2019-10.2-zeus created (now 4136571) Message-ID: <158267076722.9244.1360591270872505525@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 2019-10.2-zeus in repository openembedded-core. at 4136571 (tag) tagging f39285bb82e68945a81034b84da09ca1078d6719 (commit) replaces 2019-10.1-zeus by Vineela Tummalapalli on Tue Feb 25 14:45:13 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 2019-10.2 (yocto-3.0.2) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5Vo3kACgkQXGgH0cJ5 dnNViAgAiyFE2JOnVGA0I4Wu3AEd1Q8MnwfXkyuENCXrZs91doK6XPpjI16nfA7r Z9TOPh6v5FkiljFhlLrR6v6JdF4qFSScHYQLGFLLYd7MyleCox0usi+l3VrJ1N6L Fs/rH4egy0inLUP9itxGETLm7wh1lX0SuT03604sd1qSd2td0chnc7xvW77T88Ei NJf32cZcMazjS8GV+WGqV12432JY/ju+jbLgrBCoyxDyWPiqd8u/L8ugAwHlQvMx 3Bfqrcr8gfbB1Eb5VtLI8a8aYO94WvUWeqFHSwgMJriKY+51PVpc/pwhM0Bxt5Jb 5NITseWrO2iwQAnv0vjJ0hpCAi0ZcA== =n81N -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:52 +0000 Subject: [oe-commits] [meta-openembedded] 01/06: libvncserver: don't enable sasl support by default In-Reply-To: <158267483139.5294.18319634501949682768@git.openembedded.org> References: <158267483139.5294.18319634501949682768@git.openembedded.org> Message-ID: <20200225235351.DE7AB232AA3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b4b411962107c5605fa54e57ced8bbd88d78eabc Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:10 2020 +0100 libvncserver: don't enable sasl support by default * cyrus-sasl is in meta-networking and meta-oe doesn't depend on meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb index 22fc83a..dfdf824 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb @@ -17,7 +17,6 @@ PACKAGECONFIG ??= " \ pthread \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sasl \ sdl \ websockets \ zlib \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:51 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (e735812 -> 6fcf88e) Message-ID: <158267483139.5294.18319634501949682768@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard e735812 fdk-aac: add initial fdk-aac recipe discard d15fd2c c-ares: move from meta-networking to meta-oe discard 77112e0 libvncserver: don't enable sasl support by default discard 016e5b8 nodejs: don't enable ares support by default new b4b4119 libvncserver: don't enable sasl support by default new f5102f7 c-ares: move from meta-networking to meta-oe new e3e8c50 fdk-aac: add initial fdk-aac recipe new 094948e open-lldp: Add initial version 1.0.1 new 8266ed2 gensio: new package new 6fcf88e ser2net: upgrade 3.5.1 -> 4.1.2 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e735812) \ N -- N -- N refs/heads/master-next (6fcf88e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...dd-option-to-disable-installation-of-syst.patch | 57 +++++++++++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 37 +++++++ ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 +- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 2 +- 6 files changed, 234 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch create mode 100644 meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb create mode 100644 meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch create mode 100644 meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb rename meta-oe/recipes-connectivity/ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} (67%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:54 +0000 Subject: [oe-commits] [meta-openembedded] 03/06: fdk-aac: add initial fdk-aac recipe In-Reply-To: <158267483139.5294.18319634501949682768@git.openembedded.org> References: <158267483139.5294.18319634501949682768@git.openembedded.org> Message-ID: <20200225235352.01D74232AA5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e3e8c5067331f90240345d827d5a9e124cc0386b Author: Mircea Carausu AuthorDate: Tue Feb 25 11:41:03 2020 -0800 fdk-aac: add initial fdk-aac recipe Add Fraunhofer FDK AAC Codec Library recipe. Signed-off-by: Mircea Carausu Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../Fraunhofer_FDK_AAC_Codec_Library_for_Android | 92 ++++++++++++++++++++++ .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 ++++++ 2 files changed, 114 insertions(+) diff --git a/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android new file mode 100644 index 0000000..05b32bd --- /dev/null +++ b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android @@ -0,0 +1,92 @@ +Software License for The Fraunhofer FDK AAC Codec Library for Android + +? Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur F?rderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info at iis.fraunhofer.de + diff --git a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb new file mode 100644 index 0000000..d791168 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "FDK-AAC audio codec" + +DESCRIPTION = "The Fraunhofer FDK AAC Codec Library for Android \ +(\"FDK AAC Codec\") is software that implements the MPEG \ +Advanced Audio Coding (\"AAC\") encoding and decoding scheme \ +for digital audio." + +HOMEPAGE = "https://www.iis.fraunhofer.de/en/ff/amm/impl.html" + +LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" + +SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master" +SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" + +S = "${WORKDIR}/git" + +SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7" +SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:53 +0000 Subject: [oe-commits] [meta-openembedded] 02/06: c-ares: move from meta-networking to meta-oe In-Reply-To: <158267483139.5294.18319634501949682768@git.openembedded.org> References: <158267483139.5294.18319634501949682768@git.openembedded.org> Message-ID: <20200225235351.EA2EE232AA4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f5102f7e64d3dd86c04d85668f812879340ac41f Author: Martin Jansa AuthorDate: Tue Feb 25 20:36:15 2020 +0100 c-ares: move from meta-networking to meta-oe * nodejs from meta-oe depends on this since: commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641 Author: Andr? Draszik Date: Tue Oct 29 16:42:24 2019 +0000 nodejs: allow use of system c-ares (and make default) Use system c-ares via PACKAGECONFIG by default. So far, nodejs had been built using its embedded copy of c-ares, which we generally try to avoid, for the known reasons (independent updates, cve & license checks, etc). Notes: * otherwise nodejs uses its bundled version of c-ares * the PACKAGECONFIG variable is 'ares' so as to be in line with other uses of this (wget & curl recipes in OE core) Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../recipes-core/packagegroups/packagegroup-meta-networking.bb | 2 +- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- .../recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch | 0 {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb | 0 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index fa9bf2d..103c99b 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -107,7 +107,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tunctl dovecot ipvsadm stunnel chrony spice-protocol \ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ - libmemcached smcroute libtevent ipcalc c-ares uftp \ + libmemcached smcroute libtevent ipcalc uftp \ ntimed linux-atm ssmtp openvpn rdma-core \ iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0bda946..d096539 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -238,7 +238,7 @@ NE10_armv7a = "ne10" NE10_armv7ve = "ne10" RDEPENDS_packagegroup-meta-oe-support ="\ - anthy asio atop augeas avro-c bdwgc frame grail \ + anthy asio atop augeas avro-c bdwgc frame grail c-ares \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ dstat eject enca epeg espeak fbset fbset-modes \ diff --git a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch rename to meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:55 +0000 Subject: [oe-commits] [meta-openembedded] 04/06: open-lldp: Add initial version 1.0.1 In-Reply-To: <158267483139.5294.18319634501949682768@git.openembedded.org> References: <158267483139.5294.18319634501949682768@git.openembedded.org> Message-ID: <20200225235352.10D96232AA6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 094948e932c86dd94b1fcc5d89a1ab458aa81ce7 Author: Jonathan Richardson AuthorDate: Tue Feb 25 14:19:04 2020 -0800 open-lldp: Add initial version 1.0.1 Open-LLDP provides a Link Layer Discovery Protocol agent that supports DCB (Data Center Bridging). The tc utility from iproute is needed to manipulate traffic control settings in the kernel. Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- ...dd-option-to-disable-installation-of-syst.patch | 57 ++++++++++++++++++++++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 37 ++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch new file mode 100644 index 0000000..86c9f44 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch @@ -0,0 +1,57 @@ +From 1c1e01b2414ca5b3cf5a21b6e6389f9ca82fd7e9 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Fri, 6 Apr 2018 10:49:04 -0700 +Subject: [PATCH 1/1] autotools: Add option to disable installation of systemd + conf files + +Add option to configure.ac to enable or disable install of systemd conf +files. If --with-systemdsystemunitdir is passed to configure then the +files will be installed to the provided directory. If the option isn't +provided then the value is determined from the systemd pkgconfig file, +if found in PKG_CONFIG_PATH. + +This change is required because Makefile.am always installed the files +to a hard coded path that couldn't be changed. +--- + Makefile.am | 3 ++- + configure.ac | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 551d4c7..5491c61 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -133,8 +133,9 @@ install-data-hook: installdirs-local + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = lldpad.pc liblldp_clif.pc + +-systemdsystemunitdir = $(prefix)/lib/systemd/system ++if HAVE_SYSTEMD + dist_systemdsystemunit_DATA = lldpad.service lldpad.socket ++endif + + bashcompletiondir = $(sysconfdir)/bash_completion.d + dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool +diff --git a/configure.ac b/configure.ac +index 0667446..f75f433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,15 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT8_T + ++# Support for systemd unit files. ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_CONFIG_FILES([Makefile include/version.h lldpad.spec lldpad.pc liblldp_clif.pc]) + AC_CONFIG_MACRO_DIR([m4]) + AC_OUTPUT +-- +1.9.1 + diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb new file mode 100644 index 0000000..7fa3429 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -0,0 +1,37 @@ +SUMMARY = "Open-LLDP" +DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" +HOMEPAGE = "http://open-lldp.org/start" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager', 'systemd', 'systemd', '', d)} + +DEPENDS = "libnl libconfig readline" + +SRCREV = "36d729de7ce5b56cf061d94d610cf0510154820c" +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master" +SRC_URI += "file://0001-autotools-Add-option-to-disable-installation-of-syst.patch" + +# Even though .ac allows disabling -Werror, Makefile.am adds it to AM_CFLAGS +# causing it to always be enabled. There are warnings so disable it. +TARGET_CFLAGS += "-Wno-error" + +# configure.ac generates version.h from include/version.h.in but autotools puts +# build artefacts in $B, not $S and the header can't be found. To avoid +# inheriting autotools-brokensep and messing up the source dir just tell Makefile +# where it is. +TARGET_CFLAGS += "-I ${B}/include" + +# Enable install of systemd conf files. +EXTRA_OECONF += "${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" + +SYSTEMD_SERVICE_${PN} = "lldpad.service lldpad.socket" + +# To enable service at boot set to enable in local.conf. +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS_${PN} = "iproute2-tc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:57 +0000 Subject: [oe-commits] [meta-openembedded] 06/06: ser2net: upgrade 3.5.1 -> 4.1.2 In-Reply-To: <158267483139.5294.18319634501949682768@git.openembedded.org> References: <158267483139.5294.18319634501949682768@git.openembedded.org> Message-ID: <20200225235352.26887232AA8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6fcf88e97907ec0bb052a992ebcb48c5c03b06f1 Author: Pierre-Jean Texier AuthorDate: Tue Feb 25 21:41:59 2020 +0000 ser2net: upgrade 3.5.1 -> 4.1.2 Add gensio and libyaml to DEPENDS list, see: - https://sourceforge.net/p/ser2net/news/2019/05/ser2net-40-gensio-10-released/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb similarity index 67% rename from meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb index ed8aab0..66985af 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb @@ -5,10 +5,12 @@ HOMEPAGE = "http://sourceforge.net/projects/ser2net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +DEPENDS = "gensio libyaml" + SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "569267b37b8f507d8874f28f5334b5d2" -SRC_URI[sha256sum] = "02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862" +SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" +SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Feb 25 23:53:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 25 Feb 2020 23:53:56 +0000 Subject: [oe-commits] [meta-openembedded] 05/06: gensio: new package In-Reply-To: <158267483139.5294.18319634501949682768@git.openembedded.org> References: <158267483139.5294.18319634501949682768@git.openembedded.org> Message-ID: <20200225235352.1BFD1232AA7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8266ed2e7898ad493d1e81e2074f02acb598ed69 Author: Pierre-Jean Texier AuthorDate: Sun Feb 23 20:47:50 2020 +0000 gensio: new package Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ 2 files changed, 135 insertions(+) diff --git a/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch new file mode 100644 index 0000000..dbc48a2 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch @@ -0,0 +1,108 @@ +From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Tue, 25 Feb 2020 16:08:40 -0600 +Subject: [PATCH] filter: Rename some variables to tr_stdxxx + +stdout and stderr can be macros, don't use the names directly. + +Signed-off-by: Corey Minyard +Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] +Signed-off-by: Pierre-Jean Texier +--- + lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c +index d39d58b..abe2db6 100644 +--- a/lib/gensio_filter_trace.c ++++ b/lib/gensio_filter_trace.c +@@ -32,8 +32,8 @@ struct trace_filter { + enum trace_dir dir; + bool raw; + char *filename; +- bool stdout; +- bool stderr; ++ bool tr_stdout; ++ bool tr_stderr; + + FILE *tr; + }; +@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (tfilter->stdout) { ++ if (tfilter->tr_stdout) { + tfilter->tr = stdout; +- } else if (tfilter->stderr) { ++ } else if (tfilter->tr_stderr) { + tfilter->tr = stderr; + } else if (tfilter->filename) { + tfilter->tr = fopen(tfilter->filename, "a+"); +@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) ++ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) + fclose(tfilter->tr); + tfilter->tr = NULL; + return 0; +@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, + + static struct gensio_filter * + gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, +- bool raw, const char *filename, bool stdout, +- bool stderr) ++ bool raw, const char *filename, bool tr_stdout, ++ bool tr_stderr) + { + struct trace_filter *tfilter; + +- if (!filename && !stdout && !stderr) ++ if (!filename && !tr_stdout && !tr_stderr) + dir = TRACE_NONE; + + tfilter = o->zalloc(o, sizeof(*tfilter)); +@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, + if (!tfilter->filename) + goto out_nomem; + } +- tfilter->stdout = stdout; +- tfilter->stderr = stderr; ++ tfilter->tr_stdout = tr_stdout; ++ tfilter->tr_stderr = tr_stderr; + + tfilter->lock = o->alloc_lock(o); + if (!tfilter->lock) +@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + { + struct gensio_filter *filter; + int dir = TRACE_NONE; +- bool raw = false, stdout = false, stderr = false; ++ bool raw = false, tr_stdout = false, tr_stderr = false; + const char *filename = NULL; + unsigned int i; + +@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + continue; + if (gensio_check_keyvalue(args[i], "file", &filename) > 0) + continue; +- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) ++ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) + continue; +- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) ++ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) + continue; + return GE_INVAL; + } + + filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, +- stdout, stderr); ++ tr_stdout, tr_stderr); + if (!filter) + return GE_NOMEM; + +-- +2.7.4 + diff --git a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb new file mode 100644 index 0000000..8ba72f6 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" +PV = "1.5.3+git${SRCPV}" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ + file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS_${PN} += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:27 +0000 Subject: [oe-commits] [meta-openembedded] 01/16: fluidsynth: upgrade 2.1.0 -> 2.1.1 In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.76CF7232AA6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0af6e982368cec0981226c3434af457dd9e57af0 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:42 2020 +0100 fluidsynth: upgrade 2.1.0 -> 2.1.1 >From announcement: * a regression introduced in 2.1.0 caused the jack audio driver to not correct a sample-rate mismatch (#607) * pkg-config is now being to used to find readline (#606, thanks to @ffontaine) * fix various typos in the documentation (#600, thanks to @luzpaz) * fix a memory leak in the file renderer * fix leaking memory when sequencer clients were not explicitly unregistered (#610) * fix a heap-based use-after-free in jack driver (#613) * fix the linker possibly not finding libinstpatch (#617, thanks to @realnc) Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 9ce6506..4fb622c 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "37c9ae2bf431a764032f023b3b2c0c0b86b7c272" +SRCREV = "3b851da6f721fcf15ec0b935eba72707bdb53d7b" S = "${WORKDIR}/git" -PV = "2.1.0" +PV = "2.1.1" inherit cmake pkgconfig lib_package -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:28 +0000 Subject: [oe-commits] [meta-openembedded] 02/16: xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.8C584232AA7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 691e76b83a5accb22e112e6aaef2cca00d4318bd Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:43 2020 +0100 xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 Although not explicitly mentioned in release announcement it seems that this is a develpoment release. It was tested and there could be no reason found not to use this version. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{xfce4-sensors-plugin_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb similarity index 86% rename from meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb rename to meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 4d78bb2..8b65014 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" -SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" +SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" +SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" EXTRA_OECONF = " \ --disable-procacpi \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:26 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (6fcf88e -> 24328d3) Message-ID: <158268800664.22098.14538120348960824881@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 6fcf88e ser2net: upgrade 3.5.1 -> 4.1.2 discard 8266ed2 gensio: new package discard 094948e open-lldp: Add initial version 1.0.1 discard e3e8c50 fdk-aac: add initial fdk-aac recipe discard f5102f7 c-ares: move from meta-networking to meta-oe discard b4b4119 libvncserver: don't enable sasl support by default discard 3749d22 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite discard 8f8de92 cfengine-masterfiles: Make the expression dash friendly discard 51c3d00 ngnix: fix error during service startup discard 6c42c82 luajit: Upgrade to 2.1.0-beta3 discard 5a1138c libuv: upgrade 1.34.0 -> 1.34.2 discard 9cd1351 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 discard e5d9279 span-lite: Add git version discard ce24a05 xfce4-sensors-plugin: Change defaults to useful ones discard 1a6c12e xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 discard 8ba21fc fluidsynth: upgrade 2.1.0 -> 2.1.1 discard 2e789ac nginx.service: sleep 0.1 after nginx start new 0af6e98 fluidsynth: upgrade 2.1.0 -> 2.1.1 new 691e76b xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 new e37bcbc xfce4-sensors-plugin: Change defaults to useful ones new 7cd1a97 span-lite: Add git version new da1f9f6 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 new a38a73e libuv: upgrade 1.34.0 -> 1.34.2 new 580b205 luajit: Upgrade to 2.1.0-beta3 new c2e3f86 nginx: fix error during service startup new 30547f9 cfengine-masterfiles: Make the expression dash friendly new d3ec881 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite new 11473c4 libvncserver: don't enable sasl support by default new e9d7a49 c-ares: move from meta-networking to meta-oe new bbb97c7 fdk-aac: add initial fdk-aac recipe new 7d78087 gensio: new package new d040e7f ser2net: upgrade 3.5.1 -> 4.1.2 new 24328d3 libharu: New recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6fcf88e) \ N -- N -- N refs/heads/master-next (24328d3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...dd-option-to-disable-installation-of-syst.patch | 57 ---------------------- .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 37 -------------- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 24 +++++++++ .../recipes-httpd/nginx/files/nginx.service | 1 - 5 files changed, 76 insertions(+), 95 deletions(-) delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb create mode 100644 meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch create mode 100644 meta-oe/recipes-support/libharu/libharu_2.3.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:30 +0000 Subject: [oe-commits] [meta-openembedded] 04/16: span-lite: Add git version In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.AE347232AA9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7cd1a972723e3ebcf27d85fc07de9e051e71707e Author: William A. Kennington III AuthorDate: Mon Feb 24 15:33:12 2020 -0800 span-lite: Add git version We would generally prefer to use stable releases, but there are fixes in master that have not yet been released for compiling the test cases against libc++. Signed-off-by: William A. Kennington III Signed-off-by: Khem Raj --- meta-oe/recipes-support/span-lite/span-lite_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-oe/recipes-support/span-lite/span-lite_git.bb b/meta-oe/recipes-support/span-lite/span-lite_git.bb new file mode 100644 index 0000000..96ec829 --- /dev/null +++ b/meta-oe/recipes-support/span-lite/span-lite_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "single-file header-only version of a C++20-like span for C++98, C++11 and later" +HOMEPAGE = "https://github.com/martinmoene/span-lite" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI += "git://github.com/martinmoene/span-lite" +SRCREV = "e03d1166ccc8481d993dc02aae703966301a5e6e" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:29 +0000 Subject: [oe-commits] [meta-openembedded] 03/16: xfce4-sensors-plugin: Change defaults to useful ones In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.9DF84232AA8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e37bcbc1379cab5c4e7644f1d405498dea7e3f52 Author: Andreas M?ller AuthorDate: Mon Feb 24 14:33:44 2020 +0100 xfce4-sensors-plugin: Change defaults to useful ones Every time I added xfce4-sensors-plugin to panel xfce4-sensors-plugin suggested sensors not exactly useful. So change defaults: * remove lmsensors * make sysfsacpi work and don't disable it because that's where embedded machines drop useful information Background: Have spent lots of efforts to get Raspi4 cooled properly while running at gouvernor 'performance' and rendering music. Would like to see if it really wears a cool hat [1] [1] https://github.com/schnitzeltony/rpi-cool-hat Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...k-for-sys-class-power_supply-we-are-cross.patch | 44 ++++++++++++++++++++++ .../sensors/xfce4-sensors-plugin_1.3.92.bb | 3 +- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch new file mode 100644 index 0000000..ac1d603 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch @@ -0,0 +1,44 @@ +From 9b7e1beca872ca4a5fce8938c58379103787f79a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 23 Feb 2020 22:06:32 +0100 +Subject: [PATCH] Do not check for /sys/class/power_supply - we are cross + compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas M?ller +--- + configure.ac | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c281af9..60ba0c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -209,19 +209,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AC_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], + [], + [ +- enable_sysfsacpi=auto ++ enable_sysfsacpi=yes + ]) + +-if test x"$enable_sysfsacpi" = x"auto"; then +- AC_CHECK_FILE([/sys/class/power_supply], +- [ +- enable_sysfsacpi=yes +- ], +- [ +- enable_sysfsacpi=no +- ]) +-fi +- + if test x"$enable_sysfsacpi" = x"yes"; then + AC_DEFINE([HAVE_SYSFS_ACPI], [1], [Define to 1 if /sys/class/power_supply is found]) + enable_procacpi=yes +-- +2.21.0 + diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 8b65014..3fd0ff6 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -7,10 +7,10 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ --disable-procacpi \ - --disable-sysfsacpi \ --disable-xnvctrl \ " @@ -18,7 +18,6 @@ do_configure_prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } -PACKAGECONFIG ??= "libsensors" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:32 +0000 Subject: [oe-commits] [meta-openembedded] 06/16: libuv: upgrade 1.34.0 -> 1.34.2 In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.CDA54232AB1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a38a73eacd5d8c2c2d53fe94c2de696b3c11917a Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 22:10:29 2020 +0000 libuv: upgrade 1.34.0 -> 1.34.2 See full changelog https://github.com/libuv/libuv/releases/tag/v1.34.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb similarity index 90% rename from meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb rename to meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb index b842bbd..234cec3 100644 --- a/meta-oe/recipes-connectivity/libuv/libuv_1.34.0.bb +++ b/meta-oe/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:31 +0000 Subject: [oe-commits] [meta-openembedded] 05/16: inotify-tools: upgrade 3.20.1 -> 3.20.2.2 In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.BD357232AAA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit da1f9f63612ae67991bc0339958aacbe664f6981 Author: Pierre-Jean Texier AuthorDate: Mon Feb 24 21:03:56 2020 +0000 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...001-Makefile.am-add-build-rule-for-README.patch | 46 ++++++++++++++++++++++ .../inotify-nosys-fix-system-call-number.patch | 31 --------------- .../inotify-tools/inotify-tools_git.bb | 8 ++-- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch new file mode 100644 index 0000000..2c7cd99 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch @@ -0,0 +1,46 @@ +From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Mon, 24 Feb 2020 21:44:45 +0100 +Subject: [PATCH] Makefile.am: add build rule for README + +Fixes: + +| configure.ac:17: installing 'config/config.sub' +| configure.ac:16: installing 'config/install-sh' +| configure.ac:16: installing 'config/missing' +| Makefile.am: error: required file './README' not found +| libinotifytools/src/Makefile.am: installing 'config/depcomp' + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] + +Signed-off-by: Pierre-Jean Texier +--- + Makefile.am | 2 ++ + autogen.sh | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 56e4531..d08c8fe 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = libinotifytools src man + ++README: README.md ++ + dist-hook: + # Automake official documentation states that dist-hook should assume files + # are not writable. +diff --git a/autogen.sh b/autogen.sh +index 48eb21d..31572c2 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,4 +1,3 @@ + #!/bin/sh + +-cp README.md README + autoreconf --install "$@" || exit 1 +-- +2.7.4 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch deleted file mode 100644 index 89b890d..0000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch +++ /dev/null @@ -1,31 +0,0 @@ -inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64 - -The correct value should be the same as defined in -linux/arch/mips/include/uapi/asm/unistd.h - -Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71] - -Signed-off-by: Roy Li -Signed-off-by: Jackie Huang ---- - libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h -index db76b2c..5f7b11b 100644 ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -100,8 +100,8 @@ struct inotify_event { - # endif - # if _MIPS_SIM == _MIPS_SIM_ABI64 - # define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 243) --# define __NR_inotify_rm_watch (__NR_Linux + 243) -+# define __NR_inotify_add_watch (__NR_Linux + 244) -+# define __NR_inotify_rm_watch (__NR_Linux + 245) - # endif - # if _MIPS_SIM == _MIPS_SIM_NABI32 - # define __NR_inotify_init (__NR_Linux + 247) --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index 05ca4b4..f42abeb 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -5,12 +5,12 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "e203934e46784bb34c213078423ba1678e0c4936" -PV = "3.20.1" +SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" +PV = "3.20.2.2" SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://inotify-nosys-fix-system-call-number.patch \ - " + file://0001-Makefile.am-add-build-rule-for-README.patch \ + " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:35 +0000 Subject: [oe-commits] [meta-openembedded] 09/16: cfengine-masterfiles: Make the expression dash friendly In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.0C810232ABA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 30547f91b5a06fa9415b0ebb79e5ff7af1ea23cb Author: Khem Raj AuthorDate: Tue Feb 25 07:46:39 2020 -0800 cfengine-masterfiles: Make the expression dash friendly dash does not understand {} expressions like this, therefore simplify Signed-off-by: Khem Raj --- meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 79269d3..35ac855 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -33,7 +33,7 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" do_install_append() { - rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } FILES_${PN} = "${datadir}/cfengine" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:33 +0000 Subject: [oe-commits] [meta-openembedded] 07/16: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.E1574232AB2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 580b205993a38ec11aa9010d10d8bba7174135ce Author: Leo Yan AuthorDate: Tue Feb 25 06:37:11 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ------------------- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++-------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch deleted file mode 100644 index c39ef6f..0000000 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ /dev/null @@ -1,19 +0,0 @@ -clang pretends to be gcc 4.2.0 which is a big lie when it comes -to features, its same as latest gcc - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: LuaJIT-2.0.5/src/lj_arch.h -=================================================================== ---- LuaJIT-2.0.5.orig/src/lj_arch.h -+++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" - #endif - #elif !LJ_TARGET_PS3 --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__) - #error "Need at least GCC 4.3 or newer" - #endif - #endif diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 89% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..da79832 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,13 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:36 +0000 Subject: [oe-commits] [meta-openembedded] 10/16: layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.1A141232AA6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d3ec881bf898da702f73bf7cf066ae9899d6406e Author: Khem Raj AuthorDate: Tue Feb 25 11:24:44 2020 -0800 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite This is to avoid sstate signature failures where dependencies on shared-mime-info and desktop-file-utils is added via mime and mime-xdg classes which are target packages and not allarch Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index bad8785..a93d239 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -54,6 +54,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ + phoronix-test-suite->shared-mime-info \ + phoronix-test-suite->desktop-file-utils \ " # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:37 +0000 Subject: [oe-commits] [meta-openembedded] 11/16: libvncserver: don't enable sasl support by default In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.2954C232AA7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 11473c4805df80d4ded5b886098623a398b86d28 Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:10 2020 +0100 libvncserver: don't enable sasl support by default * cyrus-sasl is in meta-networking and meta-oe doesn't depend on meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb index 22fc83a..dfdf824 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb @@ -17,7 +17,6 @@ PACKAGECONFIG ??= " \ pthread \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sasl \ sdl \ websockets \ zlib \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:39 +0000 Subject: [oe-commits] [meta-openembedded] 13/16: fdk-aac: add initial fdk-aac recipe In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.42EF6232AA9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bbb97c76767d4cd163450c599ae0ae25fef7b756 Author: Mircea Carausu AuthorDate: Tue Feb 25 11:41:03 2020 -0800 fdk-aac: add initial fdk-aac recipe Add Fraunhofer FDK AAC Codec Library recipe. Signed-off-by: Mircea Carausu Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../Fraunhofer_FDK_AAC_Codec_Library_for_Android | 92 ++++++++++++++++++++++ .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 ++++++ 2 files changed, 114 insertions(+) diff --git a/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android new file mode 100644 index 0000000..05b32bd --- /dev/null +++ b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android @@ -0,0 +1,92 @@ +Software License for The Fraunhofer FDK AAC Codec Library for Android + +? Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur F?rderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info at iis.fraunhofer.de + diff --git a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb new file mode 100644 index 0000000..d791168 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "FDK-AAC audio codec" + +DESCRIPTION = "The Fraunhofer FDK AAC Codec Library for Android \ +(\"FDK AAC Codec\") is software that implements the MPEG \ +Advanced Audio Coding (\"AAC\") encoding and decoding scheme \ +for digital audio." + +HOMEPAGE = "https://www.iis.fraunhofer.de/en/ff/amm/impl.html" + +LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" + +SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master" +SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" + +S = "${WORKDIR}/git" + +SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7" +SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:41 +0000 Subject: [oe-commits] [meta-openembedded] 15/16: ser2net: upgrade 3.5.1 -> 4.1.2 In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.59626232ABB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d040e7ff6568ab4794a8bd353d5da20a701aa3f0 Author: Pierre-Jean Texier AuthorDate: Tue Feb 25 21:41:59 2020 +0000 ser2net: upgrade 3.5.1 -> 4.1.2 Add gensio and libyaml to DEPENDS list, see: - https://sourceforge.net/p/ser2net/news/2019/05/ser2net-40-gensio-10-released/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb similarity index 67% rename from meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb index ed8aab0..66985af 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb @@ -5,10 +5,12 @@ HOMEPAGE = "http://sourceforge.net/projects/ser2net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +DEPENDS = "gensio libyaml" + SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "569267b37b8f507d8874f28f5334b5d2" -SRC_URI[sha256sum] = "02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862" +SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" +SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:38 +0000 Subject: [oe-commits] [meta-openembedded] 12/16: c-ares: move from meta-networking to meta-oe In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.37D23232AA5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e9d7a4945f3cfed1ddb326be39a1a4502c160be2 Author: Martin Jansa AuthorDate: Tue Feb 25 20:36:15 2020 +0100 c-ares: move from meta-networking to meta-oe * nodejs from meta-oe depends on this since: commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641 Author: Andr? Draszik Date: Tue Oct 29 16:42:24 2019 +0000 nodejs: allow use of system c-ares (and make default) Use system c-ares via PACKAGECONFIG by default. So far, nodejs had been built using its embedded copy of c-ares, which we generally try to avoid, for the known reasons (independent updates, cve & license checks, etc). Notes: * otherwise nodejs uses its bundled version of c-ares * the PACKAGECONFIG variable is 'ares' so as to be in line with other uses of this (wget & curl recipes in OE core) Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../recipes-core/packagegroups/packagegroup-meta-networking.bb | 2 +- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- .../recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch | 0 {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb | 0 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index fa9bf2d..103c99b 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -107,7 +107,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tunctl dovecot ipvsadm stunnel chrony spice-protocol \ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ - libmemcached smcroute libtevent ipcalc c-ares uftp \ + libmemcached smcroute libtevent ipcalc uftp \ ntimed linux-atm ssmtp openvpn rdma-core \ iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0bda946..d096539 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -238,7 +238,7 @@ NE10_armv7a = "ne10" NE10_armv7ve = "ne10" RDEPENDS_packagegroup-meta-oe-support ="\ - anthy asio atop augeas avro-c bdwgc frame grail \ + anthy asio atop augeas avro-c bdwgc frame grail c-ares \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ dstat eject enca epeg espeak fbset fbset-modes \ diff --git a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch rename to meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:40 +0000 Subject: [oe-commits] [meta-openembedded] 14/16: gensio: new package In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.4EA9D232AA8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7d78087005afcc916b0167c282fc6e96aa0eb298 Author: Pierre-Jean Texier AuthorDate: Sun Feb 23 20:47:50 2020 +0000 gensio: new package Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ 2 files changed, 135 insertions(+) diff --git a/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch new file mode 100644 index 0000000..dbc48a2 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch @@ -0,0 +1,108 @@ +From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Tue, 25 Feb 2020 16:08:40 -0600 +Subject: [PATCH] filter: Rename some variables to tr_stdxxx + +stdout and stderr can be macros, don't use the names directly. + +Signed-off-by: Corey Minyard +Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] +Signed-off-by: Pierre-Jean Texier +--- + lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c +index d39d58b..abe2db6 100644 +--- a/lib/gensio_filter_trace.c ++++ b/lib/gensio_filter_trace.c +@@ -32,8 +32,8 @@ struct trace_filter { + enum trace_dir dir; + bool raw; + char *filename; +- bool stdout; +- bool stderr; ++ bool tr_stdout; ++ bool tr_stderr; + + FILE *tr; + }; +@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (tfilter->stdout) { ++ if (tfilter->tr_stdout) { + tfilter->tr = stdout; +- } else if (tfilter->stderr) { ++ } else if (tfilter->tr_stderr) { + tfilter->tr = stderr; + } else if (tfilter->filename) { + tfilter->tr = fopen(tfilter->filename, "a+"); +@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) ++ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) + fclose(tfilter->tr); + tfilter->tr = NULL; + return 0; +@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, + + static struct gensio_filter * + gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, +- bool raw, const char *filename, bool stdout, +- bool stderr) ++ bool raw, const char *filename, bool tr_stdout, ++ bool tr_stderr) + { + struct trace_filter *tfilter; + +- if (!filename && !stdout && !stderr) ++ if (!filename && !tr_stdout && !tr_stderr) + dir = TRACE_NONE; + + tfilter = o->zalloc(o, sizeof(*tfilter)); +@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, + if (!tfilter->filename) + goto out_nomem; + } +- tfilter->stdout = stdout; +- tfilter->stderr = stderr; ++ tfilter->tr_stdout = tr_stdout; ++ tfilter->tr_stderr = tr_stderr; + + tfilter->lock = o->alloc_lock(o); + if (!tfilter->lock) +@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + { + struct gensio_filter *filter; + int dir = TRACE_NONE; +- bool raw = false, stdout = false, stderr = false; ++ bool raw = false, tr_stdout = false, tr_stderr = false; + const char *filename = NULL; + unsigned int i; + +@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + continue; + if (gensio_check_keyvalue(args[i], "file", &filename) > 0) + continue; +- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) ++ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) + continue; +- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) ++ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) + continue; + return GE_INVAL; + } + + filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, +- stdout, stderr); ++ tr_stdout, tr_stderr); + if (!filter) + return GE_NOMEM; + +-- +2.7.4 + diff --git a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb new file mode 100644 index 0000000..8ba72f6 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" +PV = "1.5.3+git${SRCPV}" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ + file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS_${PN} += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:42 +0000 Subject: [oe-commits] [meta-openembedded] 16/16: libharu: New recipe In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033328.63BDB232AC9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 24328d34a6b1ac75a273a45933cbb7c39e0b2da8 Author: Zheng Ruoqin AuthorDate: Wed Feb 19 17:21:35 2020 +0800 libharu: New recipe libHaru is a library for generating PDF files. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 24 ++++++++++ 2 files changed, 76 insertions(+) diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch new file mode 100644 index 0000000..332be1b --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch @@ -0,0 +1,52 @@ +Backport from Fedora Project. +https://src.fedoraproject.org/rpms/libharu + +Fix the install destination of some files. + +Upstream-Status: inappropriate + +Signed-off-by: Zheng Ruoqin + +diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt +--- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 +@@ -25,7 +25,7 @@ endif(MSVC) + + # information about libharu + set(LIBHPDF_MAJOR 2) +-set(LIBHPDF_MINOR 2) ++set(LIBHPDF_MINOR 3) + set(LIBHPDF_PATCH 0) + set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) + set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") +@@ -210,9 +210,9 @@ set( + install(FILES ${haru_HDRS} DESTINATION include) + + # install various files +-install(FILES README CHANGES INSTALL DESTINATION .) ++install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + if(NOT DEVPAK) +- install(DIRECTORY if DESTINATION .) ++ install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + endif(NOT DEVPAK) + if(DEVPAK) + install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) +diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt +--- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 +@@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) + target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) + if(WIN32 AND NOT CYGWIN) + set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ else(WIN32 AND NOT CYGWIN) ++ set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) + endif(WIN32 AND NOT CYGWIN) + install( + TARGETS ${LIBHPDF_NAME} +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ) + endif(LIBHPDF_SHARED) diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb new file mode 100644 index 0000000..359f615 --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" + +SRC_URI = "https://github.com/libharu/${BPN}/archive/RELEASE_${@d.getVar('PV').replace('.','_')}.tar.gz \ + file://libharu-RELEASE_2_3_0_cmake.patch \ + " + +SRC_URI[md5sum] = "4f916aa49c3069b3a10850013c507460" +SRC_URI[sha256sum] = "8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2" + +S = "${WORKDIR}/${BPN}-RELEASE_${@d.getVar('PV').replace('.','_')}" + +inherit cmake +DEPENDS += "libpng zlib" + +do_install_append() { + mkdir -p ${D}/${datadir}/libharu + mv ${D}/libharu ${D}/${datadir} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 03:33:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 03:33:34 +0000 Subject: [oe-commits] [meta-openembedded] 08/16: nginx: fix error during service startup In-Reply-To: <158268800664.22098.14538120348960824881@git.openembedded.org> References: <158268800664.22098.14538120348960824881@git.openembedded.org> Message-ID: <20200226033327.F3FA4232AB3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c2e3f868b0fe0d162af83b0c2e1b406bbe9d410a Author: Changqing Li AuthorDate: Tue Feb 25 15:56:16 2020 +0800 nginx: fix error during service startup fix below error: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 100 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch new file mode 100644 index 0000000..90159a6 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch @@ -0,0 +1,99 @@ +Description: Fix NGINX pidfile handling +Author: Tj +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864 +Last-Update: 2019-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Upstream-Status: Pending + +This patch is from ubuntu, https://github.com/aroth-arsoft/pkg-nginx/blob +/master/debian/patches/nginx-fix-pidfile.patch, for fix below +error info: +nginx.service: failed to parse pid from file /run/nginx/nginx.pid: +invalid argument + +Signed-off-by: Changqing Li + +diff --git a/src/core/nginx.c b/src/core/nginx.c +index 9fcb0eb2..083eba1d 100644 +--- a/src/core/nginx.c ++++ b/src/core/nginx.c +@@ -338,14 +338,21 @@ main(int argc, char *const *argv) + ngx_process = NGX_PROCESS_MASTER; + } + ++ /* tell-tale to detect if this is parent or child process */ ++ ngx_int_t child_pid = NGX_BUSY; ++ + #if !(NGX_WIN32) + + if (ngx_init_signals(cycle->log) != NGX_OK) { + return 1; + } + ++ /* tell-tale that this code has been executed */ ++ child_pid--; ++ + if (!ngx_inherited && ccf->daemon) { +- if (ngx_daemon(cycle->log) != NGX_OK) { ++ child_pid = ngx_daemon(cycle->log); ++ if (child_pid == NGX_ERROR) { + return 1; + } + +@@ -358,8 +365,19 @@ main(int argc, char *const *argv) + + #endif + +- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { +- return 1; ++ /* If ngx_daemon() returned the child's PID in the parent process ++ * after the fork() set ngx_pid to the child_pid, which gets ++ * written to the PID file, then exit. ++ * For NGX_WIN32 always write the PID file ++ * For others, only write it from the parent process */ ++ if (child_pid < NGX_OK || child_pid > NGX_OK) { ++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid; ++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { ++ return 1; ++ } ++ } ++ if (child_pid > NGX_OK) { ++ exit(0); + } + + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { +diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c +index 385c49b6..3719854c 100644 +--- a/src/os/unix/ngx_daemon.c ++++ b/src/os/unix/ngx_daemon.c +@@ -7,14 +7,17 @@ + + #include + #include ++#include + + + ngx_int_t + ngx_daemon(ngx_log_t *log) + { + int fd; ++ /* retain the return value for passing back to caller */ ++ pid_t pid_child = fork(); + +- switch (fork()) { ++ switch (pid_child) { + case -1: + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); + return NGX_ERROR; +@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log) + break; + + default: +- exit(0); ++ /* let caller do the exit() */ ++ return pid_child; + } + + ngx_parent = ngx_pid; diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 0d229ff..2824c66 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -21,6 +21,7 @@ SRC_URI = " \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ + file://nginx-fix-pidfile.patch \ " inherit siteinfo update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:21 +0000 Subject: [oe-commits] [openembedded-core] 01/17: libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045420.C857D232AA6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6c123d4dfe34de813d3feb1ef3746cd7171fb5f6 Author: Tim Orling AuthorDate: Tue Feb 25 15:46:03 2020 -0800 libmodule-build-perl: upgrade 0.4229 -> 0.4231 Upstream release notes: " 0.4231 - Wed Jan 29 08:47:56 CET 2020 - Released 0.42_30 without code changes 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 - Add dependency on ExtUtils::PL2Bat " Add ptest RDEPENDS: - ExtUtils::Command::MM for t/compat.t - gcc, make didn't seem like enough for ptest, replace with packagegroup-core-buildessential which definitely works - perl-dev for EXTERN.h in t/xs.t Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev Five tests from t/help.t are skipped because they are TODO t/par.t is skipped because PAR::Dist (0.17+) is not present t/ppm.t is skipped because "HTML support not installed" All other tests pass. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb similarity index 90% rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index e3ba40d..b1967c7 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \ file://run-ptest \ - " -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" -SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" + " +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" +SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" S = "${WORKDIR}/Module-Build-${PV}" @@ -75,9 +75,10 @@ RDEPENDS_${PN} += " \ " RDEPENDS_${PN}-ptest += " \ - gcc \ - make \ + packagegroup-core-buildessential \ + perl-dev \ perl-module-blib \ + perl-module-extutils-command-mm \ perl-module-file-temp \ perl-module-lib \ perl-module-perlio \ @@ -103,4 +104,7 @@ RPROVIDES_${PN} += "\ libmodule-build-podparser-perl \ " +# t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev +INSANE_SKIP_${PN}-ptest = "dev-deps" + BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:22 +0000 Subject: [oe-commits] [openembedded-core] 02/17: libarchive: upgrade 3.4.1 -> 3.4.2 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045420.D4BEF232AA7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dc60576f8b89ac3d4c88942b652ae67e88114192 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:25 2020 +0100 libarchive: upgrade 3.4.1 -> 3.4.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.4.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 2d33dd8..c3edb57 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" -SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" +SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" +SRC_URI[sha256sum] = "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" inherit autotools update-alternatives pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:20 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (9cbd600 -> c90780d) Message-ID: <158269286037.15881.6206011272918931198@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 9cbd600 linux-yocto/5.2: update to v5.2.32 new 6c123d4 libmodule-build-perl: upgrade 0.4229 -> 0.4231 new dc60576 libarchive: upgrade 3.4.1 -> 3.4.2 new 43ca971 libpcre: upgrade 8.43 -> 8.44 new 7a0c4b8 python3-docutils: upgrade 0.15 -> 0.16 new fa2887c python3-mako: upgrade 1.1.0 -> 1.1.1 new 3749768 unifdef: upgrade 2.11 -> 2.12 new 220922a gnutls: upgrade 3.6.11.1 -> 3.6.12 new 5bb6383 python3-setuptools: upgrade 45.0.0 -> 45.2.0 new 52bf276 libgpg-error: upgrade 1.36 -> 1.37 new a3fccd8 acpica: upgrade 20191213 -> 20200214 new f645881 gst-validate: upgrade 1.16.1 -> 1.16.2 new 27cee5e ncurses: upgrade 6.1+20191019 -> 6.2 new c6b5005 webkitgtk: Disable GI data for musl/arm new 811c509 sysvinit: Fix install order/dependency new cd67cc6 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe new e704ad6 libedit/readline: Correct package alternatives link for manpage new c90780d utils.bbclass: Avoid recursive symlink in oe_soinstall This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9cbd600) \ N -- N -- N refs/heads/master-next (c90780d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 17 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/utils.bbclass | 8 +- meta/conf/layer.conf | 2 + meta/recipes-core/ncurses/ncurses.inc | 2 +- .../{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- .../libedit/libedit_20191231-3.1.bb | 2 +- ...rl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +- ...ionally-do-not-fetch-code-by-easy_install.patch | 4 +- meta/recipes-devtools/python/python-setuptools.inc | 4 +- ...3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +- ...python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +- ...ools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +- .../{acpica_20191213.bb => acpica_20200214.bb} | 6 +- .../{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 +- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 ++-- ...t-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 +- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 + .../{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 +- .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 7 +- .../libpcre/libpcre/out-of-tree.patch | 26 ---- .../libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} | 9 +- 26 files changed, 76 insertions(+), 232 deletions(-) rename meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} (89%) rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (90%) rename meta/recipes-devtools/python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} (60%) rename meta/recipes-devtools/python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} (63%) rename meta/recipes-devtools/python/{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} (100%) rename meta/recipes-devtools/unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} (53%) rename meta/recipes-extended/acpica/{acpica_20191213.bb => acpica_20200214.bb} (88%) rename meta/recipes-extended/libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} (93%) rename meta/recipes-multimedia/gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} (87%) rename meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} (93%) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) delete mode 100644 meta/recipes-support/libpcre/libpcre/out-of-tree.patch rename meta/recipes-support/libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:24 +0000 Subject: [oe-commits] [openembedded-core] 04/17: python3-docutils: upgrade 0.15 -> 0.16 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045420.F212B232AA9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a0c4b8e1b2dd2934f49be32e1a777f8778c715d Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:28 2020 +0100 python3-docutils: upgrade 0.15 -> 0.16 License-Update: formatting Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-docutils_0.15.bb b/meta/recipes-devtools/python/python3-docutils_0.16.bb similarity index 60% rename from meta/recipes-devtools/python/python3-docutils_0.15.bb rename to meta/recipes-devtools/python/python3-docutils_0.16.bb index f5c3f5d..50547a1 100644 --- a/meta/recipes-devtools/python/python3-docutils_0.15.bb +++ b/meta/recipes-devtools/python/python3-docutils_0.16.bb @@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation" HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" DEPENDS = "python3" SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "f51729f19e70a9dc4837433193a5e798" -SRC_URI[sha256sum] = "c35e87e985f70106f6f97e050f3bed990641e0e104566134b9cd23849a460e96" +SRC_URI[md5sum] = "9ccb6f332e23360f964de72c8ea5f0ed" +SRC_URI[sha256sum] = "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573" S = "${WORKDIR}/docutils-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:23 +0000 Subject: [oe-commits] [openembedded-core] 03/17: libpcre: upgrade 8.43 -> 8.44 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045420.E2B85232AA8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 43ca971f373775999e672dee7e69cb8ab74c3938 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:26 2020 +0100 libpcre: upgrade 8.43 -> 8.44 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libpcre/libpcre/out-of-tree.patch | 26 ---------------------- .../libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} | 9 ++++---- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch deleted file mode 100644 index d567896..0000000 --- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb similarity index 91% rename from meta/recipes-support/libpcre/libpcre_8.43.bb rename to meta/recipes-support/libpcre/libpcre_8.44.bb index f9a22fe..e5471e8 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:25 +0000 Subject: [oe-commits] [openembedded-core] 05/17: python3-mako: upgrade 1.1.0 -> 1.1.1 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.0BA71232AAA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fa2887c51694ff681c27d648fcbbf4c90420888a Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:29 2020 +0100 python3-mako: upgrade 1.1.0 -> 1.1.1 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-mako_1.1.0.bb b/meta/recipes-devtools/python/python3-mako_1.1.1.bb similarity index 63% rename from meta/recipes-devtools/python/python3-mako_1.1.0.bb rename to meta/recipes-devtools/python/python3-mako_1.1.1.bb index b139e5a..bc38009 100644 --- a/meta/recipes-devtools/python/python3-mako_1.1.0.bb +++ b/meta/recipes-devtools/python/python3-mako_1.1.1.bb @@ -2,14 +2,14 @@ SUMMARY = "Templating library for Python" HOMEPAGE = "http://www.makotemplates.org/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=df7e6c7c82990acf0228a55e00d29bc9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=943eb67718222db21d44a4ef1836675f" PYPI_PACKAGE = "Mako" inherit pypi setuptools3 -SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2" -SRC_URI[sha256sum] = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" +SRC_URI[md5sum] = "2660a4916f2f63456e6885c727b7cd2f" +SRC_URI[sha256sum] = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4" RDEPENDS_${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:26 +0000 Subject: [oe-commits] [openembedded-core] 06/17: unifdef: upgrade 2.11 -> 2.12 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.171E5232AB1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3749768d2f5dd516240e938f8c1c98a455837cf7 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:30 2020 +0100 unifdef: upgrade 2.11 -> 2.12 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/unifdef/unifdef_2.11.bb b/meta/recipes-devtools/unifdef/unifdef_2.12.bb similarity index 53% rename from meta/recipes-devtools/unifdef/unifdef_2.11.bb rename to meta/recipes-devtools/unifdef/unifdef_2.12.bb index 1ffc11e..22b10ba 100644 --- a/meta/recipes-devtools/unifdef/unifdef_2.11.bb +++ b/meta/recipes-devtools/unifdef/unifdef_2.12.bb @@ -3,12 +3,13 @@ SECTION = "devel" LICENSE = "BSD-2-Clause" HOMEPAGE = "http://dotat.at/prog/unifdef/" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fc6c2c1dc4f18c891ed5b7a469fe32 \ - file://unifdef.c;endline=32;md5=aaec84d8b68d8b6dea71f45e9949ebfe" +LIC_FILES_CHKSUM = "file://COPYING;md5=3498caf346f6b77934882101749ada23 \ + file://unifdef.c;endline=32;md5=6f4ee8085d6e6ab0f7cb4390e1a9c497 \ + " SRC_URI = "http://dotat.at/prog/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "337053fd8a7d9ab3adf5e50f88af95b7" -SRC_URI[sha256sum] = "828ffc270ac262b88fe011136acef2780c05b0dc3c5435d005651740788d4537" +SRC_URI[md5sum] = "ae8c0b3b4c43c1f6bc5f32412a820818" +SRC_URI[sha256sum] = "43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400" UPSTREAM_CHECK_REGEX = "unifdef-(?P((\d+\.*)+)(?![a-f0-9]{6,})).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:27 +0000 Subject: [oe-commits] [openembedded-core] 07/17: gnutls: upgrade 3.6.11.1 -> 3.6.12 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.24207232AB2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 220922abfdeb79d32cb217098666807384577db0 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:31 2020 +0100 gnutls: upgrade 3.6.11.1 -> 3.6.12 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb b/meta/recipes-support/gnutls/gnutls_3.6.12.bb similarity index 93% rename from meta/recipes-support/gnutls/gnutls_3.6.11.1.bb rename to meta/recipes-support/gnutls/gnutls_3.6.12.bb index 5b05364..f1eeebc 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.12.bb @@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" -SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" +SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" +SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:28 +0000 Subject: [oe-commits] [openembedded-core] 08/17: python3-setuptools: upgrade 45.0.0 -> 45.2.0 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.31D93232AB3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5bb63837977391b04cb5adde774f3f6ce406bd6c Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:32 2020 +0100 python3-setuptools: upgrade 45.0.0 -> 45.2.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index b1a6813..5f99cd2 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 +From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 09066f8..d3039a5 100644 +index 426301d..55c8062 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -649,6 +649,11 @@ class easy_install(Command): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index c697937..f7c3202 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" -SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" +SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30" +SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_45.0.0.bb rename to meta/recipes-devtools/python/python3-setuptools_45.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:30 +0000 Subject: [oe-commits] [openembedded-core] 10/17: acpica: upgrade 20191213 -> 20200214 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.49860232ABB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a3fccd845b8f4e9b3ae915cd319a38877fb7fe94 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:34 2020 +0100 acpica: upgrade 20191213 -> 20200214 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../acpica/{acpica_20191213.bb => acpica_20200214.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/acpica/acpica_20191213.bb b/meta/recipes-extended/acpica/acpica_20200214.bb similarity index 88% rename from meta/recipes-extended/acpica/acpica_20191213.bb rename to meta/recipes-extended/acpica/acpica_20200214.bb index 6b1412e..cfa9fec 100644 --- a/meta/recipes-extended/acpica/acpica_20191213.bb +++ b/meta/recipes-extended/acpica/acpica_20200214.bb @@ -10,15 +10,15 @@ HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[md5sum] = "0f0eb38e796fac24c2aa4d9b6adcd950" -SRC_URI[sha256sum] = "304930df9836d3d4cdbf67a3ae6bd96dbc65f62602d869f571f4b6a12341e6c6" +SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113" +SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:31 +0000 Subject: [oe-commits] [openembedded-core] 11/17: gst-validate: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.54DD2232AC9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f6458814a24ecdc9cbdd680de78f819bd5a60104 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:35 2020 +0100 gst-validate: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb similarity index 87% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb index 7d602ea..35492fe 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "793e75f4717f718ad204c554d577b160" -SRC_URI[sha256sum] = "7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899" +SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c" +SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:32 +0000 Subject: [oe-commits] [openembedded-core] 12/17: ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.68DA9232AA6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 27cee5ec538715b5b933e6a4d86fda517bfa8f75 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:27 2020 +0100 ncurses: upgrade 6.1+20191019 -> 6.2 License-Update: copyright years and holders Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index b7bf4c0..4156bf4 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb similarity index 89% rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb rename to meta/recipes-core/ncurses/ncurses_6.2.bb index 187777f..b6d899c 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:29 +0000 Subject: [oe-commits] [openembedded-core] 09/17: libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.3DA2E232ABA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 52bf2769e37aa7c93f3a162ca4f96180a441c770 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:33 2020 +0100 libgpg-error: upgrade 1.36 -> 1.37 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 7 +- 2 files changed, 3 insertions(+), 148 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..0b691a5 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,10 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ - " + " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:33 +0000 Subject: [oe-commits] [openembedded-core] 13/17: webkitgtk: Disable GI data for musl/arm In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.72AA2232AA5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c6b50052db9572c3b9e4a619ea58992cab3c475f Author: Khem Raj AuthorDate: Tue Feb 25 07:28:57 2020 -0800 webkitgtk: Disable GI data for musl/arm qemu-arm hangs forever when running gobject introspection Signed-off-by: Khem Raj Cc: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7bffc15 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -123,5 +123,10 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED_libc-musl_armv7a = "False" +GI_DATA_ENABLED_libc-musl_armv7ve = "False" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:34 +0000 Subject: [oe-commits] [openembedded-core] 14/17: sysvinit: Fix install order/dependency In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.808E4232AA7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 811c5095fdeac65cb83de3e1e2253d2920a97d46 Author: Mark Hatle AuthorDate: Tue Feb 25 11:49:29 2020 -0600 sysvinit: Fix install order/dependency It is possible for sysvinit to be installed before the passwd/group files are installed from base-passwd. This results in an warning that the shutdown group can't be found. Adding a dependeny on base-passwd will resolve this issue. This has similar symptoms to the problem that oe-core commit 0227e929021263c51d2e7db36224000fecb01f1c fixed. The fix is simular in that it ensures that base-passwd is installed first, just at runtime vs setscene time. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 21ef0e9..63c1084 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -70,7 +70,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:36 +0000 Subject: [oe-commits] [openembedded-core] 16/17: libedit/readline: Correct package alternatives link for manpage In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.9761E232AA9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e704ad685f7744bf80f259c2edd22902f79a7e26 Author: Jeremy A. Puhlman AuthorDate: Tue Feb 25 11:25:44 2020 -0800 libedit/readline: Correct package alternatives link for manpage Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4babcbd..052e2d5 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 267fdcc..8d2d57a 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:35 +0000 Subject: [oe-commits] [openembedded-core] 15/17: layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.8B2BB232AA8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cd67cc6303ff1b15f0ea170995f596662a6b9806 Author: Khem Raj AuthorDate: Tue Feb 25 09:51:26 2020 -0800 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe These are added as dependencies by mime class, which could be inherited along with allarch and dependencies silently go into target specific recipes and which then can result in sstate hash signature mismatches when the allarch recipes are reused for another arch [YOCTO #13805] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index fcdf9ae..60f8e26 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -43,6 +43,8 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-utils \ gstreamer1.0-meta-base \ ca-certificates \ + shared-mime-info \ + desktop-file-utils \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 04:54:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 04:54:37 +0000 Subject: [oe-commits] [openembedded-core] 17/17: utils.bbclass: Avoid recursive symlink in oe_soinstall In-Reply-To: <158269286037.15881.6206011272918931198@git.openembedded.org> References: <158269286037.15881.6206011272918931198@git.openembedded.org> Message-ID: <20200226045421.A0D5E232AD1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c90780dab6c371c174704a3208312d751e9c8b1b Author: Yevhenii Shchehlov AuthorDate: Tue Feb 25 16:17:33 2020 +0200 utils.bbclass: Avoid recursive symlink in oe_soinstall This patch fixes an issue when oe_soinstall function creates non-functional recursive symlinks in case library soname is equal to library real (file) name. Signed-off-by: Yevhenii Shchehlov Signed-off-by: Richard Purdie --- meta/classes/utils.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index cd3d057..dea824f 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -25,7 +25,7 @@ oe_soinstall() { libname=`basename $1` case "$libname" in *.so) - bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3)" + bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" ;; esac install -m 755 $1 $2/$libname @@ -33,8 +33,12 @@ oe_soinstall() { if [ -z $sonamelink ]; then bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." fi + if [ "$sonamelink" == "$libname" ]; then + bbwarn "oe_soinstall: $libname soname is equal to real (file) name. Minor version should be added to a real name (e.g. libfoo.so.1.2 instead of libfoo.so.1)" + else + ln -sf $libname $2/$sonamelink + fi solink=`echo $libname | sed -e 's/\.so\..*/.so/'` - ln -sf $libname $2/$sonamelink ln -sf $libname $2/$solink } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 06:24:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 06:24:57 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (24328d3 -> d040e7f) Message-ID: <158269829796.814.4422396393698888086@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 24328d3 libharu: New recipe This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master-next (d040e7f) \ O -- O -- O (24328d3) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ---------------------- meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 24 ---------- 2 files changed, 76 deletions(-) delete mode 100644 meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch delete mode 100644 meta-oe/recipes-support/libharu/libharu_2.3.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:43 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (d040e7f -> 8972d17) Message-ID: <158273032325.9558.11332236983283206673@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard d040e7f ser2net: upgrade 3.5.1 -> 4.1.2 discard 7d78087 gensio: new package discard bbb97c7 fdk-aac: add initial fdk-aac recipe discard e9d7a49 c-ares: move from meta-networking to meta-oe discard 11473c4 libvncserver: don't enable sasl support by default discard d3ec881 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite discard 30547f9 cfengine-masterfiles: Make the expression dash friendly discard c2e3f86 nginx: fix error during service startup discard 580b205 luajit: Upgrade to 2.1.0-beta3 new fc8f28c nginx: fix error during service startup new 383f19d cfengine-masterfiles: Make the expression dash friendly new f4ef3fe layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite new c668961 libvncserver: don't enable sasl support by default new e92cbff c-ares: move from meta-networking to meta-oe new 997067e fdk-aac: add initial fdk-aac recipe new cc6075b gensio: new package new a7881c9 ser2net: upgrade 3.5.1 -> 4.1.2 new 085bfb6 luajit: Upgrade to 2.1.0-beta3 new 8972d17 libharu: New recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d040e7f) \ N -- N -- N refs/heads/master-next (8972d17) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 ++++++++ meta-oe/recipes-devtools/luajit/luajit_git.bb | 1 + .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 23 ++++++++++ 4 files changed, 95 insertions(+) create mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch create mode 100644 meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch create mode 100644 meta-oe/recipes-support/libharu/libharu_2.3.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:45 +0000 Subject: [oe-commits] [meta-openembedded] 02/10: cfengine-masterfiles: Make the expression dash friendly In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.B31DC232AB3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 383f19d8f0327b9b69be1fcf3891e393b5f05f44 Author: Khem Raj AuthorDate: Tue Feb 25 07:46:39 2020 -0800 cfengine-masterfiles: Make the expression dash friendly dash does not understand {} expressions like this, therefore simplify Signed-off-by: Khem Raj --- meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 79269d3..35ac855 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -33,7 +33,7 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" do_install_append() { - rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum} + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } FILES_${PN} = "${datadir}/cfengine" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:46 +0000 Subject: [oe-commits] [meta-openembedded] 03/10: layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.C0709232ABA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f4ef3feef26588e9e80e8c7845031fb0eedf9687 Author: Khem Raj AuthorDate: Tue Feb 25 11:24:44 2020 -0800 layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite This is to avoid sstate signature failures where dependencies on shared-mime-info and desktop-file-utils is added via mime and mime-xdg classes which are target packages and not allarch Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index bad8785..a93d239 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -54,6 +54,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ + phoronix-test-suite->shared-mime-info \ + phoronix-test-suite->desktop-file-utils \ " # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:44 +0000 Subject: [oe-commits] [meta-openembedded] 01/10: nginx: fix error during service startup In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.A1E44232AB2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fc8f28c61122950d25ebacffecbb582ac038c725 Author: Changqing Li AuthorDate: Tue Feb 25 15:56:16 2020 +0800 nginx: fix error during service startup fix below error: nginx.service: failed to parse pid from file /run/nginx/nginx.pid: invalid argument Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../nginx/files/nginx-fix-pidfile.patch | 99 ++++++++++++++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 100 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch new file mode 100644 index 0000000..90159a6 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch @@ -0,0 +1,99 @@ +Description: Fix NGINX pidfile handling +Author: Tj +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864 +Last-Update: 2019-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Upstream-Status: Pending + +This patch is from ubuntu, https://github.com/aroth-arsoft/pkg-nginx/blob +/master/debian/patches/nginx-fix-pidfile.patch, for fix below +error info: +nginx.service: failed to parse pid from file /run/nginx/nginx.pid: +invalid argument + +Signed-off-by: Changqing Li + +diff --git a/src/core/nginx.c b/src/core/nginx.c +index 9fcb0eb2..083eba1d 100644 +--- a/src/core/nginx.c ++++ b/src/core/nginx.c +@@ -338,14 +338,21 @@ main(int argc, char *const *argv) + ngx_process = NGX_PROCESS_MASTER; + } + ++ /* tell-tale to detect if this is parent or child process */ ++ ngx_int_t child_pid = NGX_BUSY; ++ + #if !(NGX_WIN32) + + if (ngx_init_signals(cycle->log) != NGX_OK) { + return 1; + } + ++ /* tell-tale that this code has been executed */ ++ child_pid--; ++ + if (!ngx_inherited && ccf->daemon) { +- if (ngx_daemon(cycle->log) != NGX_OK) { ++ child_pid = ngx_daemon(cycle->log); ++ if (child_pid == NGX_ERROR) { + return 1; + } + +@@ -358,8 +365,19 @@ main(int argc, char *const *argv) + + #endif + +- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { +- return 1; ++ /* If ngx_daemon() returned the child's PID in the parent process ++ * after the fork() set ngx_pid to the child_pid, which gets ++ * written to the PID file, then exit. ++ * For NGX_WIN32 always write the PID file ++ * For others, only write it from the parent process */ ++ if (child_pid < NGX_OK || child_pid > NGX_OK) { ++ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid; ++ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { ++ return 1; ++ } ++ } ++ if (child_pid > NGX_OK) { ++ exit(0); + } + + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { +diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c +index 385c49b6..3719854c 100644 +--- a/src/os/unix/ngx_daemon.c ++++ b/src/os/unix/ngx_daemon.c +@@ -7,14 +7,17 @@ + + #include + #include ++#include + + + ngx_int_t + ngx_daemon(ngx_log_t *log) + { + int fd; ++ /* retain the return value for passing back to caller */ ++ pid_t pid_child = fork(); + +- switch (fork()) { ++ switch (pid_child) { + case -1: + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed"); + return NGX_ERROR; +@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log) + break; + + default: +- exit(0); ++ /* let caller do the exit() */ ++ return pid_child; + } + + ngx_parent = ngx_pid; diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 0d229ff..2824c66 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -21,6 +21,7 @@ SRC_URI = " \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ + file://nginx-fix-pidfile.patch \ " inherit siteinfo update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:47 +0000 Subject: [oe-commits] [meta-openembedded] 04/10: libvncserver: don't enable sasl support by default In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.CCD84232ABB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c66896149c8b6bea524a8b518ea8b704ce7a9fd0 Author: Martin Jansa AuthorDate: Tue Feb 25 20:07:10 2020 +0100 libvncserver: don't enable sasl support by default * cyrus-sasl is in meta-networking and meta-oe doesn't depend on meta-networking Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb index 22fc83a..dfdf824 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb @@ -17,7 +17,6 @@ PACKAGECONFIG ??= " \ pthread \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sasl \ sdl \ websockets \ zlib \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:51 +0000 Subject: [oe-commits] [meta-openembedded] 08/10: ser2net: upgrade 3.5.1 -> 4.1.2 In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151844.01FB5232AD3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a7881c9b3653b70b7ae7bf98d34d07c5400e5955 Author: Pierre-Jean Texier AuthorDate: Tue Feb 25 21:41:59 2020 +0000 ser2net: upgrade 3.5.1 -> 4.1.2 Add gensio and libyaml to DEPENDS list, see: - https://sourceforge.net/p/ser2net/news/2019/05/ser2net-40-gensio-10-released/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb similarity index 67% rename from meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb index ed8aab0..66985af 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb @@ -5,10 +5,12 @@ HOMEPAGE = "http://sourceforge.net/projects/ser2net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +DEPENDS = "gensio libyaml" + SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "569267b37b8f507d8874f28f5334b5d2" -SRC_URI[sha256sum] = "02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862" +SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" +SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:49 +0000 Subject: [oe-commits] [meta-openembedded] 06/10: fdk-aac: add initial fdk-aac recipe In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.E1726232AD1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 997067e15eae80fa58b0c97a353606193f75f91c Author: Mircea Carausu AuthorDate: Tue Feb 25 11:41:03 2020 -0800 fdk-aac: add initial fdk-aac recipe Add Fraunhofer FDK AAC Codec Library recipe. Signed-off-by: Mircea Carausu Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../Fraunhofer_FDK_AAC_Codec_Library_for_Android | 92 ++++++++++++++++++++++ .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 ++++++ 2 files changed, 114 insertions(+) diff --git a/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android new file mode 100644 index 0000000..05b32bd --- /dev/null +++ b/meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android @@ -0,0 +1,92 @@ +Software License for The Fraunhofer FDK AAC Codec Library for Android + +? Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur F?rderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info at iis.fraunhofer.de + diff --git a/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb new file mode 100644 index 0000000..d791168 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "FDK-AAC audio codec" + +DESCRIPTION = "The Fraunhofer FDK AAC Codec Library for Android \ +(\"FDK AAC Codec\") is software that implements the MPEG \ +Advanced Audio Coding (\"AAC\") encoding and decoding scheme \ +for digital audio." + +HOMEPAGE = "https://www.iis.fraunhofer.de/en/ff/amm/impl.html" + +LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" + +SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master" +SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" + +S = "${WORKDIR}/git" + +SRC_URI[md5sum] = "fef453b5d6ee28ff302c600b8cded3e7" +SRC_URI[sha256sum] = "07c2a64b098eb48b2e9d729d5e778c08f7d22f28adc8da7c3f92c58da1cbbd8e" + +inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:50 +0000 Subject: [oe-commits] [meta-openembedded] 07/10: gensio: new package In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.ECC46232AD2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cc6075beb97a24cd085f86273eebd2247782e1db Author: Pierre-Jean Texier AuthorDate: Sun Feb 23 20:47:50 2020 +0000 gensio: new package Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ 2 files changed, 135 insertions(+) diff --git a/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch new file mode 100644 index 0000000..dbc48a2 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch @@ -0,0 +1,108 @@ +From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Tue, 25 Feb 2020 16:08:40 -0600 +Subject: [PATCH] filter: Rename some variables to tr_stdxxx + +stdout and stderr can be macros, don't use the names directly. + +Signed-off-by: Corey Minyard +Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] +Signed-off-by: Pierre-Jean Texier +--- + lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c +index d39d58b..abe2db6 100644 +--- a/lib/gensio_filter_trace.c ++++ b/lib/gensio_filter_trace.c +@@ -32,8 +32,8 @@ struct trace_filter { + enum trace_dir dir; + bool raw; + char *filename; +- bool stdout; +- bool stderr; ++ bool tr_stdout; ++ bool tr_stderr; + + FILE *tr; + }; +@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (tfilter->stdout) { ++ if (tfilter->tr_stdout) { + tfilter->tr = stdout; +- } else if (tfilter->stderr) { ++ } else if (tfilter->tr_stderr) { + tfilter->tr = stderr; + } else if (tfilter->filename) { + tfilter->tr = fopen(tfilter->filename, "a+"); +@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) ++ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) + fclose(tfilter->tr); + tfilter->tr = NULL; + return 0; +@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, + + static struct gensio_filter * + gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, +- bool raw, const char *filename, bool stdout, +- bool stderr) ++ bool raw, const char *filename, bool tr_stdout, ++ bool tr_stderr) + { + struct trace_filter *tfilter; + +- if (!filename && !stdout && !stderr) ++ if (!filename && !tr_stdout && !tr_stderr) + dir = TRACE_NONE; + + tfilter = o->zalloc(o, sizeof(*tfilter)); +@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, + if (!tfilter->filename) + goto out_nomem; + } +- tfilter->stdout = stdout; +- tfilter->stderr = stderr; ++ tfilter->tr_stdout = tr_stdout; ++ tfilter->tr_stderr = tr_stderr; + + tfilter->lock = o->alloc_lock(o); + if (!tfilter->lock) +@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + { + struct gensio_filter *filter; + int dir = TRACE_NONE; +- bool raw = false, stdout = false, stderr = false; ++ bool raw = false, tr_stdout = false, tr_stderr = false; + const char *filename = NULL; + unsigned int i; + +@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + continue; + if (gensio_check_keyvalue(args[i], "file", &filename) > 0) + continue; +- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) ++ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) + continue; +- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) ++ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) + continue; + return GE_INVAL; + } + + filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, +- stdout, stderr); ++ tr_stdout, tr_stderr); + if (!filter) + return GE_NOMEM; + +-- +2.7.4 + diff --git a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb new file mode 100644 index 0000000..8ba72f6 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" +PV = "1.5.3+git${SRCPV}" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ + file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS_${PN} += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:48 +0000 Subject: [oe-commits] [meta-openembedded] 05/10: c-ares: move from meta-networking to meta-oe In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151843.D7F09232AC9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e92cbff942b9ef6c50d7a7cbfb7ee4d2be656e2e Author: Martin Jansa AuthorDate: Tue Feb 25 20:36:15 2020 +0100 c-ares: move from meta-networking to meta-oe * nodejs from meta-oe depends on this since: commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641 Author: Andr? Draszik Date: Tue Oct 29 16:42:24 2019 +0000 nodejs: allow use of system c-ares (and make default) Use system c-ares via PACKAGECONFIG by default. So far, nodejs had been built using its embedded copy of c-ares, which we generally try to avoid, for the known reasons (independent updates, cve & license checks, etc). Notes: * otherwise nodejs uses its bundled version of c-ares * the PACKAGECONFIG variable is 'ares' so as to be in line with other uses of this (wget & curl recipes in OE core) Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../recipes-core/packagegroups/packagegroup-meta-networking.bb | 2 +- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- .../recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch | 0 {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb | 0 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index fa9bf2d..103c99b 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -107,7 +107,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tunctl dovecot ipvsadm stunnel chrony spice-protocol \ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ - libmemcached smcroute libtevent ipcalc c-ares uftp \ + libmemcached smcroute libtevent ipcalc uftp \ ntimed linux-atm ssmtp openvpn rdma-core \ iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0bda946..d096539 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -238,7 +238,7 @@ NE10_armv7a = "ne10" NE10_armv7ve = "ne10" RDEPENDS_packagegroup-meta-oe-support ="\ - anthy asio atop augeas avro-c bdwgc frame grail \ + anthy asio atop augeas avro-c bdwgc frame grail c-ares \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ dstat eject enca epeg espeak fbset fbset-modes \ diff --git a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch rename to meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb similarity index 100% rename from meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:53 +0000 Subject: [oe-commits] [meta-openembedded] 10/10: libharu: New recipe In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151844.16C8A232AE4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8972d17f6840cb7aadeff298c1b99293a3d31f5e Author: Zheng Ruoqin AuthorDate: Wed Feb 26 23:10:00 2020 +0800 libharu: New recipe libHaru is a library for generating PDF files. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 23 ++++++++++ 2 files changed, 75 insertions(+) diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch new file mode 100644 index 0000000..332be1b --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch @@ -0,0 +1,52 @@ +Backport from Fedora Project. +https://src.fedoraproject.org/rpms/libharu + +Fix the install destination of some files. + +Upstream-Status: inappropriate + +Signed-off-by: Zheng Ruoqin + +diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt +--- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 +@@ -25,7 +25,7 @@ endif(MSVC) + + # information about libharu + set(LIBHPDF_MAJOR 2) +-set(LIBHPDF_MINOR 2) ++set(LIBHPDF_MINOR 3) + set(LIBHPDF_PATCH 0) + set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) + set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") +@@ -210,9 +210,9 @@ set( + install(FILES ${haru_HDRS} DESTINATION include) + + # install various files +-install(FILES README CHANGES INSTALL DESTINATION .) ++install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + if(NOT DEVPAK) +- install(DIRECTORY if DESTINATION .) ++ install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + endif(NOT DEVPAK) + if(DEVPAK) + install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) +diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt +--- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 +@@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) + target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) + if(WIN32 AND NOT CYGWIN) + set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ else(WIN32 AND NOT CYGWIN) ++ set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) + endif(WIN32 AND NOT CYGWIN) + install( + TARGETS ${LIBHPDF_NAME} +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ) + endif(LIBHPDF_SHARED) diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb new file mode 100644 index 0000000..2d1a37c --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" + +SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ + file://libharu-RELEASE_2_3_0_cmake.patch \ + " + +SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" + +S = "${WORKDIR}/git" + +inherit cmake +DEPENDS += "libpng zlib" + +do_install_append() { + mkdir -p ${D}/${datadir}/libharu + mv ${D}/libharu ${D}/${datadir} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 15:18:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 15:18:52 +0000 Subject: [oe-commits] [meta-openembedded] 09/10: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158273032325.9558.11332236983283206673@git.openembedded.org> References: <158273032325.9558.11332236983283206673@git.openembedded.org> Message-ID: <20200226151844.0AFEE232ADA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 085bfb62b589354e09aac0be33cb919b88297815 Author: Leo Yan AuthorDate: Wed Feb 26 12:26:22 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded at 436 with fuzz 1 (offset 123 lines)." Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 4 ++-- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch index c39ef6f..807cc44 100644 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h =================================================================== --- LuaJIT-2.0.5.orig/src/lj_arch.h +++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" +@@ -436,7 +436,7 @@ + #endif #endif #elif !LJ_TARGET_PS3 -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 90% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..2a72438 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 21:42:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 21:42:57 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: ttf-noto-emoji: add recipe In-Reply-To: <158275337686.22337.1745218256126434035@git.openembedded.org> References: <158275337686.22337.1745218256126434035@git.openembedded.org> Message-ID: <20200226214257.335E8232AB3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c0dd1bd528d76fbf1101dd3a58cabd1af41e8937 Author: Matt Ranostay AuthorDate: Wed Feb 26 23:21:37 2020 +0200 ttf-noto-emoji: add recipe Add both B/W and color emojis fonts from the noto-emoji project. Important note for the color emojis to render the pixmap PACKAGECONFIG option needs to be set in freetype package. Signed-off-by: Matt Ranostay Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 1 + .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index a93d239..8ad21d6 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -72,6 +72,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-liberation-sans-narrow->fontconfig \ ttf-lklug->fontconfig \ ttf-lohit->fontconfig \ + ttf-noto-emoji->fontconfig \ ttf-pt-sans->fontconfig \ ttf-roboto->fontconfig \ ttf-mplus->fontconfig \ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb new file mode 100644 index 0000000..e74f7a7 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb @@ -0,0 +1,19 @@ +require ttf.inc + +SUMMARY = "Google noto emoji font pack" +HOMEPAGE = "https://github.com/googlefonts/noto-emoji" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" + +SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" +SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" + +PACKAGES = "${PN}-color ${PN}-regular" +FONT_PACKAGES = "${PN}-color ${PN}-regular" + +S = "${WORKDIR}/git" + +FILES_${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf" +FILES_${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf" + +do_compile[noexec] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 21:42:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 21:42:56 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (8972d17 -> 003afe5) Message-ID: <158275337686.22337.1745218256126434035@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 8972d17 libharu: New recipe new c0dd1bd ttf-noto-emoji: add recipe new f482fc3 mraa: Update SRC_URI and version to 2.1.0 new 003afe5 upm: Update SRC_URI The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/conf/layer.conf | 1 + meta-oe/recipes-extended/mraa/mraa_git.bb | 6 +++--- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 21:42:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 21:42:59 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: upm: Update SRC_URI In-Reply-To: <158275337686.22337.1745218256126434035@git.openembedded.org> References: <158275337686.22337.1745218256126434035@git.openembedded.org> Message-ID: <20200226214257.4494D232ABB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 003afe5b729060c6d236e62f42b4eacf8c345517 Author: Propanu AuthorDate: Wed Feb 26 12:49:54 2020 -0800 upm: Update SRC_URI Updating SRC_URI to reflect project move to Eclipse Foundation. Signed-off-by: Khem Raj --- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 6db8f88..c851c93 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 21:42:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 21:42:58 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: mraa: Update SRC_URI and version to 2.1.0 In-Reply-To: <158275337686.22337.1745218256126434035@git.openembedded.org> References: <158275337686.22337.1745218256126434035@git.openembedded.org> Message-ID: <20200226214257.3C346232ABA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f482fc303bc42b726bb2b9bd152aee5cd3b44797 Author: Propanu AuthorDate: Wed Feb 26 12:45:36 2020 -0800 mraa: Update SRC_URI and version to 2.1.0 Update SRCREV to latest v2.1.0 and SRC_URI to reflect new Eclipse Foundation project location. Signed-off-by: Khem Raj --- meta-oe/recipes-extended/mraa/mraa_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 6d42c67..bd33587 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -5,10 +5,10 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" -SRCREV = "967585c9ea0e1a8818d2172d2395d8502f6180a2" -PV = "2.0.0+git${SRCPV}" +SRCREV = "e15ce6fbc76148ba8835adc92196b0d0a3f245e7" +PV = "2.1.0+git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 23:41:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 23:41:31 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: upm: Update SRC_URI In-Reply-To: <158276049060.27909.17169944924265398851@git.openembedded.org> References: <158276049060.27909.17169944924265398851@git.openembedded.org> Message-ID: <20200226234130.C2CA2232AD3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5658a96b8cde95d390ffb4f1bb69834bf4376981 Author: Propanu AuthorDate: Wed Feb 26 12:49:54 2020 -0800 upm: Update SRC_URI Updating SRC_URI to reflect project move to Eclipse Foundation. Signed-off-by: Khem Raj --- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 6db8f88..c851c93 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Feb 26 23:41:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 26 Feb 2020 23:41:30 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (003afe5 -> 5658a96) Message-ID: <158276049060.27909.17169944924265398851@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 003afe5 upm: Update SRC_URI discard f482fc3 mraa: Update SRC_URI and version to 2.1.0 new 5658a96 upm: Update SRC_URI This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (003afe5) \ N -- N -- N refs/heads/master-next (5658a96) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-oe/recipes-extended/mraa/mraa_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 01:41:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 01:41:38 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: open-lldp: Add initial version 1.0.1 Message-ID: <158276769849.1548.3369723269784106818@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 1c00c81 open-lldp: Add initial version 1.0.1 1c00c81 is described below commit 1c00c814dc9482be56dbdd5ef6092581d9c36799 Author: Jonathan Richardson AuthorDate: Wed Feb 26 16:32:40 2020 -0800 open-lldp: Add initial version 1.0.1 Open-LLDP provides a Link Layer Discovery Protocol agent that supports DCB (Data Center Bridging). The tc utility from iproute is needed to manipulate traffic control settings in the kernel. Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- .../files/0001-Fix-musl-libc-build-issue.patch | 26 ++++++++++ ...s-Add-include-path-to-generated-version.h.patch | 29 +++++++++++ ...dd-option-to-disable-installation-of-syst.patch | 57 ++++++++++++++++++++++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 33 +++++++++++++ 4 files changed, 145 insertions(+) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch new file mode 100644 index 0000000..40b082e --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch @@ -0,0 +1,26 @@ +From a64e52f9b58519aa2b8a1073fa6c04da04933428 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Wed, 26 Feb 2020 12:16:38 -0800 +Subject: [PATCH] Fix musl libc build issue + +clif.h should include sys/types.h for the definition of pid_t. It fails +to compile when using musl libc. + +Signed-off-by: Jonathan Richardson + +--- + include/clif.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/clif.h b/include/clif.h +index 648eedf..92f4fd8 100644 +--- a/include/clif.h ++++ b/include/clif.h +@@ -32,6 +32,7 @@ + #ifndef CLIF_H + #define CLIF_H + ++#include + #include + #include "clif_sock.h" + diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch new file mode 100644 index 0000000..b58fc10 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch @@ -0,0 +1,29 @@ +From eb14aa66dc0384071af401cced8c02993b55502e Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Wed, 26 Feb 2020 15:54:51 -0800 +Subject: [PATCH] autotools: Add include path to generated version.h + +When the build dir isn't the same as source dir it fails to compile +because the generated version.h from AC_CONFIG_FILES is always in build +dir. Include the path to it in AM_CPPFLAGS. + +Signed-off-by: Jonathan Richardson + +--- + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0fb9bb0..2952019 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,6 +14,9 @@ endif + AM_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR="\"${sysconfdir}\"" \ + -D_FORTIFY_SOURCE=2 + ++# Required for the generated version.h when build dir is not the same as srcdir. ++AM_CPPFLAGS += -I${top_builddir}/include ++ + ACLOCAL_AMFLAGS = -I m4 + + parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch new file mode 100644 index 0000000..a26a529 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch @@ -0,0 +1,57 @@ +From dc3f2250908587710f109c80ddf8a94f0bc40b82 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Fri, 6 Apr 2018 10:49:04 -0700 +Subject: [PATCH] autotools: Add option to disable installation of systemd conf + files + +Add option to configure.ac to enable or disable install of systemd conf +files. If --with-systemdsystemunitdir is passed to configure then the +files will be installed to the provided directory. If the option isn't +provided then the value is determined from the systemd pkgconfig file, +if found in PKG_CONFIG_PATH. + +This change is required because Makefile.am always installed the files +to a hard coded path that couldn't be changed. + + +Signed-off-by: Jonathan Richardson +--- + Makefile.am | 3 ++- + configure.ac | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 292c0fd..0fb9bb0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -138,8 +138,9 @@ install-data-hook: installdirs-local + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = lldpad.pc liblldp_clif.pc + +-systemdsystemunitdir = $(prefix)/lib/systemd/system ++if HAVE_SYSTEMD + dist_systemdsystemunit_DATA = lldpad.service lldpad.socket ++endif + + bashcompletiondir = $(sysconfdir)/bash_completion.d + dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool +diff --git a/configure.ac b/configure.ac +index 0667446..f75f433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,15 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT8_T + ++# Support for systemd unit files. ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_CONFIG_FILES([Makefile include/version.h lldpad.spec lldpad.pc liblldp_clif.pc]) + AC_CONFIG_MACRO_DIR([m4]) + AC_OUTPUT diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb new file mode 100644 index 0000000..5fbf064 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "Open-LLDP" +DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" +HOMEPAGE = "http://open-lldp.org/start" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} + +DEPENDS = "libnl libconfig readline" + +SRCREV = "36d729de7ce5b56cf061d94d610cf0510154820c" +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master \ + file://0001-Fix-musl-libc-build-issue.patch \ + file://0001-autotools-Add-include-path-to-generated-version.h.patch \ + file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ + " + +# Makefile.am adds -Werror to AM_CFLAGS. There are warnings so disable it. +TARGET_CFLAGS += "-Wno-error" + +# Enable install of systemd conf files. +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" + +SYSTEMD_SERVICE_${PN} = "lldpad.service lldpad.socket" + +# To enable service at boot set to enable in local.conf. +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS_${PN} = "iproute2-tc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 02:14:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 02:14:01 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: can-utils: update to v2020.02.04 Message-ID: <158276964129.25116.7806405624131038364@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 80fae64 can-utils: update to v2020.02.04 80fae64 is described below commit 80fae6498509a94552e247ede50bbe17050f4fd3 Author: Denys Dmytriyenko AuthorDate: Wed Feb 26 20:49:21 2020 -0500 can-utils: update to v2020.02.04 https://github.com/linux-can/can-utils/releases/tag/v2020.02.04 This version is required to build against kernel > 5.2 While at it, drop redundant DESCRIPTION and branch=master Signed-off-by: Denys Dmytriyenko Signed-off-by: Khem Raj --- meta-oe/recipes-extended/socketcan/can-utils_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index e2609d4..5193688 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -1,17 +1,15 @@ SUMMARY = "Linux CAN network development utilities" -DESCRIPTION = "Linux CAN network development" LICENSE = "GPLv2 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61329e99f86fdd31" DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "665d8699ebe728bf48e63e8ae58d2482db72f954" +SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700" -PV = "0.0+gitr${SRCPV}" +PV = "2020.02.04" S = "${WORKDIR}/git" inherit autotools pkgconfig - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 05:34:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 05:34:42 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: cyrus-sasl: fix CVE-2019-19906 Message-ID: <158278168215.9229.5961002615077500506@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new b053bc7 cyrus-sasl: fix CVE-2019-19906 b053bc7 is described below commit b053bc79dd0302912c285e9bfdd3e79014c4d1bd Author: Changqing Li AuthorDate: Thu Feb 27 11:38:54 2020 +0800 cyrus-sasl: fix CVE-2019-19906 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch | 35 ++++++++++++++++++++++ .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 1 + 2 files changed, 36 insertions(+) diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch new file mode 100644 index 0000000..b94780f --- /dev/null +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch @@ -0,0 +1,35 @@ +From 94fe6eb9ea2691f4a7c32fbf2d0c7c454995b666 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 11:08:57 +0800 +Subject: [PATCH] Fix #587 + +Off by one error in common.c, CVE-2019-19906. + +Thanks to Stephan Zeisberg for reporting + +CVE: CVE-2019-19906 + +Upstream-Stauts: Backport [https://github.com/cyrusimap/cyrus-sasl +/commit/dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1] + +Signed-off-by: Changqing Li +--- + lib/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/common.c b/lib/common.c +index 305311d..445c5d5 100644 +--- a/lib/common.c ++++ b/lib/common.c +@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen, + + if (add==NULL) add = "(null)"; + +- addlen=strlen(add); /* only compute once */ ++ addlen=strlen(add)+1; /* only compute once */ + if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) + return SASL_NOMEM; + +-- +2.7.4 + diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index be7131d..d55dc4a 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https \ file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \ file://0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch \ file://0001-makeinit.sh-fix-parallel-build-issue.patch \ + file://CVE-2019-19906.patch \ " UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:10 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.A4EAE232B23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7eb657cb5f9271d5cf7a3a596ada05f5ed42297b Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:03 2020 +0100 xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 Release notes for 0.10.1 ======================== - Switch to 'locationforecast' product and use a more recent API version (bug #16268) - Fix invalid scrollbar index to add a label (bug #16023) - Update URLs from goodies.x.o to docs.x.o (bug #16182) - Fix build with panel 4.15 - Make build output less verbose - Use standard icon names (bug #16059) Translation Updates: Albanian, Croatian, Finnish, Galician, Greek, Portuguese, Slovak, Slovenian Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{xfce4-weather-plugin_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb similarity index 72% rename from meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb rename to meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb index 96c2048..ad9b6e9 100644 --- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb +++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "7ff4ab636f93addba0817bf6436d2964" -SRC_URI[sha256sum] = "4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572" +SRC_URI[md5sum] = "203ad16e74d4823f6fb6e9a18bb7df55" +SRC_URI[sha256sum] = "afb2af5f3effc2ea6181636ed0e82e6dafd556ec1b8478100802f85a5d167a89" FILES_${PN} += "${datadir}/xfce4/weather" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:11 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: gegl: upgrade 0.4.20 -> 0.4.22 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.B3544232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ad64f2e20d34b97150db7cfdf8805c49e2d6e7c1 Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:04 2020 +0100 gegl: upgrade 0.4.20 -> 0.4.22 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb similarity index 93% rename from meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb rename to meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb index 5e7a1bb..ca73e66 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb @@ -26,8 +26,8 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[md5sum] = "37433eb00f8a4b0d1ae9e975aaedfa26" -SRC_URI[sha256sum] = "23bd8bb42b20de7c2a8c314eeb5301dc20141feda20a4b1ed455020b69b73dff" +SRC_URI[md5sum] = "1776ac26792de0de3c3d680872e94b72" +SRC_URI[sha256sum] = "1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:12 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: gimp: upgrade 2.10.14 -> 2.10.18 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.C091C232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4f8ad4c4e52ec8cd53ee710334044a4d32a5d55d Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:05 2020 +0100 gimp: upgrade 2.10.14 -> 2.10.18 Release information can be found at [1] [1] https://www.gimp.org/news/2020/02/24/gimp-2-10-18-released/ Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb similarity index 91% rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb index 30f0579..838bd37 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb @@ -38,8 +38,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "a64f2be299755a2da130306cad9b1d26" -SRC_URI[sha256sum] = "df9b0f11c2078eea1de3ebc66529a5d3854c5e28636cd25a8dd077bd9d6ddc54" +SRC_URI[md5sum] = "096d04ffb2c4559cb2152f507ff31c9c" +SRC_URI[sha256sum] = "65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716" EXTRA_OECONF = "--disable-python \ --without-webkit \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:13 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: drbd-utils: upgrade 9.11.0 -> 9.12.0 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.CC0BF232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 82f2a99d479a9ce3b9178997f7404628a6271496 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:11 2020 -0800 drbd-utils: upgrade 9.11.0 -> 9.12.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../drbd/{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb similarity index 93% rename from meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb rename to meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb index 01bb16a..b83f68f 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb @@ -12,9 +12,9 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -# v9.11.0 -SRCREV_drbd-utils = "63092751e76e1fba397e53df4be5c1161b83a223" -SRCREV_drbd-headers = "d100ee01bf5aa8d5220767e4e35c4224faa8d865" +# v9.12.0 +SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052" +SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:09 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (b053bc7 -> bbe00c1) Message-ID: <158279100918.24664.1757268195624574573@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from b053bc7 cyrus-sasl: fix CVE-2019-19906 new 7eb657c xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 new ad64f2e gegl: upgrade 0.4.20 -> 0.4.22 new 4f8ad4c gimp: upgrade 2.10.14 -> 2.10.18 new 82f2a99 drbd-utils: upgrade 9.11.0 -> 9.12.0 new 9485acd iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 new 18cc7b6 openipmi: upgrade 2.0.27 -> 2.0.28 new 21b8119 rdma-core: upgrade 27.0 -> 28.0 new 13c0226 uftp: upgrade 4.10 -> 4.10.1 new 7ad8f93 flashrom: upgrade 1.1 -> 1.2 new 2ffc76e libev: upgrade 4.27 -> 4.31 new bbe00c1 libmbim: upgrade 1.20.4 -> 1.22.0 The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} | 4 +- .../gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} | 4 +- ...s_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} | 2 +- .../{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} | 6 +- ..._bmc_emu.c-include-readline.h-from-readli.patch | 31 --------- .../{openipmi_2.0.27.bb => openipmi_2.0.28.bb} | 5 +- ...0001-Remove-man-files-which-cant-be-built.patch | 11 +++- ...-Use-sched_yield-instead-of-pthread_yield.patch | 30 --------- .../{rdma-core_27.0.bb => rdma-core_28.0.bb} | 3 +- .../uftp/{uftp_4.10.bb => uftp_4.10.1.bb} | 4 +- .../flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} | 4 +- .../libev/{libev_4.27.bb => libev_4.31.bb} | 4 +- .../libmbim/libmbim/clang.patch | 73 ---------------------- .../{libmbim_1.20.4.bb => libmbim_1.22.0.bb} | 9 ++- ...in_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} | 4 +- 15 files changed, 33 insertions(+), 161 deletions(-) rename meta-gnome/recipes-gimp/gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} (93%) rename meta-gnome/recipes-gimp/gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} (91%) rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} (98%) rename meta-networking/recipes-support/drbd/{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} (93%) delete mode 100644 meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch rename meta-networking/recipes-support/openipmi/{openipmi_2.0.27.bb => openipmi_2.0.28.bb} (95%) delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch rename meta-networking/recipes-support/rdma-core/{rdma-core_27.0.bb => rdma-core_28.0.bb} (90%) rename meta-networking/recipes-support/uftp/{uftp_4.10.bb => uftp_4.10.1.bb} (77%) rename meta-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} (77%) rename meta-oe/recipes-connectivity/libev/{libev_4.27.bb => libev_4.31.bb} (80%) delete mode 100644 meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch rename meta-oe/recipes-connectivity/libmbim/{libmbim_1.20.4.bb => libmbim_1.22.0.bb} (76%) rename meta-xfce/recipes-panel-plugins/weather/{xfce4-weather-plugin_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} (72%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:14 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.D801B232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9485acd925f7cb99994950682aa3a1ced157ae3c Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:12 2020 -0800 iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...{iscsi-initiator-utils_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb similarity index 98% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb index b75e54b..97b5563 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "288add22d6b61cc68ede358faeec9affb15019cd" +SRCREV ?= "549f8987be49583bb06b117a364bea3a8fc5250c" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://initd.debian \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:17 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: uftp: upgrade 4.10 -> 4.10.1 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081010.071E6232C13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 13c02265f38c51149799de3b7d3efa2437c5d561 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:15 2020 -0800 uftp: upgrade 4.10 -> 4.10.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-support/uftp/{uftp_4.10.bb => uftp_4.10.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/uftp/uftp_4.10.bb b/meta-networking/recipes-support/uftp/uftp_4.10.1.bb similarity index 77% rename from meta-networking/recipes-support/uftp/uftp_4.10.bb rename to meta-networking/recipes-support/uftp/uftp_4.10.1.bb index 86c0c22..a70fd4d 100644 --- a/meta-networking/recipes-support/uftp/uftp_4.10.bb +++ b/meta-networking/recipes-support/uftp/uftp_4.10.1.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/" SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "df6407af3a0067b881431b3dad149ef3" -SRC_URI[sha256sum] = "91ba8aae80c7c9ccaf04600b628cbeca4699ed48268fe43d2bf539a41083f292" +SRC_URI[md5sum] = "a5c79c8e5a20d0646c9579fe1f339493" +SRC_URI[sha256sum] = "903353febf1b88f701198d956a60cec3d2be3cc251561a678061761aec6622f6" DEPENDS = "openssl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:18 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: flashrom: upgrade 1.1 -> 1.2 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081010.132DC233419@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7ad8f93106946137dff2daa7b005ddf242878660 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:16 2020 -0800 flashrom: upgrade 1.1 -> 1.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb similarity index 77% rename from meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb rename to meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 074a1a5..17445ac 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -7,8 +7,8 @@ DEPENDS = "pciutils libusb libusb-compat" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "91bab6c072e38a493bb4eb673e4fe0d6" -SRC_URI[sha256sum] = "aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19" +SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" +SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" S = "${WORKDIR}/flashrom-v${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:19 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: libev: upgrade 4.27 -> 4.31 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081010.1D6C023341A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2ffc76eff491fc6ec278fa5f9fa957025a59f91c Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:17 2020 -0800 libev: upgrade 4.27 -> 4.31 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libev/{libev_4.27.bb => libev_4.31.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-oe/recipes-connectivity/libev/libev_4.31.bb similarity index 80% rename from meta-oe/recipes-connectivity/libev/libev_4.27.bb rename to meta-oe/recipes-connectivity/libev/libev_4.31.bb index be4536b..beea855 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.31.bb @@ -5,8 +5,8 @@ LICENSE = "BSD-2-Clause | GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" -SRC_URI[md5sum] = "d38925fbc030153fe674c4e0e864a69a" -SRC_URI[sha256sum] = "2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e" +SRC_URI[md5sum] = "20111fda0df0a289c152faa2aac91b08" +SRC_URI[sha256sum] = "ed855d2b52118e32c0c1a6a32bd18c97f9e6711ca511f5ee12de3b9eccc66e5a" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:16 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: rdma-core: upgrade 27.0 -> 28.0 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.EE7DD232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 21b81193e735a634fbcc4325623b3158c8a6f317 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:14 2020 -0800 rdma-core: upgrade 27.0 -> 28.0 0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch removed because it is included in 28.0. refresh 0001-Remove-man-files-which-cant-be-built.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...0001-Remove-man-files-which-cant-be-built.patch | 11 +++++++- ...-Use-sched_yield-instead-of-pthread_yield.patch | 30 ---------------------- .../{rdma-core_27.0.bb => rdma-core_28.0.bb} | 3 +-- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index f1437a0..feed021 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -254,9 +254,10 @@ diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.t index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,72 +1,7 @@ +@@ -1,81 +1,7 @@ rdma_man_pages( - mlx5dv_alloc_dm.3.md +- mlx5dv_alloc_var.3.md - mlx5dv_create_cq.3.md - mlx5dv_create_flow.3.md - mlx5dv_create_flow_action_modify_header.3.md @@ -274,6 +275,7 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_devx_subscribe_devx_event.3.md - mlx5dv_devx_umem_reg.3.md - mlx5dv_dr_flow.3.md +- mlx5dv_dump.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 @@ -285,6 +287,7 @@ index 0bd9eba1..876b6fcf 100644 mlx5dv.7 ) -rdma_alias_man_pages( +- mlx5dv_alloc_var.3 mlx5dv_free_var.3 - mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 - mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 - mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 @@ -311,10 +314,12 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_modify_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 @@ -324,6 +329,10 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_domain.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_table.3 - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 -) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch deleted file mode 100644 index 80abd33..0000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6ac9562d756d42592994aeaac7a5e7b2bbce5cab Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 14 Dec 2019 14:07:57 -0800 -Subject: [PATCH] librdmacm: Use sched_yield instead of pthread_yield - -glibc redirects pthread_yield to sched_yield additionally we get it -working with musl on linux - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/635] -Signed-off-by: Khem Raj ---- - librdmacm/rsocket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/rsocket.c b/librdmacm/rsocket.c -index 89ae2139..7fc5b266 100644 ---- a/librdmacm/rsocket.c -+++ b/librdmacm/rsocket.c -@@ -3038,7 +3038,7 @@ static int rs_poll_enter(void) - pthread_mutex_lock(&mut); - if (suspendpoll) { - pthread_mutex_unlock(&mut); -- pthread_yield(); -+ sched_yield(); - return -EBUSY; - } - --- -2.24.1 - diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb similarity index 90% rename from meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb index 361d69b..15fd7ff 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb @@ -8,9 +8,8 @@ RDEPENDS_${PN} = "bash perl" BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ - file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \ " -SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" +SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:15 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: openipmi: upgrade 2.0.27 -> 2.0.28 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081009.E2BD5232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 18cc7b62bd5fb4c6d244ab78828ac1f345c9155c Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:13 2020 -0800 openipmi: upgrade 2.0.27 -> 2.0.28 ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch removed because it is included in 2.0.28. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ..._bmc_emu.c-include-readline.h-from-readli.patch | 31 ---------------------- .../{openipmi_2.0.27.bb => openipmi_2.0.28.bb} | 5 ++-- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch b/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch deleted file mode 100644 index e208de8..0000000 --- a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bebfb3c24582ec4e45d79c5b52135197bf7373da Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Fri, 14 Jun 2019 14:17:34 +0800 -Subject: [PATCH] ipmi_serial_bmc_emu.c: include readline.h from readline - -The libedit had been removed and swithed to readline. -We need to include readline.h from readline rather than editline. - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - sample/ipmi_serial_bmc_emu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index e0ae019..1b8bb9a 100644 ---- a/sample/ipmi_serial_bmc_emu.c -+++ b/sample/ipmi_serial_bmc_emu.c -@@ -42,7 +42,7 @@ - #include - #include - #include --#include -+#include - - #define _GNU_SOURCE - #include --- -2.7.4 - diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb similarity index 95% rename from meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb rename to meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb index 126b37f..f196eb9 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb @@ -29,15 +29,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ file://include_sys_types.patch \ - file://ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch \ file://openipmi-helper \ file://ipmi.service \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" -SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" +SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4" +SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996" inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 08:10:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 08:10:20 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: libmbim: upgrade 1.20.4 -> 1.22.0 In-Reply-To: <158279100918.24664.1757268195624574573@git.openembedded.org> References: <158279100918.24664.1757268195624574573@git.openembedded.org> Message-ID: <20200227081010.26DFD23341B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bbe00c1184ed31effcde4d32bd781e7ad143c597 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:18 2020 -0800 libmbim: upgrade 1.20.4 -> 1.22.0 clang.patch Revemod since the file of this patch is non-existent. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libmbim/libmbim/clang.patch | 73 ---------------------- .../{libmbim_1.20.4.bb => libmbim_1.22.0.bb} | 9 ++- 2 files changed, 4 insertions(+), 78 deletions(-) diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch b/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch deleted file mode 100644 index d885784..0000000 --- a/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch +++ /dev/null @@ -1,73 +0,0 @@ -Check for clang compiler since we need to disable -unused-function warning for clang, at same time -pass werror when checking for compiler options if -werror is enabled so spurious options do not get -enabled. Only the ones that are supported by given -compiler are accepted. - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: libmbim-1.14.0/m4/compiler-warnings.m4 -=================================================================== ---- libmbim-1.14.0.orig/m4/compiler-warnings.m4 -+++ libmbim-1.14.0/m4/compiler-warnings.m4 -@@ -2,10 +2,30 @@ AC_DEFUN([LIBMBIM_COMPILER_WARNINGS], - [AC_ARG_ENABLE(more-warnings, - AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), - set_more_warnings="$enableval",set_more_warnings=error) -+ -+# Clang throws a lot of warnings when it does not understand a flag. Disable -+# this warning for now so other warnings are visible. -+AC_MSG_CHECKING([if compiling with clang]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ -+#ifndef __clang__ -+ not clang -+#endif -+ ]])], -+ [CLANG=yes], -+ [CLANG=no] -+) -+AC_MSG_RESULT([$CLANG]) -+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) -+CFLAGS="$CFLAGS $CLANG_FLAGS" -+LDFLAGS="$LDFLAGS $CLANG_FLAGS" -+ - AC_MSG_CHECKING(for more warnings) - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -std=gnu89 $CFLAGS" -+ if test "x$set_more_warnings" = xerror; then -+ WERROR="-Werror" -+ fi - - for option in -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wstrict-prototypes \ -@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_war - -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security -Wtype-limits; do - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -+ CFLAGS="$CFLAGS $option $WERROR" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" -+ else -+ CFLAGS="$SAVE_CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done -+ CFLAGS="$CFLAGS $WERROR" - unset option -- if test "x$set_more_warnings" = xerror; then -- CFLAGS="$CFLAGS -Werror" -- fi -+ unset WERROR - else - AC_MSG_RESULT(no) - fi diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb similarity index 76% rename from meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb rename to meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb index a3ef80c..61e314f 100644 --- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb +++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb @@ -11,8 +11,7 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit autotools pkgconfig bash-completion -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://clang.patch \ -" -SRC_URI[md5sum] = "d38d637e33cde8a91484f53a9f6c4d49" -SRC_URI[sha256sum] = "ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "87060e8957013177e4140edc6f64f5bd" +SRC_URI[sha256sum] = "5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:13 +0000 Subject: [oe-commits] [meta-openembedded] 02/19: libharu: New recipe In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152111.99496232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c208135915e7c0f68f4fa8486dbc2f39b0689dd7 Author: Zheng Ruoqin AuthorDate: Wed Feb 26 23:10:00 2020 +0800 libharu: New recipe libHaru is a library for generating PDF files. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 23 ++++++++++ 2 files changed, 75 insertions(+) diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch new file mode 100644 index 0000000..332be1b --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch @@ -0,0 +1,52 @@ +Backport from Fedora Project. +https://src.fedoraproject.org/rpms/libharu + +Fix the install destination of some files. + +Upstream-Status: inappropriate + +Signed-off-by: Zheng Ruoqin + +diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt +--- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 +@@ -25,7 +25,7 @@ endif(MSVC) + + # information about libharu + set(LIBHPDF_MAJOR 2) +-set(LIBHPDF_MINOR 2) ++set(LIBHPDF_MINOR 3) + set(LIBHPDF_PATCH 0) + set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) + set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") +@@ -210,9 +210,9 @@ set( + install(FILES ${haru_HDRS} DESTINATION include) + + # install various files +-install(FILES README CHANGES INSTALL DESTINATION .) ++install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + if(NOT DEVPAK) +- install(DIRECTORY if DESTINATION .) ++ install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + endif(NOT DEVPAK) + if(DEVPAK) + install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) +diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt +--- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 +@@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) + target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) + if(WIN32 AND NOT CYGWIN) + set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ else(WIN32 AND NOT CYGWIN) ++ set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) + endif(WIN32 AND NOT CYGWIN) + install( + TARGETS ${LIBHPDF_NAME} +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ) + endif(LIBHPDF_SHARED) diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb new file mode 100644 index 0000000..2d1a37c --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" + +SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ + file://libharu-RELEASE_2_3_0_cmake.patch \ + " + +SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" + +S = "${WORKDIR}/git" + +inherit cmake +DEPENDS += "libpng zlib" + +do_install_append() { + mkdir -p ${D}/${datadir}/libharu + mv ${D}/libharu ${D}/${datadir} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:14 +0000 Subject: [oe-commits] [meta-openembedded] 03/19: ttf-noto-emoji: add recipe In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152111.AA6D9232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2ef07609cdd4b7f4acb6f70790e85641603ded57 Author: Matt Ranostay AuthorDate: Wed Feb 26 23:21:37 2020 +0200 ttf-noto-emoji: add recipe Add both B/W and color emojis fonts from the noto-emoji project. Important note for the color emojis to render the pixmap PACKAGECONFIG option needs to be set in freetype package. Signed-off-by: Matt Ranostay Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 1 + .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index a93d239..8ad21d6 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -72,6 +72,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-liberation-sans-narrow->fontconfig \ ttf-lklug->fontconfig \ ttf-lohit->fontconfig \ + ttf-noto-emoji->fontconfig \ ttf-pt-sans->fontconfig \ ttf-roboto->fontconfig \ ttf-mplus->fontconfig \ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb new file mode 100644 index 0000000..e74f7a7 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb @@ -0,0 +1,19 @@ +require ttf.inc + +SUMMARY = "Google noto emoji font pack" +HOMEPAGE = "https://github.com/googlefonts/noto-emoji" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" + +SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" +SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" + +PACKAGES = "${PN}-color ${PN}-regular" +FONT_PACKAGES = "${PN}-color ${PN}-regular" + +S = "${WORKDIR}/git" + +FILES_${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf" +FILES_${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf" + +do_compile[noexec] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:15 +0000 Subject: [oe-commits] [meta-openembedded] 04/19: upm: Update SRC_URI In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152111.BCA28232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 546c4f0e2b2266b9d1722e7d69dcb00f48566a35 Author: Propanu AuthorDate: Wed Feb 26 12:49:54 2020 -0800 upm: Update SRC_URI Updating SRC_URI to reflect project move to Eclipse Foundation. Signed-off-by: Khem Raj --- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 6db8f88..c851c93 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:11 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (bbe00c1 -> 90563a1) Message-ID: <158281687102.9623.7452330935752718301@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard bbe00c1 libmbim: upgrade 1.20.4 -> 1.22.0 discard 2ffc76e libev: upgrade 4.27 -> 4.31 discard 7ad8f93 flashrom: upgrade 1.1 -> 1.2 discard 13c0226 uftp: upgrade 4.10 -> 4.10.1 discard 21b8119 rdma-core: upgrade 27.0 -> 28.0 discard 18cc7b6 openipmi: upgrade 2.0.27 -> 2.0.28 discard 9485acd iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 discard 82f2a99 drbd-utils: upgrade 9.11.0 -> 9.12.0 discard 4f8ad4c gimp: upgrade 2.10.14 -> 2.10.18 discard ad64f2e gegl: upgrade 0.4.20 -> 0.4.22 discard 7eb657c xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 discard b053bc7 cyrus-sasl: fix CVE-2019-19906 discard 80fae64 can-utils: update to v2020.02.04 discard 1c00c81 open-lldp: Add initial version 1.0.1 discard 5658a96 upm: Update SRC_URI discard c0dd1bd ttf-noto-emoji: add recipe discard 8972d17 libharu: New recipe discard 085bfb6 luajit: Upgrade to 2.1.0-beta3 discard a7881c9 ser2net: upgrade 3.5.1 -> 4.1.2 discard cc6075b gensio: new package new 262abba luajit: Upgrade to 2.1.0-beta3 new c208135 libharu: New recipe new 2ef0760 ttf-noto-emoji: add recipe new 546c4f0 upm: Update SRC_URI new a341d0e open-lldp: Add initial version 1.0.1 new 7e8ada8 can-utils: update to v2020.02.04 new 1c282d0 cyrus-sasl: fix CVE-2019-19906 new 8376da7 xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 new 99a0779 gegl: upgrade 0.4.20 -> 0.4.22 new 38c4df5 gimp: upgrade 2.10.14 -> 2.10.18 new 88ccf6b drbd-utils: upgrade 9.11.0 -> 9.12.0 new 54f391e iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 new 76fd951 openipmi: upgrade 2.0.27 -> 2.0.28 new 04c4051 rdma-core: upgrade 27.0 -> 28.0 new 11f87a9 uftp: upgrade 4.10 -> 4.10.1 new f265cee libev: upgrade 4.27 -> 4.31 new 1e981c5 libmbim: upgrade 1.20.4 -> 1.22.0 new 514831c cpprest: update to 2.10.15 and refresh patches new 90563a1 boinc: update recipe to version 7.16.5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bbe00c1) \ N -- N -- N refs/heads/master-next (90563a1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../flashrom/{flashrom_1.2.bb => flashrom_1.1.bb} | 4 +- ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 --------------------- .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ------ .../ser2net/{ser2net_4.1.2.bb => ser2net_3.5.1.bb} | 6 +- .../recipes-extended/boinc/boinc-client_7.16.bb | 2 +- .../cpprest/cpprest/disable-outside-tests.patch | 43 ++------ .../{cpprest_2.10.14.bb => cpprest_2.10.15.bb} | 4 +- 7 files changed, 13 insertions(+), 181 deletions(-) rename meta-oe/recipes-bsp/flashrom/{flashrom_1.2.bb => flashrom_1.1.bb} (77%) delete mode 100644 meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch delete mode 100644 meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb rename meta-oe/recipes-connectivity/ser2net/{ser2net_4.1.2.bb => ser2net_3.5.1.bb} (67%) rename meta-oe/recipes-support/cpprest/{cpprest_2.10.14.bb => cpprest_2.10.15.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:12 +0000 Subject: [oe-commits] [meta-openembedded] 01/19: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152111.86035232B23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 262abbaaa6687dbe5444afec5a64ab0ba8dfb808 Author: Leo Yan AuthorDate: Wed Feb 26 12:26:22 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded at 436 with fuzz 1 (offset 123 lines)." Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 4 ++-- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch index c39ef6f..807cc44 100644 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h =================================================================== --- LuaJIT-2.0.5.orig/src/lj_arch.h +++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" +@@ -436,7 +436,7 @@ + #endif #endif #elif !LJ_TARGET_PS3 -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 90% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..2a72438 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:17 +0000 Subject: [oe-commits] [meta-openembedded] 06/19: can-utils: update to v2020.02.04 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152111.DAF8B232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7e8ada842115dedb147381377bf6fc1f1eed7a7e Author: Denys Dmytriyenko AuthorDate: Wed Feb 26 20:49:21 2020 -0500 can-utils: update to v2020.02.04 https://github.com/linux-can/can-utils/releases/tag/v2020.02.04 This version is required to build against kernel > 5.2 While at it, drop redundant DESCRIPTION and branch=master Signed-off-by: Denys Dmytriyenko Signed-off-by: Khem Raj --- meta-oe/recipes-extended/socketcan/can-utils_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index e2609d4..5193688 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -1,17 +1,15 @@ SUMMARY = "Linux CAN network development utilities" -DESCRIPTION = "Linux CAN network development" LICENSE = "GPLv2 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61329e99f86fdd31" DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "665d8699ebe728bf48e63e8ae58d2482db72f954" +SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700" -PV = "0.0+gitr${SRCPV}" +PV = "2020.02.04" S = "${WORKDIR}/git" inherit autotools pkgconfig - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:19 +0000 Subject: [oe-commits] [meta-openembedded] 08/19: xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.233C7232C13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8376da7ccf3f695a8af384eec80f3825b4b52b9e Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:03 2020 +0100 xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 Release notes for 0.10.1 ======================== - Switch to 'locationforecast' product and use a more recent API version (bug #16268) - Fix invalid scrollbar index to add a label (bug #16023) - Update URLs from goodies.x.o to docs.x.o (bug #16182) - Fix build with panel 4.15 - Make build output less verbose - Use standard icon names (bug #16059) Translation Updates: Albanian, Croatian, Finnish, Galician, Greek, Portuguese, Slovak, Slovenian Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{xfce4-weather-plugin_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb similarity index 72% rename from meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb rename to meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb index 96c2048..ad9b6e9 100644 --- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb +++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "7ff4ab636f93addba0817bf6436d2964" -SRC_URI[sha256sum] = "4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572" +SRC_URI[md5sum] = "203ad16e74d4823f6fb6e9a18bb7df55" +SRC_URI[sha256sum] = "afb2af5f3effc2ea6181636ed0e82e6dafd556ec1b8478100802f85a5d167a89" FILES_${PN} += "${datadir}/xfce4/weather" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:20 +0000 Subject: [oe-commits] [meta-openembedded] 09/19: gegl: upgrade 0.4.20 -> 0.4.22 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.343B7233419@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 99a0779ab1c3073e0ae82524eda9ffcc3087b6e7 Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:04 2020 +0100 gegl: upgrade 0.4.20 -> 0.4.22 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb similarity index 93% rename from meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb rename to meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb index 5e7a1bb..ca73e66 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb @@ -26,8 +26,8 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[md5sum] = "37433eb00f8a4b0d1ae9e975aaedfa26" -SRC_URI[sha256sum] = "23bd8bb42b20de7c2a8c314eeb5301dc20141feda20a4b1ed455020b69b73dff" +SRC_URI[md5sum] = "1776ac26792de0de3c3d680872e94b72" +SRC_URI[sha256sum] = "1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:18 +0000 Subject: [oe-commits] [meta-openembedded] 07/19: cyrus-sasl: fix CVE-2019-19906 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.070C2232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1c282d0150e59eacf08b0a3676842e96d9a5f92e Author: Changqing Li AuthorDate: Thu Feb 27 11:38:54 2020 +0800 cyrus-sasl: fix CVE-2019-19906 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch | 35 ++++++++++++++++++++++ .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 1 + 2 files changed, 36 insertions(+) diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch new file mode 100644 index 0000000..b94780f --- /dev/null +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch @@ -0,0 +1,35 @@ +From 94fe6eb9ea2691f4a7c32fbf2d0c7c454995b666 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 11:08:57 +0800 +Subject: [PATCH] Fix #587 + +Off by one error in common.c, CVE-2019-19906. + +Thanks to Stephan Zeisberg for reporting + +CVE: CVE-2019-19906 + +Upstream-Stauts: Backport [https://github.com/cyrusimap/cyrus-sasl +/commit/dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1] + +Signed-off-by: Changqing Li +--- + lib/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/common.c b/lib/common.c +index 305311d..445c5d5 100644 +--- a/lib/common.c ++++ b/lib/common.c +@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen, + + if (add==NULL) add = "(null)"; + +- addlen=strlen(add); /* only compute once */ ++ addlen=strlen(add)+1; /* only compute once */ + if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) + return SASL_NOMEM; + +-- +2.7.4 + diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index be7131d..d55dc4a 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https \ file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \ file://0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch \ file://0001-makeinit.sh-fix-parallel-build-issue.patch \ + file://CVE-2019-19906.patch \ " UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:21 +0000 Subject: [oe-commits] [meta-openembedded] 10/19: gimp: upgrade 2.10.14 -> 2.10.18 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.47EF9232B22@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 38c4df5481df145fe7fbec49762d19da91efdfb2 Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:05 2020 +0100 gimp: upgrade 2.10.14 -> 2.10.18 Release information can be found at [1] [1] https://www.gimp.org/news/2020/02/24/gimp-2-10-18-released/ Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb similarity index 91% rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb index 30f0579..838bd37 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb @@ -38,8 +38,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "a64f2be299755a2da130306cad9b1d26" -SRC_URI[sha256sum] = "df9b0f11c2078eea1de3ebc66529a5d3854c5e28636cd25a8dd077bd9d6ddc54" +SRC_URI[md5sum] = "096d04ffb2c4559cb2152f507ff31c9c" +SRC_URI[sha256sum] = "65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716" EXTRA_OECONF = "--disable-python \ --without-webkit \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:16 +0000 Subject: [oe-commits] [meta-openembedded] 05/19: open-lldp: Add initial version 1.0.1 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152111.CD9DC232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a341d0e3cf7f7d93c240c6e8e489d9a585d08f97 Author: Jonathan Richardson AuthorDate: Wed Feb 26 16:32:40 2020 -0800 open-lldp: Add initial version 1.0.1 Open-LLDP provides a Link Layer Discovery Protocol agent that supports DCB (Data Center Bridging). The tc utility from iproute is needed to manipulate traffic control settings in the kernel. Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- .../files/0001-Fix-musl-libc-build-issue.patch | 26 ++++++++++ ...s-Add-include-path-to-generated-version.h.patch | 29 +++++++++++ ...dd-option-to-disable-installation-of-syst.patch | 57 ++++++++++++++++++++++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 33 +++++++++++++ 4 files changed, 145 insertions(+) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch new file mode 100644 index 0000000..40b082e --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch @@ -0,0 +1,26 @@ +From a64e52f9b58519aa2b8a1073fa6c04da04933428 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Wed, 26 Feb 2020 12:16:38 -0800 +Subject: [PATCH] Fix musl libc build issue + +clif.h should include sys/types.h for the definition of pid_t. It fails +to compile when using musl libc. + +Signed-off-by: Jonathan Richardson + +--- + include/clif.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/clif.h b/include/clif.h +index 648eedf..92f4fd8 100644 +--- a/include/clif.h ++++ b/include/clif.h +@@ -32,6 +32,7 @@ + #ifndef CLIF_H + #define CLIF_H + ++#include + #include + #include "clif_sock.h" + diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch new file mode 100644 index 0000000..b58fc10 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch @@ -0,0 +1,29 @@ +From eb14aa66dc0384071af401cced8c02993b55502e Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Wed, 26 Feb 2020 15:54:51 -0800 +Subject: [PATCH] autotools: Add include path to generated version.h + +When the build dir isn't the same as source dir it fails to compile +because the generated version.h from AC_CONFIG_FILES is always in build +dir. Include the path to it in AM_CPPFLAGS. + +Signed-off-by: Jonathan Richardson + +--- + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0fb9bb0..2952019 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,6 +14,9 @@ endif + AM_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR="\"${sysconfdir}\"" \ + -D_FORTIFY_SOURCE=2 + ++# Required for the generated version.h when build dir is not the same as srcdir. ++AM_CPPFLAGS += -I${top_builddir}/include ++ + ACLOCAL_AMFLAGS = -I m4 + + parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch new file mode 100644 index 0000000..a26a529 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch @@ -0,0 +1,57 @@ +From dc3f2250908587710f109c80ddf8a94f0bc40b82 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Fri, 6 Apr 2018 10:49:04 -0700 +Subject: [PATCH] autotools: Add option to disable installation of systemd conf + files + +Add option to configure.ac to enable or disable install of systemd conf +files. If --with-systemdsystemunitdir is passed to configure then the +files will be installed to the provided directory. If the option isn't +provided then the value is determined from the systemd pkgconfig file, +if found in PKG_CONFIG_PATH. + +This change is required because Makefile.am always installed the files +to a hard coded path that couldn't be changed. + + +Signed-off-by: Jonathan Richardson +--- + Makefile.am | 3 ++- + configure.ac | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 292c0fd..0fb9bb0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -138,8 +138,9 @@ install-data-hook: installdirs-local + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = lldpad.pc liblldp_clif.pc + +-systemdsystemunitdir = $(prefix)/lib/systemd/system ++if HAVE_SYSTEMD + dist_systemdsystemunit_DATA = lldpad.service lldpad.socket ++endif + + bashcompletiondir = $(sysconfdir)/bash_completion.d + dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool +diff --git a/configure.ac b/configure.ac +index 0667446..f75f433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,15 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT8_T + ++# Support for systemd unit files. ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_CONFIG_FILES([Makefile include/version.h lldpad.spec lldpad.pc liblldp_clif.pc]) + AC_CONFIG_MACRO_DIR([m4]) + AC_OUTPUT diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb new file mode 100644 index 0000000..5fbf064 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "Open-LLDP" +DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" +HOMEPAGE = "http://open-lldp.org/start" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} + +DEPENDS = "libnl libconfig readline" + +SRCREV = "36d729de7ce5b56cf061d94d610cf0510154820c" +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master \ + file://0001-Fix-musl-libc-build-issue.patch \ + file://0001-autotools-Add-include-path-to-generated-version.h.patch \ + file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ + " + +# Makefile.am adds -Werror to AM_CFLAGS. There are warnings so disable it. +TARGET_CFLAGS += "-Wno-error" + +# Enable install of systemd conf files. +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" + +SYSTEMD_SERVICE_${PN} = "lldpad.service lldpad.socket" + +# To enable service at boot set to enable in local.conf. +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS_${PN} = "iproute2-tc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:22 +0000 Subject: [oe-commits] [meta-openembedded] 11/19: drbd-utils: upgrade 9.11.0 -> 9.12.0 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.5FA16232B23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 88ccf6b15e9e0b66b3c7e454cda56f7185c04690 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:11 2020 -0800 drbd-utils: upgrade 9.11.0 -> 9.12.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../drbd/{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb similarity index 93% rename from meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb rename to meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb index 01bb16a..b83f68f 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb @@ -12,9 +12,9 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -# v9.11.0 -SRCREV_drbd-utils = "63092751e76e1fba397e53df4be5c1161b83a223" -SRCREV_drbd-headers = "d100ee01bf5aa8d5220767e4e35c4224faa8d865" +# v9.12.0 +SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052" +SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:23 +0000 Subject: [oe-commits] [meta-openembedded] 12/19: iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.6D32B232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 54f391eb03d4c668c13cbcee456548bc5edc9026 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:12 2020 -0800 iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...{iscsi-initiator-utils_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb similarity index 98% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb index b75e54b..97b5563 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "288add22d6b61cc68ede358faeec9affb15019cd" +SRCREV ?= "549f8987be49583bb06b117a364bea3a8fc5250c" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://initd.debian \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:26 +0000 Subject: [oe-commits] [meta-openembedded] 15/19: uftp: upgrade 4.10 -> 4.10.1 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.9449323341A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 11f87a95bda53bd3a653d79bd16379ab7980110b Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:15 2020 -0800 uftp: upgrade 4.10 -> 4.10.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-support/uftp/{uftp_4.10.bb => uftp_4.10.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/uftp/uftp_4.10.bb b/meta-networking/recipes-support/uftp/uftp_4.10.1.bb similarity index 77% rename from meta-networking/recipes-support/uftp/uftp_4.10.bb rename to meta-networking/recipes-support/uftp/uftp_4.10.1.bb index 86c0c22..a70fd4d 100644 --- a/meta-networking/recipes-support/uftp/uftp_4.10.bb +++ b/meta-networking/recipes-support/uftp/uftp_4.10.1.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/" SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "df6407af3a0067b881431b3dad149ef3" -SRC_URI[sha256sum] = "91ba8aae80c7c9ccaf04600b628cbeca4699ed48268fe43d2bf539a41083f292" +SRC_URI[md5sum] = "a5c79c8e5a20d0646c9579fe1f339493" +SRC_URI[sha256sum] = "903353febf1b88f701198d956a60cec3d2be3cc251561a678061761aec6622f6" DEPENDS = "openssl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:27 +0000 Subject: [oe-commits] [meta-openembedded] 16/19: libev: upgrade 4.27 -> 4.31 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.9F3CC23341B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f265cee7fc8f3b810657b5644de5cd7a72b15b7f Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:17 2020 -0800 libev: upgrade 4.27 -> 4.31 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libev/{libev_4.27.bb => libev_4.31.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-oe/recipes-connectivity/libev/libev_4.31.bb similarity index 80% rename from meta-oe/recipes-connectivity/libev/libev_4.27.bb rename to meta-oe/recipes-connectivity/libev/libev_4.31.bb index be4536b..beea855 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.31.bb @@ -5,8 +5,8 @@ LICENSE = "BSD-2-Clause | GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" -SRC_URI[md5sum] = "d38925fbc030153fe674c4e0e864a69a" -SRC_URI[sha256sum] = "2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e" +SRC_URI[md5sum] = "20111fda0df0a289c152faa2aac91b08" +SRC_URI[sha256sum] = "ed855d2b52118e32c0c1a6a32bd18c97f9e6711ca511f5ee12de3b9eccc66e5a" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:24 +0000 Subject: [oe-commits] [meta-openembedded] 13/19: openipmi: upgrade 2.0.27 -> 2.0.28 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.7A68A232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 76fd951ae043abc4dd682804686585e4bd475110 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:13 2020 -0800 openipmi: upgrade 2.0.27 -> 2.0.28 ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch removed because it is included in 2.0.28. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ..._bmc_emu.c-include-readline.h-from-readli.patch | 31 ---------------------- .../{openipmi_2.0.27.bb => openipmi_2.0.28.bb} | 5 ++-- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch b/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch deleted file mode 100644 index e208de8..0000000 --- a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bebfb3c24582ec4e45d79c5b52135197bf7373da Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Fri, 14 Jun 2019 14:17:34 +0800 -Subject: [PATCH] ipmi_serial_bmc_emu.c: include readline.h from readline - -The libedit had been removed and swithed to readline. -We need to include readline.h from readline rather than editline. - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - sample/ipmi_serial_bmc_emu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index e0ae019..1b8bb9a 100644 ---- a/sample/ipmi_serial_bmc_emu.c -+++ b/sample/ipmi_serial_bmc_emu.c -@@ -42,7 +42,7 @@ - #include - #include - #include --#include -+#include - - #define _GNU_SOURCE - #include --- -2.7.4 - diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb similarity index 95% rename from meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb rename to meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb index 126b37f..f196eb9 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb @@ -29,15 +29,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ file://include_sys_types.patch \ - file://ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch \ file://openipmi-helper \ file://ipmi.service \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" -SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" +SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4" +SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996" inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:28 +0000 Subject: [oe-commits] [meta-openembedded] 17/19: libmbim: upgrade 1.20.4 -> 1.22.0 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.AB9AA23341C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1e981c5938eecc2f1d5a44e45e926fe495b46c19 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:18 2020 -0800 libmbim: upgrade 1.20.4 -> 1.22.0 clang.patch Revemod since the file of this patch is non-existent. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libmbim/libmbim/clang.patch | 73 ---------------------- .../{libmbim_1.20.4.bb => libmbim_1.22.0.bb} | 9 ++- 2 files changed, 4 insertions(+), 78 deletions(-) diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch b/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch deleted file mode 100644 index d885784..0000000 --- a/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch +++ /dev/null @@ -1,73 +0,0 @@ -Check for clang compiler since we need to disable -unused-function warning for clang, at same time -pass werror when checking for compiler options if -werror is enabled so spurious options do not get -enabled. Only the ones that are supported by given -compiler are accepted. - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: libmbim-1.14.0/m4/compiler-warnings.m4 -=================================================================== ---- libmbim-1.14.0.orig/m4/compiler-warnings.m4 -+++ libmbim-1.14.0/m4/compiler-warnings.m4 -@@ -2,10 +2,30 @@ AC_DEFUN([LIBMBIM_COMPILER_WARNINGS], - [AC_ARG_ENABLE(more-warnings, - AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), - set_more_warnings="$enableval",set_more_warnings=error) -+ -+# Clang throws a lot of warnings when it does not understand a flag. Disable -+# this warning for now so other warnings are visible. -+AC_MSG_CHECKING([if compiling with clang]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ -+#ifndef __clang__ -+ not clang -+#endif -+ ]])], -+ [CLANG=yes], -+ [CLANG=no] -+) -+AC_MSG_RESULT([$CLANG]) -+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) -+CFLAGS="$CFLAGS $CLANG_FLAGS" -+LDFLAGS="$LDFLAGS $CLANG_FLAGS" -+ - AC_MSG_CHECKING(for more warnings) - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -std=gnu89 $CFLAGS" -+ if test "x$set_more_warnings" = xerror; then -+ WERROR="-Werror" -+ fi - - for option in -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wstrict-prototypes \ -@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_war - -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security -Wtype-limits; do - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -+ CFLAGS="$CFLAGS $option $WERROR" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" -+ else -+ CFLAGS="$SAVE_CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done -+ CFLAGS="$CFLAGS $WERROR" - unset option -- if test "x$set_more_warnings" = xerror; then -- CFLAGS="$CFLAGS -Werror" -- fi -+ unset WERROR - else - AC_MSG_RESULT(no) - fi diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb similarity index 76% rename from meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb rename to meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb index a3ef80c..61e314f 100644 --- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb +++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb @@ -11,8 +11,7 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit autotools pkgconfig bash-completion -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://clang.patch \ -" -SRC_URI[md5sum] = "d38d637e33cde8a91484f53a9f6c4d49" -SRC_URI[sha256sum] = "ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "87060e8957013177e4140edc6f64f5bd" +SRC_URI[sha256sum] = "5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:29 +0000 Subject: [oe-commits] [meta-openembedded] 18/19: cpprest: update to 2.10.15 and refresh patches In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.B8100232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 514831c838b7519353e8eb9cada29fecb9bac605 Author: Gianfranco Costamagna AuthorDate: Thu Feb 27 15:37:25 2020 +0100 cpprest: update to 2.10.15 and refresh patches Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../cpprest/cpprest/disable-outside-tests.patch | 43 +++------------------- .../{cpprest_2.10.14.bb => cpprest_2.10.15.bb} | 4 +- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index 5232e2a..e108e02 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -54,7 +54,7 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c =================================================================== --- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp +++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -93,6 +93,7 @@ +@@ -93,6 +93,7 @@ SUITE(authentication_tests) return false; } @@ -62,46 +62,15 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c TEST(ssl_test) { websocket_client client; -@@ -127,6 +128,7 @@ +@@ -127,6 +128,7 @@ SUITE(authentication_tests) throw; } } + */ - // These tests are specific to our websocketpp based implementation. - #if !defined(__cplusplus_winrt) -@@ -159,12 +161,14 @@ - } - } - -+ /* - // Test specifically for server SignalR team hit interesting cases with. - TEST(sni_with_older_server_test) - { - websocket_client client; - sni_test_impl(client); - } -+ */ - - // WinRT doesn't expose option for disabling. - // No stable server is available to reliably test this. -@@ -194,6 +198,7 @@ - } - } - -+ /* - // Winrt doesn't allow explicitly setting server host for SNI. - TEST(sni_explicit_hostname) - { -@@ -204,6 +209,7 @@ - websocket_client client(config); - sni_test_impl(client); - } -+ */ - void handshake_error_test_impl(const ::utility::string_t& host) { -@@ -225,11 +231,11 @@ +@@ -148,11 +150,11 @@ SUITE(authentication_tests) } } @@ -114,13 +83,13 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c - TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } + //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } - #endif + } // SUITE(authentication_tests) Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp =================================================================== --- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp +++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -406,6 +406,7 @@ +@@ -408,6 +408,7 @@ } #endif @@ -128,7 +97,7 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp // Try to connect to a server on a closed port and cancel the operation. TEST_FIXTURE(uri_address, cancel_bad_port) { -@@ -437,6 +438,7 @@ +@@ -439,6 +440,7 @@ VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); } diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb similarity index 91% rename from meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb rename to meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb index 11c8eab..dee5ae2 100644 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb @@ -11,8 +11,8 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.14 -SRCREV= "6f602bee67b088a299d7901534af3bce6334ab38" +# tag 2.10.15 +SRCREV= "b94bc32ff84e815ba44c567f6fe4af5f5f6b3048" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:25 +0000 Subject: [oe-commits] [meta-openembedded] 14/19: rdma-core: upgrade 27.0 -> 28.0 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.878AE232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 04c40510eb6b2ef4e71ccbf82a661bbc168756b1 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:14 2020 -0800 rdma-core: upgrade 27.0 -> 28.0 0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch removed because it is included in 28.0. refresh 0001-Remove-man-files-which-cant-be-built.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...0001-Remove-man-files-which-cant-be-built.patch | 11 +++++++- ...-Use-sched_yield-instead-of-pthread_yield.patch | 30 ---------------------- .../{rdma-core_27.0.bb => rdma-core_28.0.bb} | 3 +-- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index f1437a0..feed021 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -254,9 +254,10 @@ diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.t index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,72 +1,7 @@ +@@ -1,81 +1,7 @@ rdma_man_pages( - mlx5dv_alloc_dm.3.md +- mlx5dv_alloc_var.3.md - mlx5dv_create_cq.3.md - mlx5dv_create_flow.3.md - mlx5dv_create_flow_action_modify_header.3.md @@ -274,6 +275,7 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_devx_subscribe_devx_event.3.md - mlx5dv_devx_umem_reg.3.md - mlx5dv_dr_flow.3.md +- mlx5dv_dump.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 @@ -285,6 +287,7 @@ index 0bd9eba1..876b6fcf 100644 mlx5dv.7 ) -rdma_alias_man_pages( +- mlx5dv_alloc_var.3 mlx5dv_free_var.3 - mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 - mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 - mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 @@ -311,10 +314,12 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_modify_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 @@ -324,6 +329,10 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_domain.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_table.3 - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 -) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch deleted file mode 100644 index 80abd33..0000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6ac9562d756d42592994aeaac7a5e7b2bbce5cab Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 14 Dec 2019 14:07:57 -0800 -Subject: [PATCH] librdmacm: Use sched_yield instead of pthread_yield - -glibc redirects pthread_yield to sched_yield additionally we get it -working with musl on linux - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/635] -Signed-off-by: Khem Raj ---- - librdmacm/rsocket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/rsocket.c b/librdmacm/rsocket.c -index 89ae2139..7fc5b266 100644 ---- a/librdmacm/rsocket.c -+++ b/librdmacm/rsocket.c -@@ -3038,7 +3038,7 @@ static int rs_poll_enter(void) - pthread_mutex_lock(&mut); - if (suspendpoll) { - pthread_mutex_unlock(&mut); -- pthread_yield(); -+ sched_yield(); - return -EBUSY; - } - --- -2.24.1 - diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb similarity index 90% rename from meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb index 361d69b..15fd7ff 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb @@ -8,9 +8,8 @@ RDEPENDS_${PN} = "bash perl" BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ - file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \ " -SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" +SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 15:21:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 15:21:30 +0000 Subject: [oe-commits] [meta-openembedded] 19/19: boinc: update recipe to version 7.16.5 In-Reply-To: <158281687102.9623.7452330935752718301@git.openembedded.org> References: <158281687102.9623.7452330935752718301@git.openembedded.org> Message-ID: <20200227152112.C2BC6232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 90563a1a162311043f0a03c1ed1ff6a6b201eb08 Author: Gianfranco Costamagna AuthorDate: Thu Feb 27 15:37:26 2020 +0100 boinc: update recipe to version 7.16.5 Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- meta-oe/recipes-extended/boinc/boinc-client_7.16.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb index c528280..db90f06 100644 --- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb +++ b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb @@ -29,7 +29,7 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "bc3269f77f570ea0ffd31766ed83846ebb043938" +SRCREV = "e0e033af9fca3cca84a3417ea6531ae25be73a7a" BRANCH = "client_release/7/${PV}" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:15:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:15:56 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (90563a1 -> c62189f) Message-ID: <158282015637.20666.12185876543302877@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 90563a1 boinc: update recipe to version 7.16.5 new 07602b8 gensio: new package new c62189f ser2net: upgrade 3.5.1 -> 4.1.2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 +- 3 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch create mode 100644 meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb rename meta-oe/recipes-connectivity/ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} (67%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:15:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:15:58 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: ser2net: upgrade 3.5.1 -> 4.1.2 In-Reply-To: <158282015637.20666.12185876543302877@git.openembedded.org> References: <158282015637.20666.12185876543302877@git.openembedded.org> Message-ID: <20200227161556.C89D6232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c62189f67a3ad54efe3476548322b76c51594468 Author: Pierre-Jean Texier AuthorDate: Tue Feb 25 21:41:59 2020 +0000 ser2net: upgrade 3.5.1 -> 4.1.2 Add gensio and libyaml to DEPENDS list, see: - https://sourceforge.net/p/ser2net/news/2019/05/ser2net-40-gensio-10-released/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb similarity index 67% rename from meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb index ed8aab0..66985af 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb @@ -5,10 +5,12 @@ HOMEPAGE = "http://sourceforge.net/projects/ser2net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +DEPENDS = "gensio libyaml" + SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "569267b37b8f507d8874f28f5334b5d2" -SRC_URI[sha256sum] = "02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862" +SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" +SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:15:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:15:57 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: gensio: new package In-Reply-To: <158282015637.20666.12185876543302877@git.openembedded.org> References: <158282015637.20666.12185876543302877@git.openembedded.org> Message-ID: <20200227161556.BFB4A232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 07602b8c952d52d8d78b560f512a85c6b780212c Author: Pierre-Jean Texier AuthorDate: Sun Feb 23 20:47:50 2020 +0000 gensio: new package Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ 2 files changed, 135 insertions(+) diff --git a/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch new file mode 100644 index 0000000..dbc48a2 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch @@ -0,0 +1,108 @@ +From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Tue, 25 Feb 2020 16:08:40 -0600 +Subject: [PATCH] filter: Rename some variables to tr_stdxxx + +stdout and stderr can be macros, don't use the names directly. + +Signed-off-by: Corey Minyard +Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] +Signed-off-by: Pierre-Jean Texier +--- + lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c +index d39d58b..abe2db6 100644 +--- a/lib/gensio_filter_trace.c ++++ b/lib/gensio_filter_trace.c +@@ -32,8 +32,8 @@ struct trace_filter { + enum trace_dir dir; + bool raw; + char *filename; +- bool stdout; +- bool stderr; ++ bool tr_stdout; ++ bool tr_stderr; + + FILE *tr; + }; +@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (tfilter->stdout) { ++ if (tfilter->tr_stdout) { + tfilter->tr = stdout; +- } else if (tfilter->stderr) { ++ } else if (tfilter->tr_stderr) { + tfilter->tr = stderr; + } else if (tfilter->filename) { + tfilter->tr = fopen(tfilter->filename, "a+"); +@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) ++ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) + fclose(tfilter->tr); + tfilter->tr = NULL; + return 0; +@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, + + static struct gensio_filter * + gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, +- bool raw, const char *filename, bool stdout, +- bool stderr) ++ bool raw, const char *filename, bool tr_stdout, ++ bool tr_stderr) + { + struct trace_filter *tfilter; + +- if (!filename && !stdout && !stderr) ++ if (!filename && !tr_stdout && !tr_stderr) + dir = TRACE_NONE; + + tfilter = o->zalloc(o, sizeof(*tfilter)); +@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, + if (!tfilter->filename) + goto out_nomem; + } +- tfilter->stdout = stdout; +- tfilter->stderr = stderr; ++ tfilter->tr_stdout = tr_stdout; ++ tfilter->tr_stderr = tr_stderr; + + tfilter->lock = o->alloc_lock(o); + if (!tfilter->lock) +@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + { + struct gensio_filter *filter; + int dir = TRACE_NONE; +- bool raw = false, stdout = false, stderr = false; ++ bool raw = false, tr_stdout = false, tr_stderr = false; + const char *filename = NULL; + unsigned int i; + +@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + continue; + if (gensio_check_keyvalue(args[i], "file", &filename) > 0) + continue; +- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) ++ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) + continue; +- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) ++ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) + continue; + return GE_INVAL; + } + + filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, +- stdout, stderr); ++ tr_stdout, tr_stderr); + if (!filter) + return GE_NOMEM; + +-- +2.7.4 + diff --git a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb new file mode 100644 index 0000000..8c97662 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" +PV = "1.5.3+git${SRCPV}" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ + file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}${prefix},--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS_${PN} += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:29 +0000 Subject: [oe-commits] [meta-openembedded] 02/21: ttf-noto-emoji: add recipe In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162627.AE3F7232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 08a97cb0e03b7b14bf4ef2632f2db24a86ccae8b Author: Matt Ranostay AuthorDate: Wed Feb 26 23:21:37 2020 +0200 ttf-noto-emoji: add recipe Add both B/W and color emojis fonts from the noto-emoji project. Important note for the color emojis to render the pixmap PACKAGECONFIG option needs to be set in freetype package. Signed-off-by: Matt Ranostay Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 1 + .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index a93d239..8ad21d6 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -72,6 +72,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-liberation-sans-narrow->fontconfig \ ttf-lklug->fontconfig \ ttf-lohit->fontconfig \ + ttf-noto-emoji->fontconfig \ ttf-pt-sans->fontconfig \ ttf-roboto->fontconfig \ ttf-mplus->fontconfig \ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb new file mode 100644 index 0000000..e74f7a7 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb @@ -0,0 +1,19 @@ +require ttf.inc + +SUMMARY = "Google noto emoji font pack" +HOMEPAGE = "https://github.com/googlefonts/noto-emoji" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" + +SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" +SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" + +PACKAGES = "${PN}-color ${PN}-regular" +FONT_PACKAGES = "${PN}-color ${PN}-regular" + +S = "${WORKDIR}/git" + +FILES_${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf" +FILES_${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf" + +do_compile[noexec] = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:27 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c62189f -> 4a501c7) Message-ID: <158282078745.27774.8534105611457865622@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard c62189f ser2net: upgrade 3.5.1 -> 4.1.2 discard 07602b8 gensio: new package discard 90563a1 boinc: update recipe to version 7.16.5 discard 514831c cpprest: update to 2.10.15 and refresh patches discard 1e981c5 libmbim: upgrade 1.20.4 -> 1.22.0 discard f265cee libev: upgrade 4.27 -> 4.31 discard 11f87a9 uftp: upgrade 4.10 -> 4.10.1 discard 04c4051 rdma-core: upgrade 27.0 -> 28.0 discard 76fd951 openipmi: upgrade 2.0.27 -> 2.0.28 discard 54f391e iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 discard 88ccf6b drbd-utils: upgrade 9.11.0 -> 9.12.0 discard 38c4df5 gimp: upgrade 2.10.14 -> 2.10.18 discard 99a0779 gegl: upgrade 0.4.20 -> 0.4.22 discard 8376da7 xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 discard 1c282d0 cyrus-sasl: fix CVE-2019-19906 discard 7e8ada8 can-utils: update to v2020.02.04 discard a341d0e open-lldp: Add initial version 1.0.1 discard 546c4f0 upm: Update SRC_URI discard 2ef0760 ttf-noto-emoji: add recipe discard c208135 libharu: New recipe discard 262abba luajit: Upgrade to 2.1.0-beta3 new fba148f libharu: New recipe new 08a97cb ttf-noto-emoji: add recipe new d664461 upm: Update SRC_URI new 4fc18c9 open-lldp: Add initial version 1.0.1 new ed79366 can-utils: update to v2020.02.04 new 62b3a48 cyrus-sasl: fix CVE-2019-19906 new 89f1b6d xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 new 22645f5 gegl: upgrade 0.4.20 -> 0.4.22 new eb07ee7 gimp: upgrade 2.10.14 -> 2.10.18 new dfdb329 drbd-utils: upgrade 9.11.0 -> 9.12.0 new 0c50aa6 iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 new 90f5d4d openipmi: upgrade 2.0.27 -> 2.0.28 new 5f4636f rdma-core: upgrade 27.0 -> 28.0 new f8eb735 uftp: upgrade 4.10 -> 4.10.1 new 9825d4c libev: upgrade 4.27 -> 4.31 new d487494 libmbim: upgrade 1.20.4 -> 1.22.0 new 40d3b71 cpprest: update to 2.10.15 and refresh patches new f101d80 boinc: update recipe to version 7.16.5 new 9cbb406 gensio: new package new acd1bfd ser2net: upgrade 3.5.1 -> 4.1.2 new 4a501c7 luajit: Upgrade to 2.1.0-beta3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c62189f) \ N -- N -- N refs/heads/master-next (4a501c7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 21 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:28 +0000 Subject: [oe-commits] [meta-openembedded] 01/21: libharu: New recipe In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162627.A07D5232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fba148fefd34bd8b122cc931586f26106d6208a7 Author: Zheng Ruoqin AuthorDate: Wed Feb 26 23:10:00 2020 +0800 libharu: New recipe libHaru is a library for generating PDF files. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 23 ++++++++++ 2 files changed, 75 insertions(+) diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch new file mode 100644 index 0000000..332be1b --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch @@ -0,0 +1,52 @@ +Backport from Fedora Project. +https://src.fedoraproject.org/rpms/libharu + +Fix the install destination of some files. + +Upstream-Status: inappropriate + +Signed-off-by: Zheng Ruoqin + +diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt +--- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 +@@ -25,7 +25,7 @@ endif(MSVC) + + # information about libharu + set(LIBHPDF_MAJOR 2) +-set(LIBHPDF_MINOR 2) ++set(LIBHPDF_MINOR 3) + set(LIBHPDF_PATCH 0) + set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) + set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") +@@ -210,9 +210,9 @@ set( + install(FILES ${haru_HDRS} DESTINATION include) + + # install various files +-install(FILES README CHANGES INSTALL DESTINATION .) ++install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + if(NOT DEVPAK) +- install(DIRECTORY if DESTINATION .) ++ install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) + endif(NOT DEVPAK) + if(DEVPAK) + install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) +diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt +--- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 ++++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 +@@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) + target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) + if(WIN32 AND NOT CYGWIN) + set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ else(WIN32 AND NOT CYGWIN) ++ set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) + endif(WIN32 AND NOT CYGWIN) + install( + TARGETS ${LIBHPDF_NAME} +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ) + endif(LIBHPDF_SHARED) diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb new file mode 100644 index 0000000..2d1a37c --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" + +SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ + file://libharu-RELEASE_2_3_0_cmake.patch \ + " + +SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" + +S = "${WORKDIR}/git" + +inherit cmake +DEPENDS += "libpng zlib" + +do_install_append() { + mkdir -p ${D}/${datadir}/libharu + mv ${D}/libharu ${D}/${datadir} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:30 +0000 Subject: [oe-commits] [meta-openembedded] 03/21: upm: Update SRC_URI In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162627.BFEA7232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d664461dfa323004ab98342c62ca2d38ccab2ecb Author: Propanu AuthorDate: Wed Feb 26 12:49:54 2020 -0800 upm: Update SRC_URI Updating SRC_URI to reflect project move to Eclipse Foundation. Signed-off-by: Khem Raj --- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 6db8f88..c851c93 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:31 +0000 Subject: [oe-commits] [meta-openembedded] 04/21: open-lldp: Add initial version 1.0.1 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162627.CEAA5232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4fc18c9d7b61691ff69ff1ca62d9a7f17ea87fce Author: Jonathan Richardson AuthorDate: Wed Feb 26 16:32:40 2020 -0800 open-lldp: Add initial version 1.0.1 Open-LLDP provides a Link Layer Discovery Protocol agent that supports DCB (Data Center Bridging). The tc utility from iproute is needed to manipulate traffic control settings in the kernel. Signed-off-by: Jonathan Richardson Signed-off-by: Khem Raj --- .../files/0001-Fix-musl-libc-build-issue.patch | 26 ++++++++++ ...s-Add-include-path-to-generated-version.h.patch | 29 +++++++++++ ...dd-option-to-disable-installation-of-syst.patch | 57 ++++++++++++++++++++++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 33 +++++++++++++ 4 files changed, 145 insertions(+) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch new file mode 100644 index 0000000..40b082e --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch @@ -0,0 +1,26 @@ +From a64e52f9b58519aa2b8a1073fa6c04da04933428 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Wed, 26 Feb 2020 12:16:38 -0800 +Subject: [PATCH] Fix musl libc build issue + +clif.h should include sys/types.h for the definition of pid_t. It fails +to compile when using musl libc. + +Signed-off-by: Jonathan Richardson + +--- + include/clif.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/clif.h b/include/clif.h +index 648eedf..92f4fd8 100644 +--- a/include/clif.h ++++ b/include/clif.h +@@ -32,6 +32,7 @@ + #ifndef CLIF_H + #define CLIF_H + ++#include + #include + #include "clif_sock.h" + diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch new file mode 100644 index 0000000..b58fc10 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch @@ -0,0 +1,29 @@ +From eb14aa66dc0384071af401cced8c02993b55502e Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Wed, 26 Feb 2020 15:54:51 -0800 +Subject: [PATCH] autotools: Add include path to generated version.h + +When the build dir isn't the same as source dir it fails to compile +because the generated version.h from AC_CONFIG_FILES is always in build +dir. Include the path to it in AM_CPPFLAGS. + +Signed-off-by: Jonathan Richardson + +--- + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0fb9bb0..2952019 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,6 +14,9 @@ endif + AM_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR="\"${sysconfdir}\"" \ + -D_FORTIFY_SOURCE=2 + ++# Required for the generated version.h when build dir is not the same as srcdir. ++AM_CPPFLAGS += -I${top_builddir}/include ++ + ACLOCAL_AMFLAGS = -I m4 + + parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch new file mode 100644 index 0000000..a26a529 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch @@ -0,0 +1,57 @@ +From dc3f2250908587710f109c80ddf8a94f0bc40b82 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson +Date: Fri, 6 Apr 2018 10:49:04 -0700 +Subject: [PATCH] autotools: Add option to disable installation of systemd conf + files + +Add option to configure.ac to enable or disable install of systemd conf +files. If --with-systemdsystemunitdir is passed to configure then the +files will be installed to the provided directory. If the option isn't +provided then the value is determined from the systemd pkgconfig file, +if found in PKG_CONFIG_PATH. + +This change is required because Makefile.am always installed the files +to a hard coded path that couldn't be changed. + + +Signed-off-by: Jonathan Richardson +--- + Makefile.am | 3 ++- + configure.ac | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 292c0fd..0fb9bb0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -138,8 +138,9 @@ install-data-hook: installdirs-local + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = lldpad.pc liblldp_clif.pc + +-systemdsystemunitdir = $(prefix)/lib/systemd/system ++if HAVE_SYSTEMD + dist_systemdsystemunit_DATA = lldpad.service lldpad.socket ++endif + + bashcompletiondir = $(sysconfdir)/bash_completion.d + dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool +diff --git a/configure.ac b/configure.ac +index 0667446..f75f433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,15 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT8_T + ++# Support for systemd unit files. ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_CONFIG_FILES([Makefile include/version.h lldpad.spec lldpad.pc liblldp_clif.pc]) + AC_CONFIG_MACRO_DIR([m4]) + AC_OUTPUT diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb new file mode 100644 index 0000000..5fbf064 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "Open-LLDP" +DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" +HOMEPAGE = "http://open-lldp.org/start" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} + +DEPENDS = "libnl libconfig readline" + +SRCREV = "36d729de7ce5b56cf061d94d610cf0510154820c" +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master \ + file://0001-Fix-musl-libc-build-issue.patch \ + file://0001-autotools-Add-include-path-to-generated-version.h.patch \ + file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ + " + +# Makefile.am adds -Werror to AM_CFLAGS. There are warnings so disable it. +TARGET_CFLAGS += "-Wno-error" + +# Enable install of systemd conf files. +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" + +SYSTEMD_SERVICE_${PN} = "lldpad.service lldpad.socket" + +# To enable service at boot set to enable in local.conf. +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS_${PN} = "iproute2-tc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:32 +0000 Subject: [oe-commits] [meta-openembedded] 05/21: can-utils: update to v2020.02.04 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162627.DF274232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ed7936674bfd7c830328e5b975897df393f77a39 Author: Denys Dmytriyenko AuthorDate: Wed Feb 26 20:49:21 2020 -0500 can-utils: update to v2020.02.04 https://github.com/linux-can/can-utils/releases/tag/v2020.02.04 This version is required to build against kernel > 5.2 While at it, drop redundant DESCRIPTION and branch=master Signed-off-by: Denys Dmytriyenko Signed-off-by: Khem Raj --- meta-oe/recipes-extended/socketcan/can-utils_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index e2609d4..5193688 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -1,17 +1,15 @@ SUMMARY = "Linux CAN network development utilities" -DESCRIPTION = "Linux CAN network development" LICENSE = "GPLv2 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61329e99f86fdd31" DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "665d8699ebe728bf48e63e8ae58d2482db72f954" +SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700" -PV = "0.0+gitr${SRCPV}" +PV = "2020.02.04" S = "${WORKDIR}/git" inherit autotools pkgconfig - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:33 +0000 Subject: [oe-commits] [meta-openembedded] 06/21: cyrus-sasl: fix CVE-2019-19906 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162627.EB326232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 62b3a48219ef1ea9ff62dd8e6d78d81c4325a7fb Author: Changqing Li AuthorDate: Thu Feb 27 11:38:54 2020 +0800 cyrus-sasl: fix CVE-2019-19906 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch | 35 ++++++++++++++++++++++ .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 1 + 2 files changed, 36 insertions(+) diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch new file mode 100644 index 0000000..b94780f --- /dev/null +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch @@ -0,0 +1,35 @@ +From 94fe6eb9ea2691f4a7c32fbf2d0c7c454995b666 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 11:08:57 +0800 +Subject: [PATCH] Fix #587 + +Off by one error in common.c, CVE-2019-19906. + +Thanks to Stephan Zeisberg for reporting + +CVE: CVE-2019-19906 + +Upstream-Stauts: Backport [https://github.com/cyrusimap/cyrus-sasl +/commit/dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1] + +Signed-off-by: Changqing Li +--- + lib/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/common.c b/lib/common.c +index 305311d..445c5d5 100644 +--- a/lib/common.c ++++ b/lib/common.c +@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen, + + if (add==NULL) add = "(null)"; + +- addlen=strlen(add); /* only compute once */ ++ addlen=strlen(add)+1; /* only compute once */ + if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) + return SASL_NOMEM; + +-- +2.7.4 + diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index be7131d..d55dc4a 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https \ file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \ file://0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch \ file://0001-makeinit.sh-fix-parallel-build-issue.patch \ + file://CVE-2019-19906.patch \ " UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:34 +0000 Subject: [oe-commits] [meta-openembedded] 07/21: xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.08237232C13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 89f1b6d20387576d7bdc0a1bfda5e438aa5fa2fb Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:03 2020 +0100 xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 Release notes for 0.10.1 ======================== - Switch to 'locationforecast' product and use a more recent API version (bug #16268) - Fix invalid scrollbar index to add a label (bug #16023) - Update URLs from goodies.x.o to docs.x.o (bug #16182) - Fix build with panel 4.15 - Make build output less verbose - Use standard icon names (bug #16059) Translation Updates: Albanian, Croatian, Finnish, Galician, Greek, Portuguese, Slovak, Slovenian Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{xfce4-weather-plugin_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb similarity index 72% rename from meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb rename to meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb index 96c2048..ad9b6e9 100644 --- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb +++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "7ff4ab636f93addba0817bf6436d2964" -SRC_URI[sha256sum] = "4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572" +SRC_URI[md5sum] = "203ad16e74d4823f6fb6e9a18bb7df55" +SRC_URI[sha256sum] = "afb2af5f3effc2ea6181636ed0e82e6dafd556ec1b8478100802f85a5d167a89" FILES_${PN} += "${datadir}/xfce4/weather" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:36 +0000 Subject: [oe-commits] [meta-openembedded] 09/21: gimp: upgrade 2.10.14 -> 2.10.18 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.2840A23341A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit eb07ee7eadf5db647f1633f20e804d36ce354946 Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:05 2020 +0100 gimp: upgrade 2.10.14 -> 2.10.18 Release information can be found at [1] [1] https://www.gimp.org/news/2020/02/24/gimp-2-10-18-released/ Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb similarity index 91% rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb index 30f0579..838bd37 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb @@ -38,8 +38,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "a64f2be299755a2da130306cad9b1d26" -SRC_URI[sha256sum] = "df9b0f11c2078eea1de3ebc66529a5d3854c5e28636cd25a8dd077bd9d6ddc54" +SRC_URI[md5sum] = "096d04ffb2c4559cb2152f507ff31c9c" +SRC_URI[sha256sum] = "65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716" EXTRA_OECONF = "--disable-python \ --without-webkit \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:35 +0000 Subject: [oe-commits] [meta-openembedded] 08/21: gegl: upgrade 0.4.20 -> 0.4.22 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.18229233419@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 22645f57d85c038067932d980185b29e991a9e3c Author: Andreas M?ller AuthorDate: Thu Feb 27 07:51:04 2020 +0100 gegl: upgrade 0.4.20 -> 0.4.22 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gimp/gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb similarity index 93% rename from meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb rename to meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb index 5e7a1bb..ca73e66 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.20.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb @@ -26,8 +26,8 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[md5sum] = "37433eb00f8a4b0d1ae9e975aaedfa26" -SRC_URI[sha256sum] = "23bd8bb42b20de7c2a8c314eeb5301dc20141feda20a4b1ed455020b69b73dff" +SRC_URI[md5sum] = "1776ac26792de0de3c3d680872e94b72" +SRC_URI[sha256sum] = "1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:38 +0000 Subject: [oe-commits] [meta-openembedded] 11/21: iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.49ED5232B23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0c50aa6b1f2166e83523b052cda0c52aa4156432 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:12 2020 -0800 iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...{iscsi-initiator-utils_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb similarity index 98% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb index b75e54b..97b5563 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "288add22d6b61cc68ede358faeec9affb15019cd" +SRCREV ?= "549f8987be49583bb06b117a364bea3a8fc5250c" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://initd.debian \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:37 +0000 Subject: [oe-commits] [meta-openembedded] 10/21: drbd-utils: upgrade 9.11.0 -> 9.12.0 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.39CE7232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dfdb3299ecc3638073626163f9b3ab9134a1085d Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:11 2020 -0800 drbd-utils: upgrade 9.11.0 -> 9.12.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../drbd/{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb similarity index 93% rename from meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb rename to meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb index 01bb16a..b83f68f 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb @@ -12,9 +12,9 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -# v9.11.0 -SRCREV_drbd-utils = "63092751e76e1fba397e53df4be5c1161b83a223" -SRCREV_drbd-headers = "d100ee01bf5aa8d5220767e4e35c4224faa8d865" +# v9.12.0 +SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052" +SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:42 +0000 Subject: [oe-commits] [meta-openembedded] 15/21: libev: upgrade 4.27 -> 4.31 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.A97BC23341B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9825d4cf3e66519200bc7aa613c2c59cda9c0ab4 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:17 2020 -0800 libev: upgrade 4.27 -> 4.31 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libev/{libev_4.27.bb => libev_4.31.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-oe/recipes-connectivity/libev/libev_4.31.bb similarity index 80% rename from meta-oe/recipes-connectivity/libev/libev_4.27.bb rename to meta-oe/recipes-connectivity/libev/libev_4.31.bb index be4536b..beea855 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.31.bb @@ -5,8 +5,8 @@ LICENSE = "BSD-2-Clause | GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" -SRC_URI[md5sum] = "d38925fbc030153fe674c4e0e864a69a" -SRC_URI[sha256sum] = "2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e" +SRC_URI[md5sum] = "20111fda0df0a289c152faa2aac91b08" +SRC_URI[sha256sum] = "ed855d2b52118e32c0c1a6a32bd18c97f9e6711ca511f5ee12de3b9eccc66e5a" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:40 +0000 Subject: [oe-commits] [meta-openembedded] 13/21: rdma-core: upgrade 27.0 -> 28.0 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.6A6A2232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5f4636fec49bebca1fc18f267aad6529d7a31869 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:14 2020 -0800 rdma-core: upgrade 27.0 -> 28.0 0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch removed because it is included in 28.0. refresh 0001-Remove-man-files-which-cant-be-built.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...0001-Remove-man-files-which-cant-be-built.patch | 11 +++++++- ...-Use-sched_yield-instead-of-pthread_yield.patch | 30 ---------------------- .../{rdma-core_27.0.bb => rdma-core_28.0.bb} | 3 +-- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index f1437a0..feed021 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -254,9 +254,10 @@ diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.t index 0bd9eba1..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,72 +1,7 @@ +@@ -1,81 +1,7 @@ rdma_man_pages( - mlx5dv_alloc_dm.3.md +- mlx5dv_alloc_var.3.md - mlx5dv_create_cq.3.md - mlx5dv_create_flow.3.md - mlx5dv_create_flow_action_modify_header.3.md @@ -274,6 +275,7 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_devx_subscribe_devx_event.3.md - mlx5dv_devx_umem_reg.3.md - mlx5dv_dr_flow.3.md +- mlx5dv_dump.3.md - mlx5dv_flow_action_esp.3.md mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 @@ -285,6 +287,7 @@ index 0bd9eba1..876b6fcf 100644 mlx5dv.7 ) -rdma_alias_man_pages( +- mlx5dv_alloc_var.3 mlx5dv_free_var.3 - mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3 - mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3 - mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3 @@ -311,10 +314,12 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_modify_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 @@ -324,6 +329,10 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_domain.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 +- mlx5dv_dump.3 mlx5dv_dump_dr_table.3 - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 -) diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch deleted file mode 100644 index 80abd33..0000000 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6ac9562d756d42592994aeaac7a5e7b2bbce5cab Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 14 Dec 2019 14:07:57 -0800 -Subject: [PATCH] librdmacm: Use sched_yield instead of pthread_yield - -glibc redirects pthread_yield to sched_yield additionally we get it -working with musl on linux - -Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/635] -Signed-off-by: Khem Raj ---- - librdmacm/rsocket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/librdmacm/rsocket.c b/librdmacm/rsocket.c -index 89ae2139..7fc5b266 100644 ---- a/librdmacm/rsocket.c -+++ b/librdmacm/rsocket.c -@@ -3038,7 +3038,7 @@ static int rs_poll_enter(void) - pthread_mutex_lock(&mut); - if (suspendpoll) { - pthread_mutex_unlock(&mut); -- pthread_yield(); -+ sched_yield(); - return -EBUSY; - } - --- -2.24.1 - diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb similarity index 90% rename from meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb index 361d69b..15fd7ff 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_27.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb @@ -8,9 +8,8 @@ RDEPENDS_${PN} = "bash perl" BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ file://0001-Remove-man-files-which-cant-be-built.patch \ - file://0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch \ " -SRCREV = "84caf035ae6123e2296b72006cd2cf698c65eb46" +SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:39 +0000 Subject: [oe-commits] [meta-openembedded] 12/21: openipmi: upgrade 2.0.27 -> 2.0.28 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.5B10B232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 90f5d4db3ec2d3e58f10a06350bc6d8188f063ec Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:13 2020 -0800 openipmi: upgrade 2.0.27 -> 2.0.28 ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch removed because it is included in 2.0.28. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ..._bmc_emu.c-include-readline.h-from-readli.patch | 31 ---------------------- .../{openipmi_2.0.27.bb => openipmi_2.0.28.bb} | 5 ++-- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch b/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch deleted file mode 100644 index e208de8..0000000 --- a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bebfb3c24582ec4e45d79c5b52135197bf7373da Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Fri, 14 Jun 2019 14:17:34 +0800 -Subject: [PATCH] ipmi_serial_bmc_emu.c: include readline.h from readline - -The libedit had been removed and swithed to readline. -We need to include readline.h from readline rather than editline. - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - sample/ipmi_serial_bmc_emu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index e0ae019..1b8bb9a 100644 ---- a/sample/ipmi_serial_bmc_emu.c -+++ b/sample/ipmi_serial_bmc_emu.c -@@ -42,7 +42,7 @@ - #include - #include - #include --#include -+#include - - #define _GNU_SOURCE - #include --- -2.7.4 - diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb similarity index 95% rename from meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb rename to meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb index 126b37f..f196eb9 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb @@ -29,15 +29,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ file://include_sys_types.patch \ - file://ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch \ file://openipmi-helper \ file://ipmi.service \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" -SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" +SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4" +SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996" inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:41 +0000 Subject: [oe-commits] [meta-openembedded] 14/21: uftp: upgrade 4.10 -> 4.10.1 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.89CE4232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f8eb735acdfbf500a167bf6ef7d35ea10e2cf83a Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:15 2020 -0800 uftp: upgrade 4.10 -> 4.10.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-support/uftp/{uftp_4.10.bb => uftp_4.10.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/uftp/uftp_4.10.bb b/meta-networking/recipes-support/uftp/uftp_4.10.1.bb similarity index 77% rename from meta-networking/recipes-support/uftp/uftp_4.10.bb rename to meta-networking/recipes-support/uftp/uftp_4.10.1.bb index 86c0c22..a70fd4d 100644 --- a/meta-networking/recipes-support/uftp/uftp_4.10.bb +++ b/meta-networking/recipes-support/uftp/uftp_4.10.1.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/" SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "df6407af3a0067b881431b3dad149ef3" -SRC_URI[sha256sum] = "91ba8aae80c7c9ccaf04600b628cbeca4699ed48268fe43d2bf539a41083f292" +SRC_URI[md5sum] = "a5c79c8e5a20d0646c9579fe1f339493" +SRC_URI[sha256sum] = "903353febf1b88f701198d956a60cec3d2be3cc251561a678061761aec6622f6" DEPENDS = "openssl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:43 +0000 Subject: [oe-commits] [meta-openembedded] 16/21: libmbim: upgrade 1.20.4 -> 1.22.0 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.C7C52232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d4874942d8d1a40fd84bbdb9528a58fd6289ca95 Author: Wang Mingyu AuthorDate: Thu Feb 27 04:43:18 2020 -0800 libmbim: upgrade 1.20.4 -> 1.22.0 clang.patch Revemod since the file of this patch is non-existent. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libmbim/libmbim/clang.patch | 73 ---------------------- .../{libmbim_1.20.4.bb => libmbim_1.22.0.bb} | 9 ++- 2 files changed, 4 insertions(+), 78 deletions(-) diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch b/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch deleted file mode 100644 index d885784..0000000 --- a/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch +++ /dev/null @@ -1,73 +0,0 @@ -Check for clang compiler since we need to disable -unused-function warning for clang, at same time -pass werror when checking for compiler options if -werror is enabled so spurious options do not get -enabled. Only the ones that are supported by given -compiler are accepted. - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: libmbim-1.14.0/m4/compiler-warnings.m4 -=================================================================== ---- libmbim-1.14.0.orig/m4/compiler-warnings.m4 -+++ libmbim-1.14.0/m4/compiler-warnings.m4 -@@ -2,10 +2,30 @@ AC_DEFUN([LIBMBIM_COMPILER_WARNINGS], - [AC_ARG_ENABLE(more-warnings, - AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), - set_more_warnings="$enableval",set_more_warnings=error) -+ -+# Clang throws a lot of warnings when it does not understand a flag. Disable -+# this warning for now so other warnings are visible. -+AC_MSG_CHECKING([if compiling with clang]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ -+#ifndef __clang__ -+ not clang -+#endif -+ ]])], -+ [CLANG=yes], -+ [CLANG=no] -+) -+AC_MSG_RESULT([$CLANG]) -+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) -+CFLAGS="$CFLAGS $CLANG_FLAGS" -+LDFLAGS="$LDFLAGS $CLANG_FLAGS" -+ - AC_MSG_CHECKING(for more warnings) - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -std=gnu89 $CFLAGS" -+ if test "x$set_more_warnings" = xerror; then -+ WERROR="-Werror" -+ fi - - for option in -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wstrict-prototypes \ -@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_war - -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security -Wtype-limits; do - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -+ CFLAGS="$CFLAGS $option $WERROR" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" -+ else -+ CFLAGS="$SAVE_CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done -+ CFLAGS="$CFLAGS $WERROR" - unset option -- if test "x$set_more_warnings" = xerror; then -- CFLAGS="$CFLAGS -Werror" -- fi -+ unset WERROR - else - AC_MSG_RESULT(no) - fi diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb similarity index 76% rename from meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb rename to meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb index a3ef80c..61e314f 100644 --- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.4.bb +++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb @@ -11,8 +11,7 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit autotools pkgconfig bash-completion -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://clang.patch \ -" -SRC_URI[md5sum] = "d38d637e33cde8a91484f53a9f6c4d49" -SRC_URI[sha256sum] = "ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "87060e8957013177e4140edc6f64f5bd" +SRC_URI[sha256sum] = "5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:44 +0000 Subject: [oe-commits] [meta-openembedded] 17/21: cpprest: update to 2.10.15 and refresh patches In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162628.DCE44232B23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 40d3b71630acb985eed715142bcd17f4de287cad Author: Gianfranco Costamagna AuthorDate: Thu Feb 27 15:37:25 2020 +0100 cpprest: update to 2.10.15 and refresh patches Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../cpprest/cpprest/disable-outside-tests.patch | 43 +++------------------- .../{cpprest_2.10.14.bb => cpprest_2.10.15.bb} | 4 +- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index 5232e2a..e108e02 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -54,7 +54,7 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c =================================================================== --- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp +++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -93,6 +93,7 @@ +@@ -93,6 +93,7 @@ SUITE(authentication_tests) return false; } @@ -62,46 +62,15 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c TEST(ssl_test) { websocket_client client; -@@ -127,6 +128,7 @@ +@@ -127,6 +128,7 @@ SUITE(authentication_tests) throw; } } + */ - // These tests are specific to our websocketpp based implementation. - #if !defined(__cplusplus_winrt) -@@ -159,12 +161,14 @@ - } - } - -+ /* - // Test specifically for server SignalR team hit interesting cases with. - TEST(sni_with_older_server_test) - { - websocket_client client; - sni_test_impl(client); - } -+ */ - - // WinRT doesn't expose option for disabling. - // No stable server is available to reliably test this. -@@ -194,6 +198,7 @@ - } - } - -+ /* - // Winrt doesn't allow explicitly setting server host for SNI. - TEST(sni_explicit_hostname) - { -@@ -204,6 +209,7 @@ - websocket_client client(config); - sni_test_impl(client); - } -+ */ - void handshake_error_test_impl(const ::utility::string_t& host) { -@@ -225,11 +231,11 @@ +@@ -148,11 +150,11 @@ SUITE(authentication_tests) } } @@ -114,13 +83,13 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c - TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } + //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } - #endif + } // SUITE(authentication_tests) Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp =================================================================== --- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp +++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -406,6 +406,7 @@ +@@ -408,6 +408,7 @@ } #endif @@ -128,7 +97,7 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp // Try to connect to a server on a closed port and cancel the operation. TEST_FIXTURE(uri_address, cancel_bad_port) { -@@ -437,6 +438,7 @@ +@@ -439,6 +440,7 @@ VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); } diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb similarity index 91% rename from meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb rename to meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb index 11c8eab..dee5ae2 100644 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb @@ -11,8 +11,8 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.14 -SRCREV= "6f602bee67b088a299d7901534af3bce6334ab38" +# tag 2.10.15 +SRCREV= "b94bc32ff84e815ba44c567f6fe4af5f5f6b3048" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:45 +0000 Subject: [oe-commits] [meta-openembedded] 18/21: boinc: update recipe to version 7.16.5 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162629.01BD7232B92@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f101d808ea362e561ba49e4e507301c44feee631 Author: Gianfranco Costamagna AuthorDate: Thu Feb 27 15:37:26 2020 +0100 boinc: update recipe to version 7.16.5 Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- meta-oe/recipes-extended/boinc/boinc-client_7.16.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb index c528280..db90f06 100644 --- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb +++ b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb @@ -29,7 +29,7 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "bc3269f77f570ea0ffd31766ed83846ebb043938" +SRCREV = "e0e033af9fca3cca84a3417ea6531ae25be73a7a" BRANCH = "client_release/7/${PV}" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:47 +0000 Subject: [oe-commits] [meta-openembedded] 20/21: ser2net: upgrade 3.5.1 -> 4.1.2 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162629.24CDE232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit acd1bfd1690b5da767608f3ed1f7d56eb68d7e02 Author: Pierre-Jean Texier AuthorDate: Tue Feb 25 21:41:59 2020 +0000 ser2net: upgrade 3.5.1 -> 4.1.2 Add gensio and libyaml to DEPENDS list, see: - https://sourceforge.net/p/ser2net/news/2019/05/ser2net-40-gensio-10-released/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb similarity index 67% rename from meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb index ed8aab0..66985af 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_3.5.1.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb @@ -5,10 +5,12 @@ HOMEPAGE = "http://sourceforge.net/projects/ser2net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +DEPENDS = "gensio libyaml" + SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "569267b37b8f507d8874f28f5334b5d2" -SRC_URI[sha256sum] = "02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862" +SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" +SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:46 +0000 Subject: [oe-commits] [meta-openembedded] 19/21: gensio: new package In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162629.155EC232B2C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9cbb406814a11cbc9a0d06026a504d63a93cc11e Author: Pierre-Jean Texier AuthorDate: Sun Feb 23 20:47:50 2020 +0000 gensio: new package Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 +++++++++++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 ++++++ 2 files changed, 135 insertions(+) diff --git a/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch new file mode 100644 index 0000000..dbc48a2 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch @@ -0,0 +1,108 @@ +From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Tue, 25 Feb 2020 16:08:40 -0600 +Subject: [PATCH] filter: Rename some variables to tr_stdxxx + +stdout and stderr can be macros, don't use the names directly. + +Signed-off-by: Corey Minyard +Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] +Signed-off-by: Pierre-Jean Texier +--- + lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c +index d39d58b..abe2db6 100644 +--- a/lib/gensio_filter_trace.c ++++ b/lib/gensio_filter_trace.c +@@ -32,8 +32,8 @@ struct trace_filter { + enum trace_dir dir; + bool raw; + char *filename; +- bool stdout; +- bool stderr; ++ bool tr_stdout; ++ bool tr_stderr; + + FILE *tr; + }; +@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (tfilter->stdout) { ++ if (tfilter->tr_stdout) { + tfilter->tr = stdout; +- } else if (tfilter->stderr) { ++ } else if (tfilter->tr_stderr) { + tfilter->tr = stderr; + } else if (tfilter->filename) { + tfilter->tr = fopen(tfilter->filename, "a+"); +@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) + { + struct trace_filter *tfilter = filter_to_trace(filter); + +- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) ++ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) + fclose(tfilter->tr); + tfilter->tr = NULL; + return 0; +@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, + + static struct gensio_filter * + gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, +- bool raw, const char *filename, bool stdout, +- bool stderr) ++ bool raw, const char *filename, bool tr_stdout, ++ bool tr_stderr) + { + struct trace_filter *tfilter; + +- if (!filename && !stdout && !stderr) ++ if (!filename && !tr_stdout && !tr_stderr) + dir = TRACE_NONE; + + tfilter = o->zalloc(o, sizeof(*tfilter)); +@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, + if (!tfilter->filename) + goto out_nomem; + } +- tfilter->stdout = stdout; +- tfilter->stderr = stderr; ++ tfilter->tr_stdout = tr_stdout; ++ tfilter->tr_stderr = tr_stderr; + + tfilter->lock = o->alloc_lock(o); + if (!tfilter->lock) +@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + { + struct gensio_filter *filter; + int dir = TRACE_NONE; +- bool raw = false, stdout = false, stderr = false; ++ bool raw = false, tr_stdout = false, tr_stderr = false; + const char *filename = NULL; + unsigned int i; + +@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, + continue; + if (gensio_check_keyvalue(args[i], "file", &filename) > 0) + continue; +- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) ++ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) + continue; +- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) ++ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) + continue; + return GE_INVAL; + } + + filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, +- stdout, stderr); ++ tr_stdout, tr_stderr); + if (!filter) + return GE_NOMEM; + +-- +2.7.4 + diff --git a/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb new file mode 100644 index 0000000..8c97662 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" +PV = "1.5.3+git${SRCPV}" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ + file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}${prefix},--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS_${PN} += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 16:26:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 16:26:48 +0000 Subject: [oe-commits] [meta-openembedded] 21/21: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158282078745.27774.8534105611457865622@git.openembedded.org> References: <158282078745.27774.8534105611457865622@git.openembedded.org> Message-ID: <20200227162629.36723232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4a501c759e2c0846d77a73279e3706c7155462d2 Author: Leo Yan AuthorDate: Wed Feb 26 12:26:22 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded at 436 with fuzz 1 (offset 123 lines)." Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 4 ++-- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch index c39ef6f..807cc44 100644 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h =================================================================== --- LuaJIT-2.0.5.orig/src/lj_arch.h +++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" +@@ -436,7 +436,7 @@ + #endif #endif #elif !LJ_TARGET_PS3 -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 90% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..2a72438 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 20:50:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 20:50:21 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (4a501c7 -> 732b409) Message-ID: <158283662144.16237.16424085534397324409@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 4a501c7 luajit: Upgrade to 2.1.0-beta3 new 31557db libidn: Remove obsolete patches for issues already fixed upstream new b09d0bd libp11: revert version back to the 0.4.10 release new 732b409 luajit: Upgrade to 2.1.0-beta3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4a501c7) \ N -- N -- N refs/heads/master-next (732b409) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 --------------------- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---------------------- meta-oe/recipes-extended/libidn/libidn_1.35.bb | 2 -- .../libp11/{libp11_11.bb => libp11_0.4.10.bb} | 2 +- 4 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch delete mode 100644 meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch rename meta-oe/recipes-support/libp11/{libp11_11.bb => libp11_0.4.10.bb} (93%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 20:50:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 20:50:23 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: libp11: revert version back to the 0.4.10 release In-Reply-To: <158283662144.16237.16424085534397324409@git.openembedded.org> References: <158283662144.16237.16424085534397324409@git.openembedded.org> Message-ID: <20200227205021.D87CF232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b09d0bd4d7571bb72d512c1d4d583a414bd02248 Author: Ricardo Salveti AuthorDate: Thu Feb 27 17:41:05 2020 -0300 libp11: revert version back to the 0.4.10 release The latest upstream release is still 0.4.10 (2019-04-03), as available at https://github.com/OpenSC/libp11/releases. This reverts commit 4990f80ddbc984f2bed4e07005d22f937988827e as it was incorrect, since there is no 11 release, and SRCREV used was actually from the 0.4.9 release. Signed-off-by: Ricardo Salveti Signed-off-by: Khem Raj --- meta-oe/recipes-support/libp11/{libp11_11.bb => libp11_0.4.10.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libp11/libp11_11.bb b/meta-oe/recipes-support/libp11/libp11_0.4.10.bb similarity index 93% rename from meta-oe/recipes-support/libp11/libp11_11.bb rename to meta-oe/recipes-support/libp11/libp11_0.4.10.bb index 5a0951d..655db49 100644 --- a/meta-oe/recipes-support/libp11/libp11_11.bb +++ b/meta-oe/recipes-support/libp11/libp11_0.4.10.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692" +SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 20:50:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 20:50:22 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: libidn: Remove obsolete patches for issues already fixed upstream In-Reply-To: <158283662144.16237.16424085534397324409@git.openembedded.org> References: <158283662144.16237.16424085534397324409@git.openembedded.org> Message-ID: <20200227205021.CC8A4232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 31557db9bb8c711c3850d32a4f8964d501470e22 Author: Adrian Bunk AuthorDate: Thu Feb 27 22:10:07 2020 +0200 libidn: Remove obsolete patches for issues already fixed upstream Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 34 --------------------- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---------------------- meta-oe/recipes-extended/libidn/libidn_1.35.bb | 2 -- 3 files changed, 71 deletions(-) diff --git a/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted file mode 100644 index 43bd232..0000000 --- a/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Tue, 10 Jul 2012 02:44:30 -0700 -Subject: [PATCH] libidn: fix build with automake 1.12 - -Upstream-Status: Inappropriate - -automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, -and the warnings are treated as errors because of the -Werror parameter. - -These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not -eliminated these deprecated macros yet. So disable the treatment of warnings -as errors until gettext is updated to remove the deprecated macros. - -Signed-off-by: Nitin A Kamble -2012/07/10 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 261dad2..c4f935e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn at gnu.org]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Library code modified: REVISION++ diff --git a/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted file mode 100644 index 3c0559e..0000000 --- a/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Wed, 2 May 2012 18:05:19 -0700 -Subject: [PATCH] libtasn1: fix build with automake 1.12 - -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Nitin A Kamble -2012/05/03 - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8297649..7b9626e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) - AC_SUBST(LT_REVISION, 0) - AC_SUBST(LT_AGE, 6) - -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR -+ - AC_PROG_CC - gl_EARLY - lgl_EARLY diff --git a/meta-oe/recipes-extended/libidn/libidn_1.35.bb b/meta-oe/recipes-extended/libidn/libidn_1.35.bb index d5ce5b4..1057403 100644 --- a/meta-oe/recipes-extended/libidn/libidn_1.35.bb +++ b/meta-oe/recipes-extended/libidn/libidn_1.35.bb @@ -15,8 +15,6 @@ DEPENDS = "virtual/libiconv autoconf-archive" inherit pkgconfig autotools gettext texinfo gtk-doc SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ file://dont-depend-on-help2man.patch \ file://0001-idn-format-security-warnings.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 20:50:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 20:50:24 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158283662144.16237.16424085534397324409@git.openembedded.org> References: <158283662144.16237.16424085534397324409@git.openembedded.org> Message-ID: <20200227205021.E529D232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 732b40982fab54985c4cc7b3b595b9ee035e8c38 Author: Leo Yan AuthorDate: Wed Feb 26 12:26:22 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded at 436 with fuzz 1 (offset 123 lines)." Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 4 ++-- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch index c39ef6f..807cc44 100644 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h =================================================================== --- LuaJIT-2.0.5.orig/src/lj_arch.h +++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" +@@ -436,7 +436,7 @@ + #endif #endif #elif !LJ_TARGET_PS3 -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 90% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..2a72438 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.0.5+2.1.0-beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:07 +0000 Subject: [oe-commits] [openembedded-core] 02/28: gst-validate: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.504D6232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3e91f5fe5da8240aee8b68a008b4127f2ead36fc Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:35 2020 +0100 gst-validate: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb similarity index 87% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb index 7d602ea..35492fe 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "793e75f4717f718ad204c554d577b160" -SRC_URI[sha256sum] = "7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899" +SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c" +SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:06 +0000 Subject: [oe-commits] [openembedded-core] 01/28: acpica: upgrade 20191213 -> 20200214 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.45FDD232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 954495c274e5b38c2ad083cb57a6083034db33b3 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:34 2020 +0100 acpica: upgrade 20191213 -> 20200214 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../acpica/{acpica_20191213.bb => acpica_20200214.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/acpica/acpica_20191213.bb b/meta/recipes-extended/acpica/acpica_20200214.bb similarity index 88% rename from meta/recipes-extended/acpica/acpica_20191213.bb rename to meta/recipes-extended/acpica/acpica_20200214.bb index 6b1412e..cfa9fec 100644 --- a/meta/recipes-extended/acpica/acpica_20191213.bb +++ b/meta/recipes-extended/acpica/acpica_20200214.bb @@ -10,15 +10,15 @@ HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[md5sum] = "0f0eb38e796fac24c2aa4d9b6adcd950" -SRC_URI[sha256sum] = "304930df9836d3d4cdbf67a3ae6bd96dbc65f62602d869f571f4b6a12341e6c6" +SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113" +SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:09 +0000 Subject: [oe-commits] [openembedded-core] 04/28: webkitgtk: Disable GI data for musl/arm In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.64A63232C13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 95ff3a898ce28275f7a07bee486f2b0f7ac06935 Author: Khem Raj AuthorDate: Tue Feb 25 07:28:57 2020 -0800 webkitgtk: Disable GI data for musl/arm qemu-arm hangs forever when running gobject introspection Signed-off-by: Khem Raj Cc: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7bffc15 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -123,5 +123,10 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED_libc-musl_armv7a = "False" +GI_DATA_ENABLED_libc-musl_armv7ve = "False" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:08 +0000 Subject: [oe-commits] [openembedded-core] 03/28: ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.5B1C1232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 01ebff197c523d8cd13dc5f2274cfde46847a625 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:27 2020 +0100 ncurses: upgrade 6.1+20191019 -> 6.2 License-Update: copyright years and holders Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index b7bf4c0..4156bf4 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb similarity index 89% rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb rename to meta/recipes-core/ncurses/ncurses_6.2.bb index 187777f..b6d899c 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:05 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (c90780d -> 75ec188) Message-ID: <158284626580.17824.1321489948519066781@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard c90780d utils.bbclass: Avoid recursive symlink in oe_soinstall discard e704ad6 libedit/readline: Correct package alternatives link for manpage discard cd67cc6 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe discard 811c509 sysvinit: Fix install order/dependency discard c6b5005 webkitgtk: Disable GI data for musl/arm discard 27cee5e ncurses: upgrade 6.1+20191019 -> 6.2 discard f645881 gst-validate: upgrade 1.16.1 -> 1.16.2 discard a3fccd8 acpica: upgrade 20191213 -> 20200214 discard 52bf276 libgpg-error: upgrade 1.36 -> 1.37 new 954495c acpica: upgrade 20191213 -> 20200214 new 3e91f5f gst-validate: upgrade 1.16.1 -> 1.16.2 new 01ebff1 ncurses: upgrade 6.1+20191019 -> 6.2 new 95ff3a8 webkitgtk: Disable GI data for musl/arm new 3635e06 sysvinit: Fix install order/dependency new 113466a layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe new d2dfd3a libedit/readline: Correct package alternatives link for manpage new 44615d8 Revert "make: 4.2.1 -> 4.3" new 62547d6 ltp: Update to 20200120 new 95ae678 ltp: Remove mips related open_posix_testsuite patch new 4af7fb7 sysvinit: remove logsave.8 new 71af658 rt-tests: make manpages reproducible new de95b1f lsb-release: fix likely reproducabilty timestamp new e2f5572 tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES new 0267890 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR new 45e05cd systemd: Do not force removing resolved from PACKAGECONFIG new 90098a6 systemd: Drop local time64 patch in favour of upstreamed patches new c4572c7 go: Update to 1.14 release series new ebb7fc8 atk: upgrade 2.32.0 -> 2.34.1 new 32e209f at-spi2-core: upgrade 2.32.1 -> 2.34.0 new 04b6c92 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 new 741aec8 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk new 16da281 util-linux: upgrade 2.34 -> 2.35.1 new 9efcba6 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG new 35f32e1 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new db11d48 coreutils: add ptest new efe0e55 ptest-packagelists.inc: add coreutils to SLOW list new 75ec188 webkitgtk: Remove obsolete woff2 comment This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c90780d) \ N -- N -- N refs/heads/master-next (75ec188) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 28 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/utils.bbclass | 8 +- meta/conf/distro/include/maintainers.inc | 6 +- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/conf/distro/include/tcmode-default.inc | 2 +- .../machine/include/tune-cortexa72-cortexa53.inc | 4 +- meta/recipes-core/coreutils/coreutils/run-ptest | 17 +++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 ++++++ ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ----- meta/recipes-core/systemd/systemd_244.3.bb | 6 +- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ------ .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 +- ...1-allow-CC-and-CXX-to-have-multiple-words.patch | 7 +- ...-content-based-hash-generation-less-pedan.patch | 33 ++--- ...OLDIR-to-be-overridden-in-the-environment.patch | 11 +- .../0004-ld-add-soname-to-shareable-objects.patch | 11 +- ...verride-CC-when-building-dist-and-go_boot.patch | 9 +- ...-cmd-dist-separate-host-and-target-builds.patch | 37 +++--- ...07-cmd-go-make-GOROOT-precious-by-default.patch | 23 +--- .../0008-use-GOBUILDMODE-to-set-buildmode.patch | 9 +- ...ld-replace-glibc-dynamic-linker-with-musl.patch | 23 +--- ...-canadian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 .../{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../go/{go-native_1.13.bb => go-native_1.14.bb} | 0 .../go/{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../recipes-devtools/go/{go_1.13.bb => go_1.14.bb} | 0 meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ++++++++++ ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 ------ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 ------ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ++++++ ...tl-allow-being-detected-by-importing-proj.patch | 33 ----- .../0002-w32-compat-dirent.c-follow-header.patch | 36 ------ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ----------- meta/recipes-devtools/make/make_4.2.1.bb | 12 ++ meta/recipes-devtools/make/make_4.3.bb | 18 --- .../0001-Remove-timestamp-from-manpage.patch | 27 ++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 +----- ...-Add-option-to-select-libc-implementation.patch | 103 +++++---------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ----- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 ------ ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 ++++-- ...stcases-fix-an-absent-format-string-issue.patch | 24 ---- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 47 ------- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ----- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++-- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 9 +- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 31 ----- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 30 ----- .../linux-libc-headers/linux-libc-headers_5.4.bb | 2 - ...0001-gzip-with-n-for-build-reproducibilty.patch | 62 +++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 13 +- ...at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 +- ...-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 +- ...ld-enable-introspection-for-cross-compile.patch | 29 ----- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 +- .../libgpg-error-1.36-gawk5-support.patch | 144 +++++++++++++++++++++ .../{libgpg-error_1.37.bb => libgpg-error_1.36.bb} | 7 +- 64 files changed, 582 insertions(+), 952 deletions(-) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch rename meta/recipes-core/util-linux/{util-linux_2.34.bb => util-linux_2.35.1.bb} (63%) rename meta/recipes-devtools/go/{go-1.13.inc => go-1.14.inc} (81%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (83%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0004-ld-add-soname-to-shareable-objects.patch (82%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0006-cmd-dist-separate-host-and-target-builds.patch (95%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0007-cmd-go-make-GOROOT-precious-by-default.patch (79%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0008-use-GOBUILDMODE-to-set-buildmode.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (79%) rename meta/recipes-devtools/go/{go-cross-canadian_1.13.bb => go-cross-canadian_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.13.bb => go-cross_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.13.bb => go-native_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.13.bb => go-runtime_1.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.13.bb => go_1.14.bb} (100%) create mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch delete mode 100644 meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch delete mode 100644 meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch create mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch delete mode 100644 meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch delete mode 100644 meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch delete mode 100644 meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch create mode 100644 meta/recipes-devtools/make/make_4.2.1.bb delete mode 100644 meta/recipes-devtools/make/make_4.3.bb create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch create mode 100644 meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (66%) rename meta/recipes-support/atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} (83%) delete mode 100644 meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch rename meta/recipes-support/atk/{atk_2.32.0.bb => atk_2.34.1.bb} (73%) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.37.bb => libgpg-error_1.36.bb} (92%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:11 +0000 Subject: [oe-commits] [openembedded-core] 06/28: layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.7850523341A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 113466acb775e69ce3b29fea3ff1bebfdf560ae6 Author: Khem Raj AuthorDate: Tue Feb 25 09:51:26 2020 -0800 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe These are added as dependencies by mime class, which could be inherited along with allarch and dependencies silently go into target specific recipes and which then can result in sstate hash signature mismatches when the allarch recipes are reused for another arch [YOCTO #13805] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index fcdf9ae..60f8e26 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -43,6 +43,8 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-utils \ gstreamer1.0-meta-base \ ca-certificates \ + shared-mime-info \ + desktop-file-utils \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:10 +0000 Subject: [oe-commits] [openembedded-core] 05/28: sysvinit: Fix install order/dependency In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.6E454233419@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3635e06c8c712f5b68658fff6997cc13fe122a48 Author: Mark Hatle AuthorDate: Tue Feb 25 11:49:29 2020 -0600 sysvinit: Fix install order/dependency It is possible for sysvinit to be installed before the passwd/group files are installed from base-passwd. This results in an warning that the shutdown group can't be found. Adding a dependeny on base-passwd will resolve this issue. This has similar symptoms to the problem that oe-core commit 0227e929021263c51d2e7db36224000fecb01f1c fixed. The fix is simular in that it ensures that base-passwd is installed first, just at runtime vs setscene time. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 21ef0e9..63c1084 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -70,7 +70,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:12 +0000 Subject: [oe-commits] [openembedded-core] 07/28: libedit/readline: Correct package alternatives link for manpage In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.8141323341B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d2dfd3a96c6705c1947e8d2f6022702986b27e1a Author: Jeremy A. Puhlman AuthorDate: Tue Feb 25 11:25:44 2020 -0800 libedit/readline: Correct package alternatives link for manpage Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4babcbd..052e2d5 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 267fdcc..8d2d57a 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:16 +0000 Subject: [oe-commits] [openembedded-core] 11/28: sysvinit: remove logsave.8 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.A7AA123341F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4af7fb70efefbb748954e270a6cbdac0a78adf24 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:33 2020 -0800 sysvinit: remove logsave.8 logsave is a duplicate from e2fsprogs, which was already removed, but the man page remained which is also a duplicate. However it does not get modifed on install so it conflicts with the e2fsprogs version. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 63c1084..d2b85ed 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -110,4 +110,5 @@ do_install () { # Already provided by e2fsprogs; sysvinit's version is a copy from there rm ${D}${base_sbindir}/logsave + rm ${D}${mandir}/man8/logsave.8 } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:18 +0000 Subject: [oe-commits] [openembedded-core] 13/28: lsb-release: fix likely reproducabilty timestamp In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.BA032233421@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit de95b1f1bc6bc91ead0f13b833fd2bd4d9a944a8 Author: Jeremy A. Puhlman AuthorDate: Thu Feb 27 15:04:30 2020 -0800 lsb-release: fix likely reproducabilty timestamp Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Remove-timestamp-from-manpage.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 0000000..af095fd --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,27 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 +0000 +Subject: [PATCH] Remove timestamp from manpage + +Upstream-Status: Submitted [lsb-discuss at lists.linux-foundation.org] +Signed-off-by: Jeremy A. Puhlman +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e3026..a06cbcf 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:13 +0000 Subject: [oe-commits] [openembedded-core] 08/28: Revert "make: 4.2.1 -> 4.3" In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.8BA0423341C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 44615d87d63eab1f8b17f224cc50cf6c1365b540 Author: Richard Purdie AuthorDate: Thu Feb 27 23:15:05 2020 +0000 Revert "make: 4.2.1 -> 4.3" This reverts commit 7bde6c9a16c16f955700692061b5472127303644. --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 +++++++++++++++++++ ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 ----------- ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 ----------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 +++++++++++ ...tl-allow-being-detected-by-importing-proj.patch | 33 --------- .../0002-w32-compat-dirent.c-follow-header.patch | 36 ---------- .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ---------------------- meta/recipes-devtools/make/make_4.2.1.bb | 12 ++++ meta/recipes-devtools/make/make_4.3.bb | 18 ----- 10 files changed, 123 insertions(+), 246 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 4142cf2..b8905bc 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +5,9 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ + file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ + file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000..2b6e4d4 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,70 @@ +From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj + + dir.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +diff --git a/dir.c b/dir.c +index f34bbf5..12eef30 100644 +--- a/dir.c ++++ b/dir.c +@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) + } + #endif + ++/* Similarly for lstat. */ ++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) ++# ifndef VMS ++# ifndef HAVE_SYS_STAT_H ++int lstat (const char *path, struct stat *sbuf); ++# endif ++# else ++ /* We are done with the fake lstat. Go back to the real lstat */ ++# ifdef lstat ++# undef lstat ++# endif ++# endif ++# define local_lstat lstat ++#elif defined(WINDOWS32) ++/* Windows doesn't support lstat(). */ ++# define local_lstat local_stat ++#else ++static int ++local_lstat (const char *path, struct stat *buf) ++{ ++ int e; ++ EINTRLOOP (e, lstat (path, buf)); ++ return e; ++} ++#endif ++ + void + dir_setup_glob (glob_t *gl) + { + gl->gl_opendir = open_dirstream; + gl->gl_readdir = read_dirstream; + gl->gl_closedir = free; ++ gl->gl_lstat = local_lstat; + gl->gl_stat = local_stat; +- /* We don't bother setting gl_lstat, since glob never calls it. +- The slot is only there for compatibility with 4.4 BSD. */ + } + + void +-- +2.16.1 + diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch deleted file mode 100644 index 096bcfd..0000000 --- a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Fri, 21 Feb 2020 17:39:56 +0100 -Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX - -When cross compiling for a system without getloadavg, do not try add -additional linker paths unless it's absolutely necessary. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending - m4/getloadavg.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 -index 3bd2a14..696c5de 100644 ---- a/m4/getloadavg.m4 -+++ b/m4/getloadavg.m4 -@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], - fi - - if test $gl_func_getloadavg_done = no; then -+ AS_CASE([$host_os], -+ [aix*], [ - # There is a commonly available library for RS/6000 AIX. - # Since it is not a standard part of AIX, it might be installed locally. - gl_getloadavg_LIBS=$LIBS -@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], - AC_CHECK_LIB([getloadavg], [getloadavg], - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], - [LIBS=$gl_getloadavg_LIBS]) -+ ], [:]) - fi - - # Set up the replacement function if necessary. --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch deleted file mode 100644 index 5797082..0000000 --- a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 10:52:21 +0100 -Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning - -Fix compiler warning: - src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the - length of the source argument [-Wstringop-overflow=] - -The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the -size of the buffer is increased by 1 to hold a path with the length of -`MAXPATHLEN` and trailing `0`. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/dir.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/dir.c b/src/dir.c -index 862a18e..cad4c4a 100644 ---- a/src/dir.c -+++ b/src/dir.c -@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) - if (plen > 1 && path[plen - 1] == '.' - && (path[plen - 2] == '/' || path[plen - 2] == '\\')) - { -- char parent[MAXPATHLEN]; -+ char parent[MAXPATHLEN+1]; - -- strncpy (parent, path, plen - 2); -- parent[plen - 2] = '\0'; -+ strncpy (parent, path, MAXPATHLEN); -+ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; - if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) - return -1; - } --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000..d49acd9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,38 @@ +From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- +Upstream-Status: Backport + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64ec870..e87901c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], +-- +2.16.1 + diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch deleted file mode 100644 index b3d97f9..0000000 --- a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 12:10:06 +0100 -Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing - projects - -GNU project `make` relies on gnulib but provides some own compatibility -functions - including an `fcntl`, which fails on mingw. -The intension of gnulib is providing these functions and being wider tested, -but silently injecting a function opens battle of compatibility layers. - -So adding a hint into target `config.h` to allow deciding whether using -an own compatibility implementation or not. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending - - m4/gnulib-comp.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 3ee0811..cf75541 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -147,6 +147,7 @@ - gl_FUNC_FCNTL - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - AC_LIBOBJ([fcntl]) -+ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) - fi - gl_FCNTL_MODULE_INDICATOR([fcntl]) - gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch deleted file mode 100644 index 9ecc445..0000000 --- a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 11:12:43 +0100 -Subject: [PATCH 2/3] w32: compat: dirent.c: follow header - -src/w32/include/dirent.h completely delegates to mingw dirent implementation, -gnulib detects it as fine and completely usable - trust in that. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/w32/compat/dirent.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c -index b8ec615..de80f72 100644 ---- a/src/w32/compat/dirent.c -+++ b/src/w32/compat/dirent.c -@@ -23,7 +23,7 @@ this program. If not, see . */ - #include - #include "dirent.h" - -- -+#ifndef __MINGW32__ - DIR* - opendir(const char* pDirName) - { -@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) - - return; - } -+#endif /* !__MINGW32__ */ --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch deleted file mode 100644 index 70414c5..0000000 --- a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Fri, 21 Feb 2020 19:29:49 +0100 -Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated - -Rate the fcntl emulation from gnulib higher than the own one. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/output.h | 19 ++++++++++++++----- - src/w32/compat/posixfcn.c | 2 ++ - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/src/output.h b/src/output.h -index a506505..d3ce6b7 100644 ---- a/src/output.h -+++ b/src/output.h -@@ -67,14 +67,21 @@ void output_dump (struct output *out); - - # ifdef WINDOWS32 - /* For emulations in w32/compat/posixfcn.c. */ --# define F_GETFD 1 --# define F_SETLKW 2 -+# ifndef F_GETFD -+# define F_GETFD 1 -+# endif -+# ifndef F_SETLKW -+# define F_SETLKW 2 -+# endif - /* Implementation note: None of the values of l_type below can be zero - -- they are compared with a static instance of the struct, so zero - means unknown/invalid, see w32/compat/posixfcn.c. */ --# define F_WRLCK 1 --# define F_UNLCK 2 -- -+# ifndef F_WRLCK -+# define F_WRLCK 1 -+# endif -+# ifndef F_UNLCK -+# define F_UNLCK 2 -+# endif - struct flock - { - short l_type; -@@ -89,7 +96,9 @@ struct flock - typedef intptr_t sync_handle_t; - - /* Public functions emulated/provided in posixfcn.c. */ -+# ifndef HAVE_GNULIB_FCNTL - int fcntl (intptr_t fd, int cmd, ...); -+# endif - intptr_t create_mutex (void); - int same_stream (FILE *f1, FILE *f2); - -diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c -index 975dfb7..d337b9c 100644 ---- a/src/w32/compat/posixfcn.c -+++ b/src/w32/compat/posixfcn.c -@@ -29,6 +29,7 @@ this program. If not, see . */ - #ifndef NO_OUTPUT_SYNC - /* Support for OUTPUT_SYNC and related functionality. */ - -+#ifndef HAVE_GNULIB_FCNTL - /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ - int - fcntl (intptr_t fd, int cmd, ...) -@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) - return -1; - } - } -+#endif /* GNULIB_TEST_FCNTL */ - - static intptr_t mutex_handle = -1; - --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb new file mode 100644 index 0000000..c6e6a0c --- /dev/null +++ b/meta/recipes-devtools/make/make_4.2.1.bb @@ -0,0 +1,12 @@ +LICENSE = "GPLv3 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" +SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb deleted file mode 100644 index 70caf0a..0000000 --- a/meta/recipes-devtools/make/make_4.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -require make.inc - -SRC_URI += "\ - file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ - file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ - file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ - file://0002-w32-compat-dirent.c-follow-header.patch \ - file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ -" - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" -SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" - -BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:14 +0000 Subject: [oe-commits] [openembedded-core] 09/28: ltp: Update to 20200120 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.969C223341D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 62547d6e420c803b9ecdf9ce2374639e0e7efd20 Author: Petr Vorel AuthorDate: Thu Feb 27 22:29:39 2020 +0100 ltp: Update to 20200120 Removed ffsb copying file (tool removed from upstream) Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++------ ...-Add-option-to-select-libc-implementation.patch | 103 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 47 ---------- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +- 10 files changed, 80 insertions(+), 320 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f..773844d 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -25,34 +25,6 @@ index 504042e11..94db06266 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile index 8de247075..eb240f432 100644 --- a/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abc..0598046 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e731..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669..ecc6660 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0..0000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa..0000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325e..350091a 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 90% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc..579a763 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:19 +0000 Subject: [oe-commits] [openembedded-core] 14/28: tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.C491F233422@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e2f55725e96218dc4295cfc6d644f798d83ef50f Author: Jaewon Lee AuthorDate: Thu Jan 23 13:02:59 2020 -0800 tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES Without the proper default tune in TUNE_FEATURES, certain variables won't expand correctly. MACHINEOVERRIDES won't add cortexa72-cortexa53: TUNE_CCARGS won't add -mtune=cortexa72.cortexa-53, generating the toolchain incorrectly. Adding missing 'cortexa72-cortexa53' to both TUNE_FEATURES_tune-cortexa72-cortexa53 and TUNE_FEATURES_tune-cortexa72-cortexa53-crypto Signed-off-by: Jaewon Lee Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc index 0d43531..f208b98 100644 --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc @@ -14,8 +14,8 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", " - AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" -TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc}" -TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto}" +TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" +TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" BASE_LIB_tune-cortexa72-cortexa53 = "lib64" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:15 +0000 Subject: [oe-commits] [openembedded-core] 10/28: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.9F8C123341E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 95ae6782ec2a53ccefc45e77da19fcad0b49f226 Author: Petr Vorel AuthorDate: Thu Feb 27 22:29:40 2020 +0100 ltp: Remove mips related open_posix_testsuite patch Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1d..0000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 579a763..537cc72 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:17 +0000 Subject: [oe-commits] [openembedded-core] 12/28: rt-tests: make manpages reproducible In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.B0BC3233420@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 71af6583582b7df38be1ab382b1b57b1d5694ce7 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:34 2020 -0800 rt-tests: make manpages reproducible add -n to gzip call Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...0001-gzip-with-n-for-build-reproducibilty.patch | 62 ++++++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 0000000..3bafbbe --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 +0000 +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa1..dad252b 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ + file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:21 +0000 Subject: [oe-commits] [openembedded-core] 16/28: systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.DB939232B94@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 45e05cd9d16ceabb775a5e1d220958f3517613d2 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:56 2020 -0800 systemd: Do not force removing resolved from PACKAGECONFIG This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d86341..e7d2997 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ - resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " + # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:26 +0000 Subject: [oe-commits] [openembedded-core] 21/28: at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.2CDBD233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 04b6c92936510694546084a3f64034c3d121adc9 Author: Tim Orling AuthorDate: Wed Feb 26 16:06:02 2020 -0800 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb similarity index 66% rename from meta/recipes-support/atk/at-spi2-atk_2.32.0.bb rename to meta/recipes-support/atk/at-spi2-atk_2.34.1.bb index b717a9c..b09cb6a 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -1,10 +1,10 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" -SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:27 +0000 Subject: [oe-commits] [openembedded-core] 22/28: maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.37FAA23342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 741aec87056855b7796aec5f1408f4cd4989ef3a Author: Tim Orling AuthorDate: Wed Feb 26 16:06:03 2020 -0800 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk For GUI automation purposes, strong motivation for accessibility (a11y) via python3-dogtail and python3-pyatspi2, so taking over from Anuj. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ac..10095ff 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -49,9 +49,9 @@ RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal " RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal " -RECIPE_MAINTAINER_pn-atk = "Anuj Mittal " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling " +RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling " +RECIPE_MAINTAINER_pn-atk = "Tim Orling " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:20 +0000 Subject: [oe-commits] [openembedded-core] 15/28: linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.CE354233423@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0267890fcf89ecf200d92d4d5d0d9d3156306d51 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:55 2020 -0800 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR __UAPI_DEF_ETHHDR has been defined in kernel UAPI [1] and musl already defined it to 0 via [2] So these patches can now be dropped. [1] https://patchwork.ozlabs.org/patch/872502/ [2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 31 ---------------------- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 30 --------------------- .../linux-libc-headers/linux-libc-headers_5.4.bb | 2 -- 3 files changed, 63 deletions(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch deleted file mode 100644 index 68b2446..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 1 Mar 2018 18:31:01 -0500 -Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file - -Signed-off-by: Bruce Ashfield -Upstream-Status: Pending ---- - include/uapi/linux/if_ether.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 153c9c2..7b69b73 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -149,6 +149,12 @@ - * This is an Ethernet frame header. - */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ - #ifndef __UAPI_DEF_ETHHDR - #define __UAPI_DEF_ETHHDR 1 --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index fb7e1de..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Wed, 22 Jan 2014 00:57:48 +0100 -Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr - ---- -Signed-off-by: Khem Raj -Upstream-Status: Submitted - - include/uapi/linux/if_ether.h | 4 +++- - include/uapi/linux/libc-compat.h | 6 ++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: linux-4.15/include/uapi/linux/libc-compat.h -=================================================================== ---- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 -+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 -@@ -51,6 +51,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 5037739..8a12103 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -2,10 +2,8 @@ require linux-libc-headers.inc SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:29 +0000 Subject: [oe-commits] [openembedded-core] 24/28: webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.4E931233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9efcba6c76a6f12471b04762403221a415e48a62 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:36 2020 +0200 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7bffc15..cc69653 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:30 +0000 Subject: [oe-commits] [openembedded-core] 25/28: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.5F511233419@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 35f32e1044f6f33ed14deec4e6ce9a5b3469e9e6 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:37 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index cc69653..190bc78 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:22 +0000 Subject: [oe-commits] [openembedded-core] 17/28: systemd: Drop local time64 patch in favour of upstreamed patches In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233106.EEB39232B93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 90098a621c1ab8c4fc36c8357f3070295fd40363 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:57 2020 -0800 systemd: Drop local time64 patch in favour of upstreamed patches https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ---------------------- meta/recipes-core/systemd/systemd_244.3.bb | 3 +-- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch deleted file mode 100644 index 33c5758..0000000 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Dec 2019 12:49:07 -0800 -Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout - -kernel prior to 64bit time_t support might not entertain such large -timeout therefore reduce it to INT_MAX which would set timer expiration -event after 68 years of uptime, should be good for all practical -purposes - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - src/basic/time-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index d7ef30d2fe52..4d3219f114b5 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1487,7 +1487,7 @@ int time_change_fd(void) { - - /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ - static const struct itimerspec its = { -- .it_value.tv_sec = TIME_T_MAX, -+ .it_value.tv_sec = INT_MAX, - }; - - _cleanup_close_ int fd; diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index e7d2997..dfb7ad5 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ + file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://99-default.preset \ " # patches needed by musl @@ -42,7 +42,6 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:32 +0000 Subject: [oe-commits] [openembedded-core] 27/28: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.796F623341B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit efe0e5598a111c889a9330341bdd9447f37f98ac Author: Trevor Gamblin AuthorDate: Wed Feb 26 10:07:46 2020 -0800 ptest-packagelists.inc: add coreutils to SLOW list Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 4afac58..54ace39 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -65,6 +65,7 @@ PTESTS_FAST = "\ PTESTS_SLOW = "\ babeltrace-ptest \ busybox-ptest \ + coreutils-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ glib-2.0-ptest \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:28 +0000 Subject: [oe-commits] [openembedded-core] 23/28: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.4416C233430@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 16da28106ed664f4a4160f467ba99e7e365a3316 Author: Pierre-Jean Texier AuthorDate: Wed Feb 26 18:35:06 2020 +0100 util-linux: upgrade 2.34 -> 2.35.1 License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 ++- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb similarity index 63% rename from meta/recipes-core/util-linux/util-linux_2.34.bb rename to meta/recipes-core/util-linux/util-linux_2.35.1.bb index 557449d..03afd2a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -7,8 +7,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:33 +0000 Subject: [oe-commits] [openembedded-core] 28/28: webkitgtk: Remove obsolete woff2 comment In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.8534B23341C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 75ec188a3425947698598ee184718c91690ac90f Author: Adrian Bunk AuthorDate: Wed Feb 26 13:49:23 2020 +0200 webkitgtk: Remove obsolete woff2 comment woff2 is now available in meta-webkit. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 190bc78..e4197d1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -55,7 +55,6 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" -# Source is at https://github.com/google/woff2 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:25 +0000 Subject: [oe-commits] [openembedded-core] 20/28: at-spi2-core: upgrade 2.32.1 -> 2.34.0 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.22AB7232C13@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 32e209f530841053c317c443a58921c46153316d Author: Tim Orling AuthorDate: Wed Feb 26 16:06:01 2020 -0800 at-spi2-core: upgrade 2.32.1 -> 2.34.0 Release notes: https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/6da122f1e8d6b02dda0f368610ab72fc3d1720cf/NEWS License-Update: Changed to LPGL-2.1+ Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb similarity index 83% rename from meta/recipes-support/atk/at-spi2-core_2.32.1.bb rename to meta/recipes-support/atk/at-spi2-core_2.34.0.bb index 18b5de2..84e05e7 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -1,15 +1,15 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Fix-source-reproducibility.patch" -SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254" -SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53" +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" X11DEPENDS = "virtual/libx11 libxi libxtst" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:23 +0000 Subject: [oe-commits] [openembedded-core] 18/28: go: Update to 1.14 release series In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.0AB14232B95@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c4572c7f1834301589f2bdb39229c3483d2b2068 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:58 2020 -0800 go: Update to 1.14 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++--- ...1-allow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...-content-based-hash-generation-less-pedan.patch | 33 ++++++++----------- ...OLDIR-to-be-overridden-in-the-environment.patch | 11 ++----- .../0004-ld-add-soname-to-shareable-objects.patch | 11 ++----- ...verride-CC-when-building-dist-and-go_boot.patch | 9 ++---- ...-cmd-dist-separate-host-and-target-builds.patch | 37 ++++++++++------------ ...07-cmd-go-make-GOROOT-precious-by-default.patch | 23 ++++---------- .../0008-use-GOBUILDMODE-to-set-buildmode.patch | 9 ++---- ...ld-replace-glibc-dynamic-linker-with-musl.patch | 23 ++------------ ...-canadian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 .../{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../go/{go-native_1.13.bb => go-native_1.14.bb} | 0 .../go/{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../recipes-devtools/go/{go_1.13.bb => go_1.14.bb} | 0 17 files changed, 53 insertions(+), 120 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e957e3a..31d4b3b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" -GOVERSION ?= "1.13%" +GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "9.0.1" diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc similarity index 81% rename from meta/recipes-devtools/go/go-1.13.inc rename to meta/recipes-devtools/go/go-1.14.inc index 7780ace..ac7b95c 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.13" -GO_MINOR = ".8" +GO_BASEVERSION = "1.14" +GO_MINOR = "" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" -SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" +SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" +SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e4..d47664d 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch @@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 17852de..7b5ec5e 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { +@@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { @@ -33,6 +31,3 @@ index 17852de..7b5ec5e 100644 } env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch rename to meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 4eddd39..9e88567 100644 --- a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -50,11 +50,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 19 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 7b5ec5e..292f117 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar { +@@ -156,7 +156,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { var b work.Builder b.Init() @@ -63,8 +61,6 @@ index 7b5ec5e..292f117 100644 if err != nil { // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 7dd9a90..ccebaf8 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -32,6 +32,8 @@ import ( @@ -76,16 +72,16 @@ index 7dd9a90..ccebaf8 100644 // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - // The compiler hides the exact value of $GOROOT - // when building things in GOROOT. +@@ -208,7 +210,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. + // When -trimpath is used with a package built from the module cache, + // use the module path and version instead of the directory. - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { fmt.Fprintf(h, "dir %s\n", p.Dir) - } - fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) -@@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + } else if cfg.BuildTrimpath && p.Module != nil { + fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) +@@ -224,13 +226,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -103,7 +99,7 @@ index 7dd9a90..ccebaf8 100644 } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2229,33 +2231,48 @@ var ( +@@ -2228,33 +2230,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -161,7 +157,7 @@ index 7dd9a90..ccebaf8 100644 } // compilerExe returns the compiler to use given an -@@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string { +@@ -2263,11 +2280,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -179,7 +175,7 @@ index 7dd9a90..ccebaf8 100644 return compiler } -@@ -2429,7 +2451,7 @@ func envList(key, def string) []string { +@@ -2428,7 +2450,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -188,7 +184,7 @@ index 7dd9a90..ccebaf8 100644 defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2447,6 +2469,14 @@ func (b *Builder) CFlags(p *load.Package return } @@ -203,7 +199,7 @@ index 7dd9a90..ccebaf8 100644 return } -@@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2461,7 +2491,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -212,7 +208,7 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return nil, nil, err } -@@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -2820,7 +2850,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -221,6 +217,3 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return "", "", err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch similarity index 83% rename from meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 9aa0119..662c705 100644 --- a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 9e50311..683ca6f 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -244,7 +244,9 @@ func xinit() { +@@ -246,7 +246,9 @@ func xinit() { workdir = xworkdir() xatexit(rmworkdir) @@ -32,11 +30,9 @@ index 9e50311..683ca6f 100644 } // compilerEnv returns a map from "goos/goarch" to the -diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a3277a6..db96350 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -60,7 +60,11 @@ func defaultContext() build.Context { +@@ -64,7 +64,11 @@ func defaultContext() build.Context { // variables. This matches the initialization of ToolDir in // go/build, except for using ctxt.GOROOT rather than // runtime.GOROOT. @@ -49,6 +45,3 @@ index a3277a6..db96350 100644 } ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch similarity index 82% rename from meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch index 40763ad..75c9c75 100644 --- a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 3fa258d..f96fb02 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() { +@@ -1280,6 +1280,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -29,7 +27,7 @@ index 3fa258d..f96fb02 100644 if ctxt.HeadType != objabi.Hwindows { // Pass -z nodelete to mark the shared library as // non-closeable: a dlclose will do nothing. -@@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() { +@@ -1291,6 +1292,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -37,7 +35,7 @@ index 3fa258d..f96fb02 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() { +@@ -1299,6 +1301,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -45,6 +43,3 @@ index 3fa258d..f96fb02 100644 } } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 4f2a46c..59c12d9 100644 --- a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/make.bash b/src/make.bash -index 92d1481..0c2822f 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; exit 1 fi rm -f cmd/dist/dist @@ -30,7 +28,7 @@ index 92d1481..0c2822f 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -208,7 +208,7 @@ fi +@@ -209,7 +209,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. # Throw ours, built with Go 1.4, away after bootstrap. @@ -39,6 +37,3 @@ index 92d1481..0c2822f 100755 rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch similarity index 95% rename from meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch index 354aaca..7aee0ba 100644 --- a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch @@ -38,8 +38,6 @@ Signed-off-by: Alexander J Kube src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ 1 file changed, 112 insertions(+), 43 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 683ca6f..0ad082b 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -41,6 +41,7 @@ var ( @@ -58,7 +56,7 @@ index 683ca6f..0ad082b 100644 vflag int // verbosity ) -@@ -247,6 +249,8 @@ func xinit() { +@@ -249,6 +251,8 @@ func xinit() { if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) } @@ -67,7 +65,7 @@ index 683ca6f..0ad082b 100644 } // compilerEnv returns a map from "goos/goarch" to the -@@ -478,8 +482,10 @@ func setup() { +@@ -480,8 +484,10 @@ func setup() { p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { xremoveall(p) @@ -78,7 +76,7 @@ index 683ca6f..0ad082b 100644 if goos != gohostos || goarch != gohostarch { p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1207,12 +1213,29 @@ func cmdbootstrap() { +@@ -1244,12 +1250,29 @@ func cmdbootstrap() { var noBanner bool var debug bool @@ -109,7 +107,7 @@ index 683ca6f..0ad082b 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1266,8 +1289,13 @@ func cmdbootstrap() { +@@ -1303,8 +1326,13 @@ func cmdbootstrap() { xprintf("\n") } @@ -125,7 +123,7 @@ index 683ca6f..0ad082b 100644 goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gobin) if debug { -@@ -1296,7 +1324,11 @@ func cmdbootstrap() { +@@ -1333,7 +1361,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -138,7 +136,7 @@ index 683ca6f..0ad082b 100644 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) if debug { run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -@@ -1333,50 +1365,84 @@ func cmdbootstrap() { +@@ -1370,50 +1402,84 @@ func cmdbootstrap() { } checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) @@ -190,8 +188,6 @@ index 683ca6f..0ad082b 100644 - timelog("build", "host toolchain") - if vflag > 0 { - xprintf("\n") -- } -- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) + + if goos == oldgoos && goarch == oldgoarch { + // Common case - not setting up for cross-compilation. @@ -223,7 +219,8 @@ index 683ca6f..0ad082b 100644 + os.Setenv("GOARCH", goarch) + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) -+ } + } +- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) goInstall(goBootstrap, "std", "cmd") checkNotStale(goBootstrap, "std", "cmd") checkNotStale(cmdGo, "std", "cmd") @@ -231,12 +228,7 @@ index 683ca6f..0ad082b 100644 - timelog("build", "target toolchain") - if vflag > 0 { - xprintf("\n") -+ if debug { -+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) -+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) -+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) - } +- } - goos = oldgoos - goarch = oldgoarch - os.Setenv("GOOS", goos) @@ -257,10 +249,16 @@ index 683ca6f..0ad082b 100644 - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ if debug { ++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") ++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) ++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) ++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ } } // Check that there are no new files in $GOROOT/bin other than -@@ -1393,8 +1459,11 @@ func cmdbootstrap() { +@@ -1430,8 +1496,11 @@ func cmdbootstrap() { } } @@ -274,6 +272,3 @@ index 683ca6f..0ad082b 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch index e232c79..b93f83d 100644 --- a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch @@ -27,11 +27,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) -diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 33b7818..7617b4c 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { +@@ -670,6 +670,9 @@ func (b *Builder) addTransitiveLinkDeps( if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -41,11 +39,9 @@ index 33b7818..7617b4c 100644 haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 9305b2d..6560317 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -155,6 +155,8 @@ See also: go install, go get, go clean. +@@ -167,6 +167,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -54,10 +50,10 @@ index 9305b2d..6560317 100644 func init() { // break init cycle CmdBuild.Run = runBuild -@@ -167,6 +169,10 @@ func init() { +@@ -179,6 +181,10 @@ func init() { - AddBuildFlags(CmdBuild) - AddBuildFlags(CmdInstall) + AddBuildFlags(CmdBuild, DefaultBuildFlags) + AddBuildFlags(CmdInstall, DefaultBuildFlags) + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -65,11 +61,9 @@ index 9305b2d..6560317 100644 } // Note that flags consulted by other parts of the code -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index ccebaf8..59450d7 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) { +@@ -464,6 +464,23 @@ func (b *Builder) build(a *Action) (err return errors.New("binary-only packages are no longer supported") } @@ -93,7 +87,7 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) { +@@ -1493,6 +1510,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } @@ -108,6 +102,3 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch rename to meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch index 68e132f..b15d981 100644 --- a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -23,11 +23,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 6560317..5f3a988 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) { +@@ -251,7 +251,13 @@ func AddBuildFlags(cmd *base.Command, ma cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -41,7 +39,4 @@ index 6560317..5f3a988 100644 + cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") - cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.17.1 (Apple Git-112) - + if mask&OmitModFlag == 0 { diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch rename to meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch index 4bb1106..427cfb0 100644 --- a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch +++ b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch @@ -25,11 +25,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/x86/obj.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go -index 23741eb..8e74576 100644 --- a/src/cmd/link/internal/amd64/obj.go +++ b/src/cmd/link/internal/amd64/obj.go -@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) { +@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { PEreloc1: pereloc1, TLSIEtoLE: tlsIEtoLE, @@ -38,8 +36,6 @@ index 23741eb..8e74576 100644 Freebsddynld: "/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go -index 45a406e..724d3e3 100644 --- a/src/cmd/link/internal/arm/obj.go +++ b/src/cmd/link/internal/arm/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -51,8 +47,6 @@ index 45a406e..724d3e3 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go -index 7c66623..d8b1db1 100644 --- a/src/cmd/link/internal/arm64/obj.go +++ b/src/cmd/link/internal/arm64/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -62,10 +56,8 @@ index 7c66623..d8b1db1 100644 - Linuxdynld: "/lib/ld-linux-aarch64.so.1", + Linuxdynld: "/lib/ld-musl-aarch64.so.1", - Freebsddynld: "XXX", + Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", -diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go -index 231e1ff..631dd7a 100644 --- a/src/cmd/link/internal/mips/obj.go +++ b/src/cmd/link/internal/mips/obj.go @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -77,8 +69,6 @@ index 231e1ff..631dd7a 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go -index 9604208..5ef3ffc 100644 --- a/src/cmd/link/internal/mips64/obj.go +++ b/src/cmd/link/internal/mips64/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -90,8 +80,6 @@ index 9604208..5ef3ffc 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", Netbsddynld: "XXX", -diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go -index 51d1791..b15da85 100644 --- a/src/cmd/link/internal/ppc64/obj.go +++ b/src/cmd/link/internal/ppc64/obj.go @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -103,8 +91,6 @@ index 51d1791..b15da85 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go -index 3454476..42cc346 100644 --- a/src/cmd/link/internal/s390x/obj.go +++ b/src/cmd/link/internal/s390x/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -116,8 +102,6 @@ index 3454476..42cc346 100644 // not relevant for s390x Freebsddynld: "XXX", -diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go -index f1fad20..d2ca10c 100644 --- a/src/cmd/link/internal/x86/obj.go +++ b/src/cmd/link/internal/x86/obj.go @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -129,6 +113,3 @@ index f1fad20..d2ca10c 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/usr/libexec/ld.elf_so", --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.13.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.14.bb diff --git a/meta/recipes-devtools/go/go-cross_1.13.bb b/meta/recipes-devtools/go/go-cross_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.13.bb rename to meta/recipes-devtools/go/go-cross_1.14.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.13.bb rename to meta/recipes-devtools/go/go-crosssdk_1.14.bb diff --git a/meta/recipes-devtools/go/go-native_1.13.bb b/meta/recipes-devtools/go/go-native_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.13.bb rename to meta/recipes-devtools/go/go-native_1.14.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.13.bb b/meta/recipes-devtools/go/go-runtime_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.13.bb rename to meta/recipes-devtools/go/go-runtime_1.14.bb diff --git a/meta/recipes-devtools/go/go_1.13.bb b/meta/recipes-devtools/go/go_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.13.bb rename to meta/recipes-devtools/go/go_1.14.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:24 +0000 Subject: [oe-commits] [openembedded-core] 19/28: atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.16279232B96@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ebb7fc8aa2573c330e9dba81fcf685d9d118ffd5 Author: Tim Orling AuthorDate: Wed Feb 26 16:06:00 2020 -0800 atk: upgrade 2.32.0 -> 2.34.1 Patch no longer applies (nor is needed) upstream. Release notes: https://gitlab.gnome.org/GNOME/atk/-/raw/633bde11f93ee971ba8902c6fadbc29c121f71af/NEWS Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...ld-enable-introspection-for-cross-compile.patch | 29 ---------------------- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc..0000000 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.32.0.bb b/meta/recipes-support/atk/atk_2.34.1.bb similarity index 73% rename from meta/recipes-support/atk/atk_2.32.0.bb rename to meta/recipes-support/atk/atk_2.34.1.bb index 6722372..277397c 100644 --- a/meta/recipes-support/atk/atk_2.32.0.bb +++ b/meta/recipes-support/atk/atk_2.34.1.bb @@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:31:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:31:31 +0000 Subject: [oe-commits] [openembedded-core] 26/28: coreutils: add ptest In-Reply-To: <158284626580.17824.1321489948519066781@git.openembedded.org> References: <158284626580.17824.1321489948519066781@git.openembedded.org> Message-ID: <20200227233107.6AF5623341A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit db11d48c118ecebf30b189dce6e4f5f5a15b9509 Author: Trevor Gamblin AuthorDate: Wed Feb 26 10:07:45 2020 -0800 coreutils: add ptest coreutils has a large number of tests, including some added by the Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that significantly increase runtime (and which have been disabled). Note that the coreutils ptest directory is given blanket permissions at runtime with chmod -R 777, to ensure that the user created for the tests will be able to run the test scripts and create the necessary files in the process without being impeded by permissions issues. There is still room to improve the results of this ptest without the aforementioned additions. Of the tests marked SKIP, there are 30 tests that are currently counted as SKIP because they require sudo permissions, and another 21 that require membership in multiple user groups. It is important to know that coreutils has tests for both root and non-root users. Testing showed that 42 tests are skipped when running as root versus 30 when running as a non-root user, so the decision was made to run the suite as the latter. Additionally, gdb, valgrind, and strace could be included in the RDEPENDS list to increase pass rate, but their total contribution is 13 tests, so they were omitted to reduce image size. Finally, note that at least one ptest (misc/head-write-error.sh) is prone to ERROR on builds of core-image-minimal if extra space is not provided with IMAGE_ROOTFS_EXTRA_SPACE. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils/run-ptest | 17 ++++++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest b/meta/recipes-core/coreutils/coreutils/run-ptest new file mode 100755 index 0000000..6d4a7b3 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# remove any stale lock files so that the calls to groupadd/useradd don't stop +# the ptest if re-using the same image +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock + +COREUTILSLIB=@libdir@/coreutils +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" +USERNAME="tester" +groupadd ugroup1 +groupadd ugroup2 +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists" + +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} +userdel $USERNAME +groupdel ugroup1 +groupdel ugroup2 diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 57b2c1b..8bec4e0 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ + file://run-ptest \ " SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" @@ -143,3 +144,39 @@ python __anonymous() { } BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` + install -d ${D}${PTEST_PATH}/build-aux + install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ + cp ${B}/Makefile ${D}${PTEST_PATH}/ + cp ${S}/init.cfg ${D}${PTEST_PATH}/ + cp -r ${B}/src ${D}${PTEST_PATH}/ + cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src + sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile + sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile + chmod -R 777 ${D}${PTEST_PATH} + + # Disable subcase stty-pairs.sh, it will cause test framework hang + sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile + + # Tweak test d_type-check to use python3 instead of python + sed -i "1s at .*@#!/usr/bin/python3@" ${WORKDIR}/image/usr/lib/coreutils/ptest/tests/d_type-check + install ${B}/src/getlimits ${D}/${bindir} + + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} + +FILES_${PN}-ptest += "${bindir}/getlimits" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Feb 27 23:58:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 27 Feb 2020 23:58:51 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (f95eb5b -> b09d0bd) Message-ID: <158284793142.24611.14701738527913254463@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from f95eb5b python3-networkx: upgrade 2.3 -> 2.4 add 6820d9e ipmiutil: gzip man pages with out timestamp add 7d06fdd libidn: Moved from OE-core add b60c61a xfsdump: 3.1.8 -> 3.1.9 add 1fd5ea4 dhcpcd: upgrade 8.1.5 -> 8.1.6 add 047737e kea: upgrade 1.7.3 -> 1.7.4 add 0af6e98 fluidsynth: upgrade 2.1.0 -> 2.1.1 add 691e76b xfce4-sensors-plugin: upgrade 1.2.97 -> 1.3.92 add e37bcbc xfce4-sensors-plugin: Change defaults to useful ones add 7cd1a97 span-lite: Add git version add da1f9f6 inotify-tools: upgrade 3.20.1 -> 3.20.2.2 add a38a73e libuv: upgrade 1.34.0 -> 1.34.2 add fc8f28c nginx: fix error during service startup add 383f19d cfengine-masterfiles: Make the expression dash friendly add f4ef3fe layer.conf: Add shared-mime-info and desktop-file-utils to safe sigs for phoronix-test-suite add c668961 libvncserver: don't enable sasl support by default add e92cbff c-ares: move from meta-networking to meta-oe add 997067e fdk-aac: add initial fdk-aac recipe add fba148f libharu: New recipe add 08a97cb ttf-noto-emoji: add recipe add d664461 upm: Update SRC_URI add 4fc18c9 open-lldp: Add initial version 1.0.1 add ed79366 can-utils: update to v2020.02.04 add 62b3a48 cyrus-sasl: fix CVE-2019-19906 add 89f1b6d xfce4-weather-plugin: upgrade 0.10.0 -> 0.10.1 add 22645f5 gegl: upgrade 0.4.20 -> 0.4.22 add eb07ee7 gimp: upgrade 2.10.14 -> 2.10.18 add dfdb329 drbd-utils: upgrade 9.11.0 -> 9.12.0 add 0c50aa6 iscsi-initiator-utils: upgrade 2.0.878 -> 2.1.0 add 90f5d4d openipmi: upgrade 2.0.27 -> 2.0.28 add 5f4636f rdma-core: upgrade 27.0 -> 28.0 add f8eb735 uftp: upgrade 4.10 -> 4.10.1 add 9825d4c libev: upgrade 4.27 -> 4.31 add d487494 libmbim: upgrade 1.20.4 -> 1.22.0 add 40d3b71 cpprest: update to 2.10.15 and refresh patches add f101d80 boinc: update recipe to version 7.16.5 add 9cbb406 gensio: new package add acd1bfd ser2net: upgrade 3.5.1 -> 4.1.2 add 31557db libidn: Remove obsolete patches for issues already fixed upstream add b09d0bd libp11: revert version back to the 0.4.10 release No new revisions were added by this update. Summary of changes: .../files/work-with-new-version-of-xfsprogs.patch | 28 ---- .../xfsdump/{xfsdump_3.1.8.bb => xfsdump_3.1.9.bb} | 5 +- .../gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} | 4 +- .../gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} | 4 +- .../Fraunhofer_FDK_AAC_Codec_Library_for_Android | 92 +++++++++++ .../recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb | 22 +++ .../recipes-multimedia/fluidsynth/fluidsynth.inc | 4 +- .../dhcpcd/{dhcpcd_8.1.5.bb => dhcpcd_8.1.6.bb} | 4 +- .../kea/{kea_1.7.3.bb => kea_1.7.4.bb} | 6 +- .../packagegroups/packagegroup-meta-networking.bb | 2 +- .../cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch | 35 ++++ .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 1 + ...s_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} | 2 +- .../files/0001-Fix-musl-libc-build-issue.patch | 26 +++ ...s-Add-include-path-to-generated-version.h.patch | 29 ++++ ...dd-option-to-disable-installation-of-syst.patch | 57 +++++++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 33 ++++ .../{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} | 6 +- ..._bmc_emu.c-include-readline.h-from-readli.patch | 31 ---- .../{openipmi_2.0.27.bb => openipmi_2.0.28.bb} | 5 +- ...0001-Remove-man-files-which-cant-be-built.patch | 11 +- ...-Use-sched_yield-instead-of-pthread_yield.patch | 30 ---- .../{rdma-core_27.0.bb => rdma-core_28.0.bb} | 3 +- .../uftp/{uftp_4.10.bb => uftp_4.10.1.bb} | 4 +- meta-oe/conf/layer.conf | 3 + ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 ++++++++++++ .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 +++ .../libev/{libev_4.27.bb => libev_4.31.bb} | 4 +- .../libmbim/libmbim/clang.patch | 73 --------- .../{libmbim_1.20.4.bb => libmbim_1.22.0.bb} | 9 +- .../libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} | 2 +- .../ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} | 6 +- .../packagegroups/packagegroup-meta-oe.bb | 2 +- .../recipes-extended/boinc/boinc-client_7.16.bb | 2 +- .../cfengine/cfengine-masterfiles_3.15.0.bb | 2 +- .../libidn/0001-idn-format-security-warnings.patch | 181 +++++++++++++++++++++ .../libidn/libidn/dont-depend-on-help2man.patch | 23 +++ meta-oe/recipes-extended/libidn/libidn_1.35.bb | 40 +++++ .../recipes-extended/socketcan/can-utils_git.bb | 8 +- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- .../libvncserver/libvncserver_0.9.12.bb | 1 - .../ttf-fonts/ttf-noto-emoji_20190815.bb | 19 +++ ...ess-times-from-changing-resulting-gzip-md.patch | 25 +++ meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.5.bb | 1 + .../c-ares/c-ares/cmake-install-libcares.pc.patch | 0 .../recipes-support/c-ares/c-ares_1.15.0.bb | 0 .../cpprest/cpprest/disable-outside-tests.patch | 43 +---- .../{cpprest_2.10.14.bb => cpprest_2.10.15.bb} | 4 +- ...001-Makefile.am-add-build-rule-for-README.patch | 46 ++++++ .../inotify-nosys-fix-system-call-number.patch | 31 ---- .../inotify-tools/inotify-tools_git.bb | 8 +- .../libharu/libharu-RELEASE_2_3_0_cmake.patch | 52 ++++++ meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 23 +++ .../libp11/{libp11_11.bb => libp11_0.4.10.bb} | 2 +- meta-oe/recipes-support/span-lite/span-lite_git.bb | 12 ++ .../nginx/files/nginx-fix-pidfile.patch | 99 +++++++++++ meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + ...k-for-sys-class-power_supply-we-are-cross.patch | 44 +++++ ...in_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} | 7 +- ...in_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} | 4 +- 60 files changed, 1068 insertions(+), 290 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch rename meta-filesystems/recipes-utils/xfsdump/{xfsdump_3.1.8.bb => xfsdump_3.1.9.bb} (87%) rename meta-gnome/recipes-gimp/gegl/{gegl_0.4.20.bb => gegl_0.4.22.bb} (93%) rename meta-gnome/recipes-gimp/gimp/{gimp_2.10.14.bb => gimp_2.10.18.bb} (91%) create mode 100644 meta-multimedia/licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android create mode 100644 meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb rename meta-networking/recipes-connectivity/dhcpcd/{dhcpcd_8.1.5.bb => dhcpcd_8.1.6.bb} (86%) rename meta-networking/recipes-connectivity/kea/{kea_1.7.3.bb => kea_1.7.4.bb} (90%) create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0.878.bb => iscsi-initiator-utils_2.1.0.bb} (98%) create mode 100644 meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch create mode 100644 meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch create mode 100644 meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch create mode 100644 meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb rename meta-networking/recipes-support/drbd/{drbd-utils_9.11.0.bb => drbd-utils_9.12.0.bb} (93%) delete mode 100644 meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch rename meta-networking/recipes-support/openipmi/{openipmi_2.0.27.bb => openipmi_2.0.28.bb} (95%) delete mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-sched_yield-instead-of-pthread_yield.patch rename meta-networking/recipes-support/rdma-core/{rdma-core_27.0.bb => rdma-core_28.0.bb} (90%) rename meta-networking/recipes-support/uftp/{uftp_4.10.bb => uftp_4.10.1.bb} (77%) create mode 100644 meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch create mode 100644 meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb rename meta-oe/recipes-connectivity/libev/{libev_4.27.bb => libev_4.31.bb} (80%) delete mode 100644 meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch rename meta-oe/recipes-connectivity/libmbim/{libmbim_1.20.4.bb => libmbim_1.22.0.bb} (76%) rename meta-oe/recipes-connectivity/libuv/{libuv_1.34.0.bb => libuv_1.34.2.bb} (90%) rename meta-oe/recipes-connectivity/ser2net/{ser2net_3.5.1.bb => ser2net_4.1.2.bb} (67%) create mode 100644 meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch create mode 100644 meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch create mode 100644 meta-oe/recipes-extended/libidn/libidn_1.35.bb create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb create mode 100644 meta-oe/recipes-kernel/ipmiutil/ipmiutil/0001-Prevent-access-times-from-changing-resulting-gzip-md.patch rename {meta-networking => meta-oe}/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch (100%) rename {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb (100%) rename meta-oe/recipes-support/cpprest/{cpprest_2.10.14.bb => cpprest_2.10.15.bb} (91%) create mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch delete mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch create mode 100644 meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch create mode 100644 meta-oe/recipes-support/libharu/libharu_2.3.0.bb rename meta-oe/recipes-support/libp11/{libp11_11.bb => libp11_0.4.10.bb} (93%) create mode 100644 meta-oe/recipes-support/span-lite/span-lite_git.bb create mode 100644 meta-webserver/recipes-httpd/nginx/files/nginx-fix-pidfile.patch create mode 100644 meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch rename meta-xfce/recipes-panel-plugins/sensors/{xfce4-sensors-plugin_1.2.97.bb => xfce4-sensors-plugin_1.3.92.bb} (78%) rename meta-xfce/recipes-panel-plugins/weather/{xfce4-weather-plugin_0.10.0.bb => xfce4-weather-plugin_0.10.1.bb} (72%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:26 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: fio: change four python shebangs In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012424.E3510233422@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1b8d355149f97e981aabb9be2221359089ef7c60 Author: Slater, Joseph AuthorDate: Thu Feb 27 13:49:12 2020 -0800 fio: change four python shebangs Use python3. Note that the recipe already depends on python3-core at runtime. We only change scripts that show up under /usr/bin. Signed-off-by: Joe Slater Signed-off-by: Khem Raj --- .../fio/files/python3_shebangs.patch | 38 ++++++++++++++++++++++ meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + 2 files changed, 39 insertions(+) diff --git a/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch b/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch new file mode 100644 index 0000000..068b021 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch @@ -0,0 +1,38 @@ +python3: change four shebangs to python3 + +Upstream-Status: Pending + +Signed-off-by: Joe Slater + +--- a/tools/fio_jsonplus_clat2csv ++++ b/tools/fio_jsonplus_clat2csv +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Note: this script is python2 and python3 compatible. + # + # fio_jsonplus_clat2csv +--- a/tools/fiologparser.py ++++ b/tools/fiologparser.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Note: this script is python2 and python 3 compatible. + # + # fiologparser.py +--- a/tools/hist/fiologparser_hist.py ++++ b/tools/hist/fiologparser_hist.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + Utility for converting *_clat_hist* files generated by fio into latency statistics. + +--- a/tools/plot/fio2gnuplot ++++ b/tools/plot/fio2gnuplot +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Note: this script is python2 and python3 compatible. + # + # Copyright (C) 2013 eNovance SAS diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb index b15d7ba..b65ab19 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -25,6 +25,7 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl" SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ + file://python3_shebangs.patch \ " S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:24 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (732b409 -> aba9bee) Message-ID: <158285306422.16712.3180091106757073981@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 732b409 luajit: Upgrade to 2.1.0-beta3 new 14eb476 luajit: Upgrade to 2.1.0-beta3 new 1b8d355 fio: change four python shebangs new 0acb728 evolution-data-server: upgrade 3.34.3 -> 3.34.4 new 76b5722 file-roller: upgrade 3.32.3 -> 3.32.4 new 5b244a2 gjs: upgrade 1.58.4 -> 1.58.5 new c93fbcf gnome-control-center: upgrade 3.34.2 -> 3.34.4 new d958d1a gnome-desktop3: upgrade 3.34.3 -> 3.34.4 new 66a19d8 gspell: upgrade 1.8.2 -> 1.8.3 new 32896d2 libgee: upgrade 0.20.2 -> 0.20.3 new f17928d gmime: upgrade 3.2.5 -> 3.2.6 new aba9bee netkit-ftp: clean in configure step broken This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (732b409) \ N -- N -- N refs/heads/master-next (aba9bee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../evolution-data-server.inc | 6 ++-- ...file-roller_3.32.3.bb => file-roller_3.32.4.bb} | 4 +-- .../gjs/{gjs_1.58.4.bb => gjs_1.58.5.bb} | 4 +-- ...er_3.34.2.bb => gnome-control-center_3.34.4.bb} | 4 +-- ...desktop3_3.34.3.bb => gnome-desktop3_3.34.4.bb} | 4 +-- .../gspell/{gspell_1.8.2.bb => gspell_1.8.3.bb} | 4 +-- .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 2 ++ .../fio/files/python3_shebangs.patch | 38 ++++++++++++++++++++++ meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + .../libgee/{libgee_0.20.2.bb => libgee_0.20.3.bb} | 4 +-- meta-oe/recipes-devtools/luajit/luajit_git.bb | 2 +- .../gmime/{gmime_3.2.5.bb => gmime_3.2.6.bb} | 4 +-- 12 files changed, 59 insertions(+), 18 deletions(-) rename meta-gnome/recipes-gnome/file-roller/{file-roller_3.32.3.bb => file-roller_3.32.4.bb} (77%) rename meta-gnome/recipes-gnome/gjs/{gjs_1.58.4.bb => gjs_1.58.5.bb} (87%) rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_3.34.2.bb => gnome-control-center_3.34.4.bb} (89%) rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.34.3.bb => gnome-desktop3_3.34.4.bb} (88%) rename meta-gnome/recipes-gnome/gspell/{gspell_1.8.2.bb => gspell_1.8.3.bb} (65%) create mode 100644 meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch rename meta-oe/recipes-devtools/libgee/{libgee_0.20.2.bb => libgee_0.20.3.bb} (77%) rename meta-oe/recipes-gnome/gmime/{gmime_3.2.5.bb => gmime_3.2.6.bb} (72%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:27 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: evolution-data-server: upgrade 3.34.3 -> 3.34.4 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.0FEC4233423@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0acb7285114c30ad772492b1e9c657de552a8ebf Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:38 2020 +0100 evolution-data-server: upgrade 3.34.3 -> 3.34.4 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../recipes-gnome/evolution-data-server/evolution-data-server.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 1eae3df..4da3f82 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.md5sum] = "687d6d7242d60a8a3a3322eee6a45dca" -SRC_URI[archive.sha256sum] = "d2dfac5ca76e05e872fbb06a57cae0dace64818c4dce1e906b0396888270c3a9" -PV = "3.34.3" +SRC_URI[archive.md5sum] = "23293554e9d92c6c0c78b5568b286efd" +SRC_URI[archive.sha256sum] = "985c4b4b613c50c999a4ca5e9d52478acbea85e1e99bab3a8b6e57ba7eace8f3" +PV = "3.34.4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:25 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: luajit: Upgrade to 2.1.0-beta3 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012424.C4217233421@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 14eb47687eb9f4bd9847eb9e6527fe75bd8e77a4 Author: Leo Yan AuthorDate: Wed Feb 26 12:26:22 2020 +0000 luajit: Upgrade to 2.1.0-beta3 Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded at 436 with fuzz 1 (offset 123 lines)." Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 4 ++-- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch index c39ef6f..807cc44 100644 --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h =================================================================== --- LuaJIT-2.0.5.orig/src/lj_arch.h +++ LuaJIT-2.0.5/src/lj_arch.h -@@ -313,7 +313,7 @@ - #error "Need at least GCC 4.2 or newer" +@@ -436,7 +436,7 @@ + #endif #endif #elif !LJ_TARGET_PS3 -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb similarity index 90% rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb rename to meta-oe/recipes-devtools/luajit/luajit_git.bb index 93128dd..c4f8216 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,14 +1,14 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" HOMEPAGE = "http://luajit.org" -PV .= "+git${SRCPV}" -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ +PV = "2.1.0~beta3" +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ file://clang.patch \ -" + " S = "${WORKDIR}/git" @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release -COMPATIBLE_HOST_aarch64 = "null" +# mips64/ppc/ppc64/riscv64 is not supported in this release COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" COMPATIBLE_HOST_powerpc = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:28 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: file-roller: upgrade 3.32.3 -> 3.32.4 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.26FB0233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 76b5722225d769b6f005281ed48b51de5fb3006e Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:39 2020 +0100 file-roller: upgrade 3.32.3 -> 3.32.4 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../file-roller/{file-roller_3.32.3.bb => file-roller_3.32.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.3.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.4.bb similarity index 77% rename from meta-gnome/recipes-gnome/file-roller/file-roller_3.32.3.bb rename to meta-gnome/recipes-gnome/file-roller/file-roller_3.32.4.bb index f6b0457..0e57848 100644 --- a/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.3.bb +++ b/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.4.bb @@ -13,8 +13,8 @@ DEPENDS = " \ inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg -SRC_URI[archive.md5sum] = "5e098bb254d34f48a9b5761b468f4240" -SRC_URI[archive.sha256sum] = "be111fb877dc1eb487ec5d6e2b72ba5defe1ab8033a6a6b9b9044a2a7787e22a" +SRC_URI[archive.md5sum] = "21982b8d298cb2994a99494399dcb2d5" +SRC_URI[archive.sha256sum] = "1b3b2cbfcb444e0d150bfd063add9d5181c8ab24f0593e5a8894399297214017" PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:29 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: gjs: upgrade 1.58.4 -> 1.58.5 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.3880123342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5b244a2f68dac1cba8d0aed45428955c05c15cad Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:40 2020 +0100 gjs: upgrade 1.58.4 -> 1.58.5 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/gjs/{gjs_1.58.4.bb => gjs_1.58.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.58.4.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.58.5.bb similarity index 87% rename from meta-gnome/recipes-gnome/gjs/gjs_1.58.4.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.58.5.bb index eb7d323..fd74c45 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.58.4.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.58.5.bb @@ -11,8 +11,8 @@ DEPENDS = "mozjs gtk+3" inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "385f4baa266991a08d3e425bc69ee962" -SRC_URI[archive.sha256sum] = "261a3f666c771d7744965fe71b804fc2c3a3d46a8e3e8d4f7ed5ef97967ebd5f" +SRC_URI[archive.md5sum] = "4e74456ccb16d4cc5004a441f6abbec1" +SRC_URI[archive.sha256sum] = "e76d99c09f887438b9883e328710b26b3717f6dcdb4097dc7a9bab06ebd7a13a" SRC_URI += "file://0001-Disable-tests-on-host.patch" # gobject-introspection is mandatory and cannot be configured -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:30 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: gnome-control-center: upgrade 3.34.2 -> 3.34.4 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.4CE1F233430@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c93fbcf6ef360cee921231e5fd1f21d80a90bfc9 Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:41 2020 +0100 gnome-control-center: upgrade 3.34.2 -> 3.34.4 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...{gnome-control-center_3.34.2.bb => gnome-control-center_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb similarity index 89% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.2.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb index 9e6e92a..c4ba833 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.2.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb @@ -30,8 +30,8 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" -SRC_URI[archive.md5sum] = "a960a7d3e9f1c4f341bae42da7fbf23a" -SRC_URI[archive.sha256sum] = "a85ffaf5885a8c70c019013d73792bf4cc75f643e97f6e8b52f7fbba9f7a9114" +SRC_URI[archive.md5sum] = "4a783c45d6775185a683f143a14d460e" +SRC_URI[archive.sha256sum] = "17ea6db4b9cee75e99e77f0161a0e5209a3b86444ae775c2068ec192aba6272e" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:31 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: gnome-desktop3: upgrade 3.34.3 -> 3.34.4 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.5FECB233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d958d1a4a5c0a848db31d35a4c8364dd0f5081fa Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:42 2020 +0100 gnome-desktop3: upgrade 3.34.3 -> 3.34.4 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../{gnome-desktop3_3.34.3.bb => gnome-desktop3_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.3.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.4.bb similarity index 88% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.3.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.4.bb index cdd11aa..f9b0538 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.3.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.4.bb @@ -14,8 +14,8 @@ inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspecti REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -SRC_URI[archive.md5sum] = "cdcd3006f55d8c8813315bef6f4f6b71" -SRC_URI[archive.sha256sum] = "acc2efc847574fd21d8f200679f111c2b1eb5ae2c041e0034e7c18450a7d9c6d" +SRC_URI[archive.md5sum] = "d682a05eb98bb2dd434042b6ac4f99d5" +SRC_URI[archive.sha256sum] = "c53e72737cc21535f2fd4b72bc2fb5594741cfc3d3ce90949bc5cc07bade0cbc" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:32 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: gspell: upgrade 1.8.2 -> 1.8.3 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.719B7233422@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 66a19d881d11fa776dd556623ab1aeb7786b7775 Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:43 2020 +0100 gspell: upgrade 1.8.2 -> 1.8.3 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/gspell/{gspell_1.8.2.bb => gspell_1.8.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb similarity index 65% rename from meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb rename to meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb index 128a89f..44cdefc 100644 --- a/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb +++ b/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb @@ -7,5 +7,5 @@ DEPENDS = "gtk+3 iso-codes enchant2" inherit gnomebase gettext gobject-introspection -SRC_URI[archive.md5sum] = "4f857382bc9d8d4afe1e67e5b5b9dbff" -SRC_URI[archive.sha256sum] = "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6" +SRC_URI[archive.md5sum] = "d0892000d944e87fd74e8611ef400cdb" +SRC_URI[archive.sha256sum] = "5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:33 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: libgee: upgrade 0.20.2 -> 0.20.3 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.80734233420@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 32896d2290dfd1c31110f6382eff3103358c7790 Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:44 2020 +0100 libgee: upgrade 0.20.2 -> 0.20.3 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../recipes-devtools/libgee/{libgee_0.20.2.bb => libgee_0.20.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.3.bb similarity index 77% rename from meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb rename to meta-oe/recipes-devtools/libgee/libgee_0.20.3.bb index a048e48..576eff6 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.3.bb @@ -18,5 +18,5 @@ do_configure_prepend() { done } -SRC_URI[archive.md5sum] = "45db478f2b300ada8e039ebc6c9458de" -SRC_URI[archive.sha256sum] = "9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c" +SRC_URI[archive.md5sum] = "e574b3952b93d219b5ec7c74c5892c33" +SRC_URI[archive.sha256sum] = "d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:34 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: gmime: upgrade 3.2.5 -> 3.2.6 In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.8FAA7233421@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f17928df63ba2c27310e03eca04beca75fa15ef2 Author: Andreas M?ller AuthorDate: Thu Feb 27 23:12:45 2020 +0100 gmime: upgrade 3.2.5 -> 3.2.6 Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-oe/recipes-gnome/gmime/{gmime_3.2.5.bb => gmime_3.2.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb similarity index 72% rename from meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb rename to meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb index 568083b..9d1bb7d 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb @@ -9,8 +9,8 @@ inherit gnomebase gobject-introspection SRC_URI += "file://iconv-detect.h \ file://nodolt.patch" -SRC_URI[archive.md5sum] = "98970e3995e67ac3f23827ff52308f9e" -SRC_URI[archive.sha256sum] = "fb7556501f85c3bf3e65fdd82697cbc4fa4b55dccd33ad14239ce0197e78ba59" +SRC_URI[archive.md5sum] = "656548dc431004d1ebf95e5d0bb4b9c8" +SRC_URI[archive.sha256sum] = "abff194c7c4802fba2e233890d09dde8bf7170c3ad5e13000601c8d5b3c44717" export ac_cv_have_iconv_detect_h="yes" do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:24:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:24:35 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: netkit-ftp: clean in configure step broken In-Reply-To: <158285306422.16712.3180091106757073981@git.openembedded.org> References: <158285306422.16712.3180091106757073981@git.openembedded.org> Message-ID: <20200228012425.9E9B3233423@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit aba9beee85709dd2bfdbed430b8bda6b0accaebf Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:17:48 2020 -0800 netkit-ftp: clean in configure step broken | DEBUG: Executing shell function autotools_preconfigure | NOTE: make clean | (cd ftp && make clean) | make[1]: Entering directory '/project/tmp/work/i586-oe-linux/netkit-ftp/0.17-r0/netkit-ftp-0.17/ftp' | Makefile:3: ../MCONFIG: No such file or directory | make[1]: *** No rule to make target '../MCONFIG'. Stop. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb index 65c20c0..cf306ec 100644 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb @@ -18,6 +18,8 @@ SRC_URI[patch31.sha256sum] = "4edd46a32d70daa7ba00f0ebf0118dc5d17dff23d6e46aa21a inherit autotools-brokensep +CLEANBROKEN = "1" + do_configure () { ./configure --prefix=${prefix} echo "LDFLAGS=${LDFLAGS}" >> MCONFIG -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:55:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:55:25 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: zabbix: upgrade 4.4.5 -> 4.4.6 In-Reply-To: <158285492394.15210.10214770673715956330@git.openembedded.org> References: <158285492394.15210.10214770673715956330@git.openembedded.org> Message-ID: <20200228015524.5C09023342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b48cb2b9505c88400a91492dbe23eabe8e1bc88f Author: Wang Mingyu AuthorDate: Fri Feb 28 00:31:44 2020 -0800 zabbix: upgrade 4.4.5 -> 4.4.6 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-connectivity/zabbix/{zabbix_4.4.5.bb => zabbix_4.4.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.5.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb similarity index 95% rename from meta-oe/recipes-connectivity/zabbix/zabbix_4.4.5.bb rename to meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb index 108813f..0e0ddd5 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.5.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb @@ -28,8 +28,8 @@ SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stab file://zabbix-agent.service \ " -SRC_URI[md5sum] = "69ab0c1bbf9d1f8979664498d36cc9a6" -SRC_URI[sha256sum] = "94a897825b062e17b34767c0864305cee6a87476dda8bee88dcf845b24bed0ea" +SRC_URI[md5sum] = "e666539220be93b1af38e40f5fbb1f79" +SRC_URI[sha256sum] = "22bb28e667424ad4688f47732853f4241df0e78a7607727b043d704ba726ae0e" inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:55:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:55:23 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (aba9bee -> b48cb2b) Message-ID: <158285492394.15210.10214770673715956330@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from aba9bee netkit-ftp: clean in configure step broken new f953932 libmtp: upgrade 1.1.16 -> 1.1.17 new b48cb2b zabbix: upgrade 4.4.5 -> 4.4.6 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../libmtp/{libmtp_1.1.16.bb => libmtp_1.1.17.bb} | 4 ++-- .../recipes-connectivity/zabbix/{zabbix_4.4.5.bb => zabbix_4.4.6.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-connectivity/libmtp/{libmtp_1.1.16.bb => libmtp_1.1.17.bb} (93%) rename meta-oe/recipes-connectivity/zabbix/{zabbix_4.4.5.bb => zabbix_4.4.6.bb} (95%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 01:55:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 01:55:24 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: libmtp: upgrade 1.1.16 -> 1.1.17 In-Reply-To: <158285492394.15210.10214770673715956330@git.openembedded.org> References: <158285492394.15210.10214770673715956330@git.openembedded.org> Message-ID: <20200228015524.52661233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f953932ef714a83d4ac19bd6f004a096bb00eb05 Author: Wang Mingyu AuthorDate: Fri Feb 28 00:31:42 2020 -0800 libmtp: upgrade 1.1.16 -> 1.1.17 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libmtp/{libmtp_1.1.16.bb => libmtp_1.1.17.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.16.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb similarity index 93% rename from meta-oe/recipes-connectivity/libmtp/libmtp_1.1.16.bb rename to meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb index 596e315..54decbc 100644 --- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.16.bb +++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb @@ -21,8 +21,8 @@ DEPENDS_append_class-target = " ${BPN}-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI_append_class-target = " file://0001-Use-native-mtp-hotplug.patch" -SRC_URI[md5sum] = "7796179af46e90938dde1d0c4d1d1d4c" -SRC_URI[sha256sum] = "5b68f9dd1ed38de558de687f40e255a39e4d5e32ef3de601f0ac19dd5682bba0" +SRC_URI[md5sum] = "81aea5d3139e5189c2e055ed2c98cd91" +SRC_URI[sha256sum] = "f8a34cf52d9f9b9cb8c7f26b12da347d4af7eb904c13189602e4c6b62d1a79dc" inherit autotools pkgconfig lib_package -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 04:21:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 04:21:02 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: python3-appdirs: enable ptest Message-ID: <158286366206.9361.16381619356870017200@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new f017ca0 python3-appdirs: enable ptest f017ca0 is described below commit f017ca0eea24580e4d82831ceef2746f8b26b8e3 Author: Zheng Ruoqin AuthorDate: Fri Feb 28 11:28:48 2020 +0800 python3-appdirs: enable ptest Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-appdirs/run-ptest | 3 +++ .../recipes-devtools/python/python3-appdirs_1.4.3.bb | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-appdirs/run-ptest b/meta-python/recipes-devtools/python/python3-appdirs/run-ptest new file mode 100644 index 0000000..5287f3e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-appdirs/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest | sed -e 's/\[100%\]//g' | sed -e 's/\.\.F/: FAIL/g' | sed -e 's/\.\.\./: PASS/g' diff --git a/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb b/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb index 6c01580..2e183d8 100644 --- a/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb +++ b/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb @@ -2,7 +2,20 @@ SUMMARY = "A small Python module for determining appropriate + platform-specific LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=31625363c45eb0c67c630a2f73e438e4" +SRC_URI += " \ + file://run-ptest \ +" + SRC_URI[md5sum] = "44c679904082a2133f5566c8a0d3ab42" SRC_URI[sha256sum] = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:09 +0000 Subject: [oe-commits] [openembedded-core] 01/31: libarchive: upgrade 3.4.1 -> 3.4.2 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074708.C6F00233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit baa348bcbd6b6acff12a8cfb1c4f395414941e9f Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:25 2020 +0100 libarchive: upgrade 3.4.1 -> 3.4.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.4.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 2d33dd8..c3edb57 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" -SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" +SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" +SRC_URI[sha256sum] = "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" inherit autotools update-alternatives pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:11 +0000 Subject: [oe-commits] [openembedded-core] 03/31: python3-docutils: upgrade 0.15 -> 0.16 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074708.DEE2123344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 25cedf1cad564077cd92cbad2b764aa3951cd8b4 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:28 2020 +0100 python3-docutils: upgrade 0.15 -> 0.16 License-Update: formatting Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-docutils_0.15.bb b/meta/recipes-devtools/python/python3-docutils_0.16.bb similarity index 60% rename from meta/recipes-devtools/python/python3-docutils_0.15.bb rename to meta/recipes-devtools/python/python3-docutils_0.16.bb index f5c3f5d..50547a1 100644 --- a/meta/recipes-devtools/python/python3-docutils_0.15.bb +++ b/meta/recipes-devtools/python/python3-docutils_0.16.bb @@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation" HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" DEPENDS = "python3" SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "f51729f19e70a9dc4837433193a5e798" -SRC_URI[sha256sum] = "c35e87e985f70106f6f97e050f3bed990641e0e104566134b9cd23849a460e96" +SRC_URI[md5sum] = "9ccb6f332e23360f964de72c8ea5f0ed" +SRC_URI[sha256sum] = "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573" S = "${WORKDIR}/docutils-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:08 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (75ec188 -> 19acc7c) Message-ID: <158287602846.24028.684461257288462167@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 75ec188 webkitgtk: Remove obsolete woff2 comment discard efe0e55 ptest-packagelists.inc: add coreutils to SLOW list discard db11d48 coreutils: add ptest discard 35f32e1 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements discard 9efcba6 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG discard 16da281 util-linux: upgrade 2.34 -> 2.35.1 discard 741aec8 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk discard 04b6c92 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 discard 32e209f at-spi2-core: upgrade 2.32.1 -> 2.34.0 discard ebb7fc8 atk: upgrade 2.32.0 -> 2.34.1 discard c4572c7 go: Update to 1.14 release series discard 90098a6 systemd: Drop local time64 patch in favour of upstreamed patches discard 45e05cd systemd: Do not force removing resolved from PACKAGECONFIG discard 0267890 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR discard e2f5572 tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES discard de95b1f lsb-release: fix likely reproducabilty timestamp discard 71af658 rt-tests: make manpages reproducible discard 4af7fb7 sysvinit: remove logsave.8 discard 95ae678 ltp: Remove mips related open_posix_testsuite patch discard 62547d6 ltp: Update to 20200120 discard 44615d8 Revert "make: 4.2.1 -> 4.3" discard d2dfd3a libedit/readline: Correct package alternatives link for manpage discard 113466a layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe discard 3635e06 sysvinit: Fix install order/dependency discard 95ff3a8 webkitgtk: Disable GI data for musl/arm discard 01ebff1 ncurses: upgrade 6.1+20191019 -> 6.2 discard 3e91f5f gst-validate: upgrade 1.16.1 -> 1.16.2 discard 954495c acpica: upgrade 20191213 -> 20200214 discard 5bb6383 python3-setuptools: upgrade 45.0.0 -> 45.2.0 discard 220922a gnutls: upgrade 3.6.11.1 -> 3.6.12 discard 3749768 unifdef: upgrade 2.11 -> 2.12 discard fa2887c python3-mako: upgrade 1.1.0 -> 1.1.1 discard 7a0c4b8 python3-docutils: upgrade 0.15 -> 0.16 discard 43ca971 libpcre: upgrade 8.43 -> 8.44 discard dc60576 libarchive: upgrade 3.4.1 -> 3.4.2 discard 6c123d4 libmodule-build-perl: upgrade 0.4229 -> 0.4231 new baa348b libarchive: upgrade 3.4.1 -> 3.4.2 new d88bf48 libpcre: upgrade 8.43 -> 8.44 new 25cedf1 python3-docutils: upgrade 0.15 -> 0.16 new 3c17f18 python3-mako: upgrade 1.1.0 -> 1.1.1 new 54f730b unifdef: upgrade 2.11 -> 2.12 new 9bce14d gnutls: upgrade 3.6.11.1 -> 3.6.12 new 33ebab2 python3-setuptools: upgrade 45.0.0 -> 45.2.0 new c2be6a6 acpica: upgrade 20191213 -> 20200214 new d13b334 gst-validate: upgrade 1.16.1 -> 1.16.2 new 1523fd1 ncurses: upgrade 6.1+20191019 -> 6.2 new fee6230 webkitgtk: Disable GI data for musl/arm new b7c2b67 sysvinit: Fix install order/dependency new f9b1a41 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe new 8400dd3 libedit/readline: Correct package alternatives link for manpage new f60dfc7 Revert "make: 4.2.1 -> 4.3" new 87ab02b sysvinit: remove logsave.8 new 150b707 rt-tests: make manpages reproducible new f102032 lsb-release: fix likely reproducabilty timestamp new 437f63f tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES new baf69e9 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR new 3b1040a systemd: Do not force removing resolved from PACKAGECONFIG new bb0beab systemd: Drop local time64 patch in favour of upstreamed patches new e24d674 go: Update to 1.14 release series new bfefe39 atk: upgrade 2.32.0 -> 2.34.1 new b9032ad maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk new b2cd31a util-linux: upgrade 2.34 -> 2.35.1 new 1d37887 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG new ff2c9d9 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new 7d29dae webkitgtk: Remove obsolete woff2 comment new 1757018 ltp: Update to 20200120 new 19acc7c ltp: Remove mips related open_posix_testsuite patch This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (75ec188) \ N -- N -- N refs/heads/master-next (19acc7c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 31 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/ptest-packagelists.inc | 1 - meta/recipes-core/coreutils/coreutils/run-ptest | 17 ---------- meta/recipes-core/coreutils/coreutils_8.31.bb | 37 ---------------------- ...rl_0.4231.bb => libmodule-build-perl_0.4229.bb} | 14 +++----- meta/recipes-extended/ltp/ltp_20200120.bb | 2 +- ...at-spi2-atk_2.34.1.bb => at-spi2-atk_2.32.0.bb} | 8 ++--- ...-spi2-core_2.34.0.bb => at-spi2-core_2.32.1.bb} | 8 ++--- 7 files changed, 14 insertions(+), 73 deletions(-) delete mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4231.bb => libmodule-build-perl_0.4229.bb} (90%) rename meta/recipes-support/atk/{at-spi2-atk_2.34.1.bb => at-spi2-atk_2.32.0.bb} (66%) rename meta/recipes-support/atk/{at-spi2-core_2.34.0.bb => at-spi2-core_2.32.1.bb} (83%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:12 +0000 Subject: [oe-commits] [openembedded-core] 04/31: python3-mako: upgrade 1.1.0 -> 1.1.1 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074708.EBE6B23344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c17f1839768133c5f0633d1e04a9ab059f56283 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:29 2020 +0100 python3-mako: upgrade 1.1.0 -> 1.1.1 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-mako_1.1.0.bb b/meta/recipes-devtools/python/python3-mako_1.1.1.bb similarity index 63% rename from meta/recipes-devtools/python/python3-mako_1.1.0.bb rename to meta/recipes-devtools/python/python3-mako_1.1.1.bb index b139e5a..bc38009 100644 --- a/meta/recipes-devtools/python/python3-mako_1.1.0.bb +++ b/meta/recipes-devtools/python/python3-mako_1.1.1.bb @@ -2,14 +2,14 @@ SUMMARY = "Templating library for Python" HOMEPAGE = "http://www.makotemplates.org/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=df7e6c7c82990acf0228a55e00d29bc9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=943eb67718222db21d44a4ef1836675f" PYPI_PACKAGE = "Mako" inherit pypi setuptools3 -SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2" -SRC_URI[sha256sum] = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" +SRC_URI[md5sum] = "2660a4916f2f63456e6885c727b7cd2f" +SRC_URI[sha256sum] = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4" RDEPENDS_${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:10 +0000 Subject: [oe-commits] [openembedded-core] 02/31: libpcre: upgrade 8.43 -> 8.44 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074708.D385D23344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d88bf486da3c2e34fe443236348453ddc474aa83 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:26 2020 +0100 libpcre: upgrade 8.43 -> 8.44 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libpcre/libpcre/out-of-tree.patch | 26 ---------------------- .../libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} | 9 ++++---- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch deleted file mode 100644 index d567896..0000000 --- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb similarity index 91% rename from meta/recipes-support/libpcre/libpcre_8.43.bb rename to meta/recipes-support/libpcre/libpcre_8.44.bb index f9a22fe..e5471e8 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:14 +0000 Subject: [oe-commits] [openembedded-core] 06/31: gnutls: upgrade 3.6.11.1 -> 3.6.12 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.1282C233452@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9bce14d4d26caa0708a42ca4f6fdecd4c8600540 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:31 2020 +0100 gnutls: upgrade 3.6.11.1 -> 3.6.12 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb b/meta/recipes-support/gnutls/gnutls_3.6.12.bb similarity index 93% rename from meta/recipes-support/gnutls/gnutls_3.6.11.1.bb rename to meta/recipes-support/gnutls/gnutls_3.6.12.bb index 5b05364..f1eeebc 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.12.bb @@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" -SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" +SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" +SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:13 +0000 Subject: [oe-commits] [openembedded-core] 05/31: unifdef: upgrade 2.11 -> 2.12 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.0606F233450@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 54f730b14597ccbb4573b66e63da678617a8ec02 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:30 2020 +0100 unifdef: upgrade 2.11 -> 2.12 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/unifdef/unifdef_2.11.bb b/meta/recipes-devtools/unifdef/unifdef_2.12.bb similarity index 53% rename from meta/recipes-devtools/unifdef/unifdef_2.11.bb rename to meta/recipes-devtools/unifdef/unifdef_2.12.bb index 1ffc11e..22b10ba 100644 --- a/meta/recipes-devtools/unifdef/unifdef_2.11.bb +++ b/meta/recipes-devtools/unifdef/unifdef_2.12.bb @@ -3,12 +3,13 @@ SECTION = "devel" LICENSE = "BSD-2-Clause" HOMEPAGE = "http://dotat.at/prog/unifdef/" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fc6c2c1dc4f18c891ed5b7a469fe32 \ - file://unifdef.c;endline=32;md5=aaec84d8b68d8b6dea71f45e9949ebfe" +LIC_FILES_CHKSUM = "file://COPYING;md5=3498caf346f6b77934882101749ada23 \ + file://unifdef.c;endline=32;md5=6f4ee8085d6e6ab0f7cb4390e1a9c497 \ + " SRC_URI = "http://dotat.at/prog/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "337053fd8a7d9ab3adf5e50f88af95b7" -SRC_URI[sha256sum] = "828ffc270ac262b88fe011136acef2780c05b0dc3c5435d005651740788d4537" +SRC_URI[md5sum] = "ae8c0b3b4c43c1f6bc5f32412a820818" +SRC_URI[sha256sum] = "43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400" UPSTREAM_CHECK_REGEX = "unifdef-(?P((\d+\.*)+)(?![a-f0-9]{6,})).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:15 +0000 Subject: [oe-commits] [openembedded-core] 07/31: python3-setuptools: upgrade 45.0.0 -> 45.2.0 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.1DDC9233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 33ebab2be2501a6bd491448403c1dc70a493b9d3 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:32 2020 +0100 python3-setuptools: upgrade 45.0.0 -> 45.2.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index b1a6813..5f99cd2 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 +From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 09066f8..d3039a5 100644 +index 426301d..55c8062 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -649,6 +649,11 @@ class easy_install(Command): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index c697937..f7c3202 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" -SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" +SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30" +SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_45.0.0.bb rename to meta/recipes-devtools/python/python3-setuptools_45.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:16 +0000 Subject: [oe-commits] [openembedded-core] 08/31: acpica: upgrade 20191213 -> 20200214 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.29B6B233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c2be6a600d7e68c400238dc3f687664309549a6b Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:34 2020 +0100 acpica: upgrade 20191213 -> 20200214 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../acpica/{acpica_20191213.bb => acpica_20200214.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/acpica/acpica_20191213.bb b/meta/recipes-extended/acpica/acpica_20200214.bb similarity index 88% rename from meta/recipes-extended/acpica/acpica_20191213.bb rename to meta/recipes-extended/acpica/acpica_20200214.bb index 6b1412e..cfa9fec 100644 --- a/meta/recipes-extended/acpica/acpica_20191213.bb +++ b/meta/recipes-extended/acpica/acpica_20200214.bb @@ -10,15 +10,15 @@ HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[md5sum] = "0f0eb38e796fac24c2aa4d9b6adcd950" -SRC_URI[sha256sum] = "304930df9836d3d4cdbf67a3ae6bd96dbc65f62602d869f571f4b6a12341e6c6" +SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113" +SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:17 +0000 Subject: [oe-commits] [openembedded-core] 09/31: gst-validate: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.348FA233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d13b334b60942d3dc8686b54b9f1f3001b6eb916 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:35 2020 +0100 gst-validate: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb similarity index 87% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb index 7d602ea..35492fe 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "793e75f4717f718ad204c554d577b160" -SRC_URI[sha256sum] = "7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899" +SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c" +SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:18 +0000 Subject: [oe-commits] [openembedded-core] 10/31: ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.4057B233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1523fd1cf152343800646294f2009886cc0e5fcc Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:27 2020 +0100 ncurses: upgrade 6.1+20191019 -> 6.2 License-Update: copyright years and holders Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index b7bf4c0..4156bf4 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb similarity index 89% rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb rename to meta/recipes-core/ncurses/ncurses_6.2.bb index 187777f..b6d899c 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:19 +0000 Subject: [oe-commits] [openembedded-core] 11/31: webkitgtk: Disable GI data for musl/arm In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.4D963233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fee6230cab2934017a5943e6e156ce9db5cf982f Author: Khem Raj AuthorDate: Tue Feb 25 07:28:57 2020 -0800 webkitgtk: Disable GI data for musl/arm qemu-arm hangs forever when running gobject introspection Signed-off-by: Khem Raj Cc: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7bffc15 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -123,5 +123,10 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED_libc-musl_armv7a = "False" +GI_DATA_ENABLED_libc-musl_armv7ve = "False" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:20 +0000 Subject: [oe-commits] [openembedded-core] 12/31: sysvinit: Fix install order/dependency In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.5AD49233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b7c2b67e002435cb8c70ae7d97ca9ebd4a507881 Author: Mark Hatle AuthorDate: Tue Feb 25 11:49:29 2020 -0600 sysvinit: Fix install order/dependency It is possible for sysvinit to be installed before the passwd/group files are installed from base-passwd. This results in an warning that the shutdown group can't be found. Adding a dependeny on base-passwd will resolve this issue. This has similar symptoms to the problem that oe-core commit 0227e929021263c51d2e7db36224000fecb01f1c fixed. The fix is simular in that it ensures that base-passwd is installed first, just at runtime vs setscene time. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 21ef0e9..63c1084 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -70,7 +70,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:21 +0000 Subject: [oe-commits] [openembedded-core] 13/31: layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.696DD233446@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f9b1a4129332b9f7f2ac8fb958148e41320951e7 Author: Khem Raj AuthorDate: Tue Feb 25 09:51:26 2020 -0800 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe These are added as dependencies by mime class, which could be inherited along with allarch and dependencies silently go into target specific recipes and which then can result in sstate hash signature mismatches when the allarch recipes are reused for another arch [YOCTO #13805] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index fcdf9ae..60f8e26 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -43,6 +43,8 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-utils \ gstreamer1.0-meta-base \ ca-certificates \ + shared-mime-info \ + desktop-file-utils \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:22 +0000 Subject: [oe-commits] [openembedded-core] 14/31: libedit/readline: Correct package alternatives link for manpage In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.795E823344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8400dd37589aeda7cd130a16cb948f09ed9ccc36 Author: Jeremy A. Puhlman AuthorDate: Tue Feb 25 11:25:44 2020 -0800 libedit/readline: Correct package alternatives link for manpage Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4babcbd..052e2d5 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 267fdcc..8d2d57a 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:24 +0000 Subject: [oe-commits] [openembedded-core] 16/31: sysvinit: remove logsave.8 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.92AE523344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 87ab02bb378b2fb0c9aa67b75f8595e08bcd7451 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:33 2020 -0800 sysvinit: remove logsave.8 logsave is a duplicate from e2fsprogs, which was already removed, but the man page remained which is also a duplicate. However it does not get modifed on install so it conflicts with the e2fsprogs version. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 63c1084..d2b85ed 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -110,4 +110,5 @@ do_install () { # Already provided by e2fsprogs; sysvinit's version is a copy from there rm ${D}${base_sbindir}/logsave + rm ${D}${mandir}/man8/logsave.8 } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:27 +0000 Subject: [oe-commits] [openembedded-core] 19/31: tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.ABB03233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 437f63fef91c70e70aa1c0355a9f57cb719ed40d Author: Jaewon Lee AuthorDate: Thu Jan 23 13:02:59 2020 -0800 tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES Without the proper default tune in TUNE_FEATURES, certain variables won't expand correctly. MACHINEOVERRIDES won't add cortexa72-cortexa53: TUNE_CCARGS won't add -mtune=cortexa72.cortexa-53, generating the toolchain incorrectly. Adding missing 'cortexa72-cortexa53' to both TUNE_FEATURES_tune-cortexa72-cortexa53 and TUNE_FEATURES_tune-cortexa72-cortexa53-crypto Signed-off-by: Jaewon Lee Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc index 0d43531..f208b98 100644 --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc @@ -14,8 +14,8 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", " - AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" -TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc}" -TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto}" +TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" +TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" BASE_LIB_tune-cortexa72-cortexa53 = "lib64" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:29 +0000 Subject: [oe-commits] [openembedded-core] 21/31: systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.BDBD823347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b1040a337d03fb93654ab11f2d877d54b48326c Author: Khem Raj AuthorDate: Thu Feb 27 00:05:56 2020 -0800 systemd: Do not force removing resolved from PACKAGECONFIG This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d86341..e7d2997 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ - resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " + # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:23 +0000 Subject: [oe-commits] [openembedded-core] 15/31: Revert "make: 4.2.1 -> 4.3" In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.8767D23344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f60dfc7475f13bceec3b2b2b27af96449710bc00 Author: Richard Purdie AuthorDate: Thu Feb 27 23:15:05 2020 +0000 Revert "make: 4.2.1 -> 4.3" This reverts commit 7bde6c9a16c16f955700692061b5472127303644. --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 +++++++++++++++++++ ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 ----------- ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 ----------- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 +++++++++++ ...tl-allow-being-detected-by-importing-proj.patch | 33 --------- .../0002-w32-compat-dirent.c-follow-header.patch | 36 ---------- .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ---------------------- meta/recipes-devtools/make/make_4.2.1.bb | 12 ++++ meta/recipes-devtools/make/make_4.3.bb | 18 ----- 10 files changed, 123 insertions(+), 246 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 4142cf2..b8905bc 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +5,9 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ + file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ + file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000..2b6e4d4 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,70 @@ +From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj + + dir.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +diff --git a/dir.c b/dir.c +index f34bbf5..12eef30 100644 +--- a/dir.c ++++ b/dir.c +@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) + } + #endif + ++/* Similarly for lstat. */ ++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) ++# ifndef VMS ++# ifndef HAVE_SYS_STAT_H ++int lstat (const char *path, struct stat *sbuf); ++# endif ++# else ++ /* We are done with the fake lstat. Go back to the real lstat */ ++# ifdef lstat ++# undef lstat ++# endif ++# endif ++# define local_lstat lstat ++#elif defined(WINDOWS32) ++/* Windows doesn't support lstat(). */ ++# define local_lstat local_stat ++#else ++static int ++local_lstat (const char *path, struct stat *buf) ++{ ++ int e; ++ EINTRLOOP (e, lstat (path, buf)); ++ return e; ++} ++#endif ++ + void + dir_setup_glob (glob_t *gl) + { + gl->gl_opendir = open_dirstream; + gl->gl_readdir = read_dirstream; + gl->gl_closedir = free; ++ gl->gl_lstat = local_lstat; + gl->gl_stat = local_stat; +- /* We don't bother setting gl_lstat, since glob never calls it. +- The slot is only there for compatibility with 4.4 BSD. */ + } + + void +-- +2.16.1 + diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch deleted file mode 100644 index 096bcfd..0000000 --- a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Fri, 21 Feb 2020 17:39:56 +0100 -Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX - -When cross compiling for a system without getloadavg, do not try add -additional linker paths unless it's absolutely necessary. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending - m4/getloadavg.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 -index 3bd2a14..696c5de 100644 ---- a/m4/getloadavg.m4 -+++ b/m4/getloadavg.m4 -@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], - fi - - if test $gl_func_getloadavg_done = no; then -+ AS_CASE([$host_os], -+ [aix*], [ - # There is a commonly available library for RS/6000 AIX. - # Since it is not a standard part of AIX, it might be installed locally. - gl_getloadavg_LIBS=$LIBS -@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], - AC_CHECK_LIB([getloadavg], [getloadavg], - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], - [LIBS=$gl_getloadavg_LIBS]) -+ ], [:]) - fi - - # Set up the replacement function if necessary. --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch deleted file mode 100644 index 5797082..0000000 --- a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 10:52:21 +0100 -Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning - -Fix compiler warning: - src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the - length of the source argument [-Wstringop-overflow=] - -The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the -size of the buffer is increased by 1 to hold a path with the length of -`MAXPATHLEN` and trailing `0`. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/dir.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/dir.c b/src/dir.c -index 862a18e..cad4c4a 100644 ---- a/src/dir.c -+++ b/src/dir.c -@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) - if (plen > 1 && path[plen - 1] == '.' - && (path[plen - 2] == '/' || path[plen - 2] == '\\')) - { -- char parent[MAXPATHLEN]; -+ char parent[MAXPATHLEN+1]; - -- strncpy (parent, path, plen - 2); -- parent[plen - 2] = '\0'; -+ strncpy (parent, path, MAXPATHLEN); -+ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; - if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) - return -1; - } --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000..d49acd9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,38 @@ +From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- +Upstream-Status: Backport + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64ec870..e87901c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], +-- +2.16.1 + diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch deleted file mode 100644 index b3d97f9..0000000 --- a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 12:10:06 +0100 -Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing - projects - -GNU project `make` relies on gnulib but provides some own compatibility -functions - including an `fcntl`, which fails on mingw. -The intension of gnulib is providing these functions and being wider tested, -but silently injecting a function opens battle of compatibility layers. - -So adding a hint into target `config.h` to allow deciding whether using -an own compatibility implementation or not. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending - - m4/gnulib-comp.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 3ee0811..cf75541 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -147,6 +147,7 @@ - gl_FUNC_FCNTL - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - AC_LIBOBJ([fcntl]) -+ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) - fi - gl_FCNTL_MODULE_INDICATOR([fcntl]) - gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch deleted file mode 100644 index 9ecc445..0000000 --- a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 11:12:43 +0100 -Subject: [PATCH 2/3] w32: compat: dirent.c: follow header - -src/w32/include/dirent.h completely delegates to mingw dirent implementation, -gnulib detects it as fine and completely usable - trust in that. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/w32/compat/dirent.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c -index b8ec615..de80f72 100644 ---- a/src/w32/compat/dirent.c -+++ b/src/w32/compat/dirent.c -@@ -23,7 +23,7 @@ this program. If not, see . */ - #include - #include "dirent.h" - -- -+#ifndef __MINGW32__ - DIR* - opendir(const char* pDirName) - { -@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) - - return; - } -+#endif /* !__MINGW32__ */ --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch deleted file mode 100644 index 70414c5..0000000 --- a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Fri, 21 Feb 2020 19:29:49 +0100 -Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated - -Rate the fcntl emulation from gnulib higher than the own one. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/output.h | 19 ++++++++++++++----- - src/w32/compat/posixfcn.c | 2 ++ - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/src/output.h b/src/output.h -index a506505..d3ce6b7 100644 ---- a/src/output.h -+++ b/src/output.h -@@ -67,14 +67,21 @@ void output_dump (struct output *out); - - # ifdef WINDOWS32 - /* For emulations in w32/compat/posixfcn.c. */ --# define F_GETFD 1 --# define F_SETLKW 2 -+# ifndef F_GETFD -+# define F_GETFD 1 -+# endif -+# ifndef F_SETLKW -+# define F_SETLKW 2 -+# endif - /* Implementation note: None of the values of l_type below can be zero - -- they are compared with a static instance of the struct, so zero - means unknown/invalid, see w32/compat/posixfcn.c. */ --# define F_WRLCK 1 --# define F_UNLCK 2 -- -+# ifndef F_WRLCK -+# define F_WRLCK 1 -+# endif -+# ifndef F_UNLCK -+# define F_UNLCK 2 -+# endif - struct flock - { - short l_type; -@@ -89,7 +96,9 @@ struct flock - typedef intptr_t sync_handle_t; - - /* Public functions emulated/provided in posixfcn.c. */ -+# ifndef HAVE_GNULIB_FCNTL - int fcntl (intptr_t fd, int cmd, ...); -+# endif - intptr_t create_mutex (void); - int same_stream (FILE *f1, FILE *f2); - -diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c -index 975dfb7..d337b9c 100644 ---- a/src/w32/compat/posixfcn.c -+++ b/src/w32/compat/posixfcn.c -@@ -29,6 +29,7 @@ this program. If not, see . */ - #ifndef NO_OUTPUT_SYNC - /* Support for OUTPUT_SYNC and related functionality. */ - -+#ifndef HAVE_GNULIB_FCNTL - /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ - int - fcntl (intptr_t fd, int cmd, ...) -@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) - return -1; - } - } -+#endif /* GNULIB_TEST_FCNTL */ - - static intptr_t mutex_handle = -1; - --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb new file mode 100644 index 0000000..c6e6a0c --- /dev/null +++ b/meta/recipes-devtools/make/make_4.2.1.bb @@ -0,0 +1,12 @@ +LICENSE = "GPLv3 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" +SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb deleted file mode 100644 index 70caf0a..0000000 --- a/meta/recipes-devtools/make/make_4.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -require make.inc - -SRC_URI += "\ - file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ - file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ - file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ - file://0002-w32-compat-dirent.c-follow-header.patch \ - file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ -" - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" -SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" - -BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:33 +0000 Subject: [oe-commits] [openembedded-core] 25/31: maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.E6D08233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b9032ad216b516a081b830574377f7c49c8b4159 Author: Tim Orling AuthorDate: Wed Feb 26 16:06:03 2020 -0800 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk For GUI automation purposes, strong motivation for accessibility (a11y) via python3-dogtail and python3-pyatspi2, so taking over from Anuj. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ac..10095ff 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -49,9 +49,9 @@ RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal " RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal " -RECIPE_MAINTAINER_pn-atk = "Anuj Mittal " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling " +RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling " +RECIPE_MAINTAINER_pn-atk = "Tim Orling " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:28 +0000 Subject: [oe-commits] [openembedded-core] 20/31: linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.B430223347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit baf69e9369ce4e8b2df1a4080d2528eb4e4a307a Author: Khem Raj AuthorDate: Thu Feb 27 00:05:55 2020 -0800 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR __UAPI_DEF_ETHHDR has been defined in kernel UAPI [1] and musl already defined it to 0 via [2] So these patches can now be dropped. [1] https://patchwork.ozlabs.org/patch/872502/ [2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 31 ---------------------- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 30 --------------------- .../linux-libc-headers/linux-libc-headers_5.4.bb | 2 -- 3 files changed, 63 deletions(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch deleted file mode 100644 index 68b2446..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 1 Mar 2018 18:31:01 -0500 -Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file - -Signed-off-by: Bruce Ashfield -Upstream-Status: Pending ---- - include/uapi/linux/if_ether.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 153c9c2..7b69b73 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -149,6 +149,12 @@ - * This is an Ethernet frame header. - */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ - #ifndef __UAPI_DEF_ETHHDR - #define __UAPI_DEF_ETHHDR 1 --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index fb7e1de..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Wed, 22 Jan 2014 00:57:48 +0100 -Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr - ---- -Signed-off-by: Khem Raj -Upstream-Status: Submitted - - include/uapi/linux/if_ether.h | 4 +++- - include/uapi/linux/libc-compat.h | 6 ++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: linux-4.15/include/uapi/linux/libc-compat.h -=================================================================== ---- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 -+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 -@@ -51,6 +51,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 5037739..8a12103 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -2,10 +2,8 @@ require linux-libc-headers.inc SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:31 +0000 Subject: [oe-commits] [openembedded-core] 23/31: go: Update to 1.14 release series In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.D1B4A233452@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e24d674f7899bf03dbffe158104e6cedf6bb33b5 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:58 2020 -0800 go: Update to 1.14 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++--- ...1-allow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...-content-based-hash-generation-less-pedan.patch | 33 ++++++++----------- ...OLDIR-to-be-overridden-in-the-environment.patch | 11 ++----- .../0004-ld-add-soname-to-shareable-objects.patch | 11 ++----- ...verride-CC-when-building-dist-and-go_boot.patch | 9 ++---- ...-cmd-dist-separate-host-and-target-builds.patch | 37 ++++++++++------------ ...07-cmd-go-make-GOROOT-precious-by-default.patch | 23 ++++---------- .../0008-use-GOBUILDMODE-to-set-buildmode.patch | 9 ++---- ...ld-replace-glibc-dynamic-linker-with-musl.patch | 23 ++------------ ...-canadian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 .../{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../go/{go-native_1.13.bb => go-native_1.14.bb} | 0 .../go/{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../recipes-devtools/go/{go_1.13.bb => go_1.14.bb} | 0 17 files changed, 53 insertions(+), 120 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e957e3a..31d4b3b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" -GOVERSION ?= "1.13%" +GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "9.0.1" diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc similarity index 81% rename from meta/recipes-devtools/go/go-1.13.inc rename to meta/recipes-devtools/go/go-1.14.inc index 7780ace..ac7b95c 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.13" -GO_MINOR = ".8" +GO_BASEVERSION = "1.14" +GO_MINOR = "" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" -SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" +SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" +SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e4..d47664d 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch @@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 17852de..7b5ec5e 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { +@@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { @@ -33,6 +31,3 @@ index 17852de..7b5ec5e 100644 } env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch rename to meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 4eddd39..9e88567 100644 --- a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -50,11 +50,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 19 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 7b5ec5e..292f117 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar { +@@ -156,7 +156,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { var b work.Builder b.Init() @@ -63,8 +61,6 @@ index 7b5ec5e..292f117 100644 if err != nil { // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 7dd9a90..ccebaf8 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -32,6 +32,8 @@ import ( @@ -76,16 +72,16 @@ index 7dd9a90..ccebaf8 100644 // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - // The compiler hides the exact value of $GOROOT - // when building things in GOROOT. +@@ -208,7 +210,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. + // When -trimpath is used with a package built from the module cache, + // use the module path and version instead of the directory. - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { fmt.Fprintf(h, "dir %s\n", p.Dir) - } - fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) -@@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + } else if cfg.BuildTrimpath && p.Module != nil { + fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) +@@ -224,13 +226,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -103,7 +99,7 @@ index 7dd9a90..ccebaf8 100644 } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2229,33 +2231,48 @@ var ( +@@ -2228,33 +2230,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -161,7 +157,7 @@ index 7dd9a90..ccebaf8 100644 } // compilerExe returns the compiler to use given an -@@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string { +@@ -2263,11 +2280,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -179,7 +175,7 @@ index 7dd9a90..ccebaf8 100644 return compiler } -@@ -2429,7 +2451,7 @@ func envList(key, def string) []string { +@@ -2428,7 +2450,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -188,7 +184,7 @@ index 7dd9a90..ccebaf8 100644 defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2447,6 +2469,14 @@ func (b *Builder) CFlags(p *load.Package return } @@ -203,7 +199,7 @@ index 7dd9a90..ccebaf8 100644 return } -@@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2461,7 +2491,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -212,7 +208,7 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return nil, nil, err } -@@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -2820,7 +2850,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -221,6 +217,3 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return "", "", err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch similarity index 83% rename from meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 9aa0119..662c705 100644 --- a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 9e50311..683ca6f 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -244,7 +244,9 @@ func xinit() { +@@ -246,7 +246,9 @@ func xinit() { workdir = xworkdir() xatexit(rmworkdir) @@ -32,11 +30,9 @@ index 9e50311..683ca6f 100644 } // compilerEnv returns a map from "goos/goarch" to the -diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a3277a6..db96350 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -60,7 +60,11 @@ func defaultContext() build.Context { +@@ -64,7 +64,11 @@ func defaultContext() build.Context { // variables. This matches the initialization of ToolDir in // go/build, except for using ctxt.GOROOT rather than // runtime.GOROOT. @@ -49,6 +45,3 @@ index a3277a6..db96350 100644 } ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch similarity index 82% rename from meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch index 40763ad..75c9c75 100644 --- a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 3fa258d..f96fb02 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() { +@@ -1280,6 +1280,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -29,7 +27,7 @@ index 3fa258d..f96fb02 100644 if ctxt.HeadType != objabi.Hwindows { // Pass -z nodelete to mark the shared library as // non-closeable: a dlclose will do nothing. -@@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() { +@@ -1291,6 +1292,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -37,7 +35,7 @@ index 3fa258d..f96fb02 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() { +@@ -1299,6 +1301,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -45,6 +43,3 @@ index 3fa258d..f96fb02 100644 } } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 4f2a46c..59c12d9 100644 --- a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/make.bash b/src/make.bash -index 92d1481..0c2822f 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; exit 1 fi rm -f cmd/dist/dist @@ -30,7 +28,7 @@ index 92d1481..0c2822f 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -208,7 +208,7 @@ fi +@@ -209,7 +209,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. # Throw ours, built with Go 1.4, away after bootstrap. @@ -39,6 +37,3 @@ index 92d1481..0c2822f 100755 rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch similarity index 95% rename from meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch index 354aaca..7aee0ba 100644 --- a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch @@ -38,8 +38,6 @@ Signed-off-by: Alexander J Kube src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ 1 file changed, 112 insertions(+), 43 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 683ca6f..0ad082b 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -41,6 +41,7 @@ var ( @@ -58,7 +56,7 @@ index 683ca6f..0ad082b 100644 vflag int // verbosity ) -@@ -247,6 +249,8 @@ func xinit() { +@@ -249,6 +251,8 @@ func xinit() { if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) } @@ -67,7 +65,7 @@ index 683ca6f..0ad082b 100644 } // compilerEnv returns a map from "goos/goarch" to the -@@ -478,8 +482,10 @@ func setup() { +@@ -480,8 +484,10 @@ func setup() { p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { xremoveall(p) @@ -78,7 +76,7 @@ index 683ca6f..0ad082b 100644 if goos != gohostos || goarch != gohostarch { p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1207,12 +1213,29 @@ func cmdbootstrap() { +@@ -1244,12 +1250,29 @@ func cmdbootstrap() { var noBanner bool var debug bool @@ -109,7 +107,7 @@ index 683ca6f..0ad082b 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1266,8 +1289,13 @@ func cmdbootstrap() { +@@ -1303,8 +1326,13 @@ func cmdbootstrap() { xprintf("\n") } @@ -125,7 +123,7 @@ index 683ca6f..0ad082b 100644 goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gobin) if debug { -@@ -1296,7 +1324,11 @@ func cmdbootstrap() { +@@ -1333,7 +1361,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -138,7 +136,7 @@ index 683ca6f..0ad082b 100644 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) if debug { run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -@@ -1333,50 +1365,84 @@ func cmdbootstrap() { +@@ -1370,50 +1402,84 @@ func cmdbootstrap() { } checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) @@ -190,8 +188,6 @@ index 683ca6f..0ad082b 100644 - timelog("build", "host toolchain") - if vflag > 0 { - xprintf("\n") -- } -- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) + + if goos == oldgoos && goarch == oldgoarch { + // Common case - not setting up for cross-compilation. @@ -223,7 +219,8 @@ index 683ca6f..0ad082b 100644 + os.Setenv("GOARCH", goarch) + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) -+ } + } +- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) goInstall(goBootstrap, "std", "cmd") checkNotStale(goBootstrap, "std", "cmd") checkNotStale(cmdGo, "std", "cmd") @@ -231,12 +228,7 @@ index 683ca6f..0ad082b 100644 - timelog("build", "target toolchain") - if vflag > 0 { - xprintf("\n") -+ if debug { -+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) -+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) -+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) - } +- } - goos = oldgoos - goarch = oldgoarch - os.Setenv("GOOS", goos) @@ -257,10 +249,16 @@ index 683ca6f..0ad082b 100644 - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ if debug { ++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") ++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) ++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) ++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ } } // Check that there are no new files in $GOROOT/bin other than -@@ -1393,8 +1459,11 @@ func cmdbootstrap() { +@@ -1430,8 +1496,11 @@ func cmdbootstrap() { } } @@ -274,6 +272,3 @@ index 683ca6f..0ad082b 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch index e232c79..b93f83d 100644 --- a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch @@ -27,11 +27,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) -diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 33b7818..7617b4c 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { +@@ -670,6 +670,9 @@ func (b *Builder) addTransitiveLinkDeps( if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -41,11 +39,9 @@ index 33b7818..7617b4c 100644 haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 9305b2d..6560317 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -155,6 +155,8 @@ See also: go install, go get, go clean. +@@ -167,6 +167,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -54,10 +50,10 @@ index 9305b2d..6560317 100644 func init() { // break init cycle CmdBuild.Run = runBuild -@@ -167,6 +169,10 @@ func init() { +@@ -179,6 +181,10 @@ func init() { - AddBuildFlags(CmdBuild) - AddBuildFlags(CmdInstall) + AddBuildFlags(CmdBuild, DefaultBuildFlags) + AddBuildFlags(CmdInstall, DefaultBuildFlags) + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -65,11 +61,9 @@ index 9305b2d..6560317 100644 } // Note that flags consulted by other parts of the code -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index ccebaf8..59450d7 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) { +@@ -464,6 +464,23 @@ func (b *Builder) build(a *Action) (err return errors.New("binary-only packages are no longer supported") } @@ -93,7 +87,7 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) { +@@ -1493,6 +1510,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } @@ -108,6 +102,3 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch rename to meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch index 68e132f..b15d981 100644 --- a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -23,11 +23,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 6560317..5f3a988 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) { +@@ -251,7 +251,13 @@ func AddBuildFlags(cmd *base.Command, ma cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -41,7 +39,4 @@ index 6560317..5f3a988 100644 + cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") - cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.17.1 (Apple Git-112) - + if mask&OmitModFlag == 0 { diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch rename to meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch index 4bb1106..427cfb0 100644 --- a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch +++ b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch @@ -25,11 +25,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/x86/obj.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go -index 23741eb..8e74576 100644 --- a/src/cmd/link/internal/amd64/obj.go +++ b/src/cmd/link/internal/amd64/obj.go -@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) { +@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { PEreloc1: pereloc1, TLSIEtoLE: tlsIEtoLE, @@ -38,8 +36,6 @@ index 23741eb..8e74576 100644 Freebsddynld: "/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go -index 45a406e..724d3e3 100644 --- a/src/cmd/link/internal/arm/obj.go +++ b/src/cmd/link/internal/arm/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -51,8 +47,6 @@ index 45a406e..724d3e3 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go -index 7c66623..d8b1db1 100644 --- a/src/cmd/link/internal/arm64/obj.go +++ b/src/cmd/link/internal/arm64/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -62,10 +56,8 @@ index 7c66623..d8b1db1 100644 - Linuxdynld: "/lib/ld-linux-aarch64.so.1", + Linuxdynld: "/lib/ld-musl-aarch64.so.1", - Freebsddynld: "XXX", + Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", -diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go -index 231e1ff..631dd7a 100644 --- a/src/cmd/link/internal/mips/obj.go +++ b/src/cmd/link/internal/mips/obj.go @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -77,8 +69,6 @@ index 231e1ff..631dd7a 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go -index 9604208..5ef3ffc 100644 --- a/src/cmd/link/internal/mips64/obj.go +++ b/src/cmd/link/internal/mips64/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -90,8 +80,6 @@ index 9604208..5ef3ffc 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", Netbsddynld: "XXX", -diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go -index 51d1791..b15da85 100644 --- a/src/cmd/link/internal/ppc64/obj.go +++ b/src/cmd/link/internal/ppc64/obj.go @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -103,8 +91,6 @@ index 51d1791..b15da85 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go -index 3454476..42cc346 100644 --- a/src/cmd/link/internal/s390x/obj.go +++ b/src/cmd/link/internal/s390x/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -116,8 +102,6 @@ index 3454476..42cc346 100644 // not relevant for s390x Freebsddynld: "XXX", -diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go -index f1fad20..d2ca10c 100644 --- a/src/cmd/link/internal/x86/obj.go +++ b/src/cmd/link/internal/x86/obj.go @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -129,6 +113,3 @@ index f1fad20..d2ca10c 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/usr/libexec/ld.elf_so", --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.13.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.14.bb diff --git a/meta/recipes-devtools/go/go-cross_1.13.bb b/meta/recipes-devtools/go/go-cross_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.13.bb rename to meta/recipes-devtools/go/go-cross_1.14.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.13.bb rename to meta/recipes-devtools/go/go-crosssdk_1.14.bb diff --git a/meta/recipes-devtools/go/go-native_1.13.bb b/meta/recipes-devtools/go/go-native_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.13.bb rename to meta/recipes-devtools/go/go-native_1.14.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.13.bb b/meta/recipes-devtools/go/go-runtime_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.13.bb rename to meta/recipes-devtools/go/go-runtime_1.14.bb diff --git a/meta/recipes-devtools/go/go_1.13.bb b/meta/recipes-devtools/go/go_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.13.bb rename to meta/recipes-devtools/go/go_1.14.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:26 +0000 Subject: [oe-commits] [openembedded-core] 18/31: lsb-release: fix likely reproducabilty timestamp In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.A3992233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f102032082a46d041ba774facfe0889d5b6f5b20 Author: Jeremy A. Puhlman AuthorDate: Thu Feb 27 15:04:30 2020 -0800 lsb-release: fix likely reproducabilty timestamp Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Remove-timestamp-from-manpage.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 0000000..af095fd --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,27 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 +0000 +Subject: [PATCH] Remove timestamp from manpage + +Upstream-Status: Submitted [lsb-discuss at lists.linux-foundation.org] +Signed-off-by: Jeremy A. Puhlman +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e3026..a06cbcf 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:35 +0000 Subject: [oe-commits] [openembedded-core] 27/31: webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074710.06D36233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1d37887440c1ff78b41ec3c3034f5565d4cde727 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:36 2020 +0200 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7bffc15..cc69653 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:25 +0000 Subject: [oe-commits] [openembedded-core] 17/31: rt-tests: make manpages reproducible In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.9AF15233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 150b707ce37b52fe69b456778ac6265538e491a3 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:34 2020 -0800 rt-tests: make manpages reproducible add -n to gzip call Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...0001-gzip-with-n-for-build-reproducibilty.patch | 62 ++++++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 0000000..3bafbbe --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 +0000 +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa1..dad252b 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ + file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:34 +0000 Subject: [oe-commits] [openembedded-core] 26/31: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.F22F5233446@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b2cd31af6fc2d4ed6497c7164be558f7c2d7d94c Author: Pierre-Jean Texier AuthorDate: Wed Feb 26 18:35:06 2020 +0100 util-linux: upgrade 2.34 -> 2.35.1 License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 ++- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb similarity index 63% rename from meta/recipes-core/util-linux/util-linux_2.34.bb rename to meta/recipes-core/util-linux/util-linux_2.35.1.bb index 557449d..03afd2a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -7,8 +7,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:36 +0000 Subject: [oe-commits] [openembedded-core] 28/31: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074710.0FC0D23344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ff2c9d96976c773e8e5d761e6cc45cbc421b3680 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:37 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index cc69653..190bc78 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:37 +0000 Subject: [oe-commits] [openembedded-core] 29/31: webkitgtk: Remove obsolete woff2 comment In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074710.1908023344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7d29dae28b2d24d4f1b6f5cb91b367cca58ed3a6 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:49:23 2020 +0200 webkitgtk: Remove obsolete woff2 comment woff2 is now available in meta-webkit. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 190bc78..e4197d1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -55,7 +55,6 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" -# Source is at https://github.com/google/woff2 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:30 +0000 Subject: [oe-commits] [openembedded-core] 22/31: systemd: Drop local time64 patch in favour of upstreamed patches In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.C7D74233450@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bb0beaba3f7f701469171d0160e9f02396a25303 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:57 2020 -0800 systemd: Drop local time64 patch in favour of upstreamed patches https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ---------------------- meta/recipes-core/systemd/systemd_244.3.bb | 3 +-- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch deleted file mode 100644 index 33c5758..0000000 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Dec 2019 12:49:07 -0800 -Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout - -kernel prior to 64bit time_t support might not entertain such large -timeout therefore reduce it to INT_MAX which would set timer expiration -event after 68 years of uptime, should be good for all practical -purposes - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - src/basic/time-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index d7ef30d2fe52..4d3219f114b5 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1487,7 +1487,7 @@ int time_change_fd(void) { - - /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ - static const struct itimerspec its = { -- .it_value.tv_sec = TIME_T_MAX, -+ .it_value.tv_sec = INT_MAX, - }; - - _cleanup_close_ int fd; diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index e7d2997..dfb7ad5 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ + file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://99-default.preset \ " # patches needed by musl @@ -42,7 +42,6 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:32 +0000 Subject: [oe-commits] [openembedded-core] 24/31: atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074709.DBAF0233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bfefe39c7888df45005a0f4e1dec855cabda231b Author: Tim Orling AuthorDate: Wed Feb 26 16:06:00 2020 -0800 atk: upgrade 2.32.0 -> 2.34.1 Patch no longer applies (nor is needed) upstream. Release notes: https://gitlab.gnome.org/GNOME/atk/-/raw/633bde11f93ee971ba8902c6fadbc29c121f71af/NEWS Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...ld-enable-introspection-for-cross-compile.patch | 29 ---------------------- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc..0000000 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.32.0.bb b/meta/recipes-support/atk/atk_2.34.1.bb similarity index 73% rename from meta/recipes-support/atk/atk_2.32.0.bb rename to meta/recipes-support/atk/atk_2.34.1.bb index 6722372..277397c 100644 --- a/meta/recipes-support/atk/atk_2.32.0.bb +++ b/meta/recipes-support/atk/atk_2.34.1.bb @@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:38 +0000 Subject: [oe-commits] [openembedded-core] 30/31: ltp: Update to 20200120 In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074710.25339233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 175701829aae76523eb17011dffa4265a7ab0983 Author: Petr Vorel AuthorDate: Fri Feb 28 07:12:24 2020 +0100 ltp: Update to 20200120 Removed ffsb copying file (tool removed from upstream) Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++------ ...-Add-option-to-select-libc-implementation.patch | 103 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 47 ---------- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 10 files changed, 81 insertions(+), 321 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f..773844d 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -25,34 +25,6 @@ index 504042e11..94db06266 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile index 8de247075..eb240f432 100644 --- a/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abc..0598046 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e731..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669..ecc6660 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0..0000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa..0000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325e..350091a 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 89% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc..312eeca 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 07:47:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 07:47:39 +0000 Subject: [oe-commits] [openembedded-core] 31/31: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158287602846.24028.684461257288462167@git.openembedded.org> References: <158287602846.24028.684461257288462167@git.openembedded.org> Message-ID: <20200228074710.2E48B23344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 19acc7c244eacea49f2a9e4b207b2e69ba6853cd Author: Petr Vorel AuthorDate: Fri Feb 28 07:12:25 2020 +0100 ltp: Remove mips related open_posix_testsuite patch Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1d..0000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca..847f267 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:00 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (19acc7c -> b134604) Message-ID: <158287805998.22863.13741211324756601260@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 19acc7c ltp: Remove mips related open_posix_testsuite patch discard 1757018 ltp: Update to 20200120 discard 7d29dae webkitgtk: Remove obsolete woff2 comment discard ff2c9d9 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements discard 1d37887 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG discard b2cd31a util-linux: upgrade 2.34 -> 2.35.1 discard b9032ad maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk discard bfefe39 atk: upgrade 2.32.0 -> 2.34.1 new 4a49a0f maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk new f62ff01 util-linux: upgrade 2.34 -> 2.35.1 new 633b87f webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG new 73971f5 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new 678c072 webkitgtk: Remove obsolete woff2 comment new 1d1b08b ltp: Update to 20200120 new b134604 ltp: Remove mips related open_posix_testsuite patch This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (19acc7c) \ N -- N -- N refs/heads/master-next (b134604) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...ld-enable-introspection-for-cross-compile.patch | 29 ++++++++++++++++++++++ .../atk/{atk_2.34.1.bb => atk_2.32.0.bb} | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch rename meta/recipes-support/atk/{atk_2.34.1.bb => atk_2.32.0.bb} (73%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:01 +0000 Subject: [oe-commits] [openembedded-core] 01/07: maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.58B0E233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4a49a0fef2a9314ef7f61934ccc1be4e82b6a4fd Author: Tim Orling AuthorDate: Wed Feb 26 16:06:03 2020 -0800 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk For GUI automation purposes, strong motivation for accessibility (a11y) via python3-dogtail and python3-pyatspi2, so taking over from Anuj. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ac..10095ff 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -49,9 +49,9 @@ RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal " RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal " -RECIPE_MAINTAINER_pn-atk = "Anuj Mittal " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling " +RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling " +RECIPE_MAINTAINER_pn-atk = "Tim Orling " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:03 +0000 Subject: [oe-commits] [openembedded-core] 03/07: webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.73D8923344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 633b87ffdc2e7c55135b91c9fd9e12c20156e055 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:36 2020 +0200 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7bffc15..cc69653 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:02 +0000 Subject: [oe-commits] [openembedded-core] 02/07: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.6580A23344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f62ff01d20519c5ddaf2a63e71c03eee4c9dbdac Author: Pierre-Jean Texier AuthorDate: Wed Feb 26 18:35:06 2020 +0100 util-linux: upgrade 2.34 -> 2.35.1 License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 ++- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb similarity index 63% rename from meta/recipes-core/util-linux/util-linux_2.34.bb rename to meta/recipes-core/util-linux/util-linux_2.35.1.bb index 557449d..03afd2a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -7,8 +7,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:04 +0000 Subject: [oe-commits] [openembedded-core] 04/07: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.8518823344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 73971f54c232d9e4aaa1d85fd4cd81949adf0a7b Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:37 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index cc69653..190bc78 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:05 +0000 Subject: [oe-commits] [openembedded-core] 05/07: webkitgtk: Remove obsolete woff2 comment In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.96CAF233450@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 678c072c35f4372f8953a3817c465a69f6a071e1 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:49:23 2020 +0200 webkitgtk: Remove obsolete woff2 comment woff2 is now available in meta-webkit. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 190bc78..e4197d1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -55,7 +55,6 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" -# Source is at https://github.com/google/woff2 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:06 +0000 Subject: [oe-commits] [openembedded-core] 06/07: ltp: Update to 20200120 In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.A9355233452@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1d1b08b27b82b900120bc6b1e3fcafc50e0ba16a Author: Petr Vorel AuthorDate: Fri Feb 28 07:12:24 2020 +0100 ltp: Update to 20200120 Removed ffsb copying file (tool removed from upstream) Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++------ ...-Add-option-to-select-libc-implementation.patch | 103 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 47 ---------- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 10 files changed, 81 insertions(+), 321 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f..773844d 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -25,34 +25,6 @@ index 504042e11..94db06266 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile index 8de247075..eb240f432 100644 --- a/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abc..0598046 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e731..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669..ecc6660 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0..0000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa..0000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325e..350091a 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 89% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc..312eeca 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 08:21:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 08:21:07 +0000 Subject: [oe-commits] [openembedded-core] 07/07: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158287805998.22863.13741211324756601260@git.openembedded.org> References: <158287805998.22863.13741211324756601260@git.openembedded.org> Message-ID: <20200228082100.BA48C233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b13460448d7fcc3b25a68215e58a3d8e2b38bb39 Author: Petr Vorel AuthorDate: Fri Feb 28 07:12:25 2020 +0100 ltp: Remove mips related open_posix_testsuite patch Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1d..0000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca..847f267 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:40 +0000 Subject: [oe-commits] [openembedded-core] 02/27: libarchive: upgrade 3.4.1 -> 3.4.2 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.5096223344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8700c19699ea69fad7bc67a7596c477b6edac153 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:25 2020 +0100 libarchive: upgrade 3.4.1 -> 3.4.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.4.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 2d33dd8..c3edb57 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" -SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" +SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" +SRC_URI[sha256sum] = "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" inherit autotools update-alternatives pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:38 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b134604 -> 35016db) Message-ID: <158289279872.3317.14084630036104506101@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard b134604 ltp: Remove mips related open_posix_testsuite patch discard 1d1b08b ltp: Update to 20200120 discard 678c072 webkitgtk: Remove obsolete woff2 comment discard 73971f5 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements discard 633b87f webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG discard f62ff01 util-linux: upgrade 2.34 -> 2.35.1 discard 4a49a0f maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk discard e24d674 go: Update to 1.14 release series discard bb0beab systemd: Drop local time64 patch in favour of upstreamed patches discard 3b1040a systemd: Do not force removing resolved from PACKAGECONFIG discard baf69e9 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR discard 437f63f tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES discard f102032 lsb-release: fix likely reproducabilty timestamp discard 150b707 rt-tests: make manpages reproducible discard 87ab02b sysvinit: remove logsave.8 discard f60dfc7 Revert "make: 4.2.1 -> 4.3" discard 8400dd3 libedit/readline: Correct package alternatives link for manpage discard f9b1a41 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe discard b7c2b67 sysvinit: Fix install order/dependency discard fee6230 webkitgtk: Disable GI data for musl/arm discard 1523fd1 ncurses: upgrade 6.1+20191019 -> 6.2 discard d13b334 gst-validate: upgrade 1.16.1 -> 1.16.2 discard c2be6a6 acpica: upgrade 20191213 -> 20200214 discard 33ebab2 python3-setuptools: upgrade 45.0.0 -> 45.2.0 discard 9bce14d gnutls: upgrade 3.6.11.1 -> 3.6.12 discard 54f730b unifdef: upgrade 2.11 -> 2.12 discard 3c17f18 python3-mako: upgrade 1.1.0 -> 1.1.1 discard 25cedf1 python3-docutils: upgrade 0.15 -> 0.16 discard d88bf48 libpcre: upgrade 8.43 -> 8.44 discard baa348b libarchive: upgrade 3.4.1 -> 3.4.2 discard 450ce14 qemu: Fix CVE-2020-1711 discard 7bde6c9 make: 4.2.1 -> 4.3 new 8bf67bf qemu: Fix CVE-2020-1711 new 8700c19 libarchive: upgrade 3.4.1 -> 3.4.2 new 2cfe747 libpcre: upgrade 8.43 -> 8.44 new e7ddbf4 python3-docutils: upgrade 0.15 -> 0.16 new 2f6c3c8 python3-mako: upgrade 1.1.0 -> 1.1.1 new daccb3e unifdef: upgrade 2.11 -> 2.12 new d1bcb08 gnutls: upgrade 3.6.11.1 -> 3.6.12 new 99dfd16 python3-setuptools: upgrade 45.0.0 -> 45.2.0 new 2723703 acpica: upgrade 20191213 -> 20200214 new a1ce797 gst-validate: upgrade 1.16.1 -> 1.16.2 new 0f774a3b ncurses: upgrade 6.1+20191019 -> 6.2 new 1246511 webkitgtk: Disable GI data for musl/arm new 1f7f940 sysvinit: Fix install order/dependency new c2ada6d layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe new 1b4e66c libedit/readline: Correct package alternatives link for manpage new 973ceee sysvinit: remove logsave.8 new 8a96c4b rt-tests: make manpages reproducible new b4a5734 lsb-release: fix likely reproducabilty timestamp new 5c9e88d tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES new 1b335e9 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR new 6d53c5b systemd: Do not force removing resolved from PACKAGECONFIG new 6688673 systemd: Drop local time64 patch in favour of upstreamed patches new 122291a go: Update to 1.14 release series new adc7eb4 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk new 8ad808c webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG new 6b72d51 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new 35016db webkitgtk: Remove obsolete woff2 comment This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b134604) \ N -- N -- N refs/heads/master-next (35016db) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 27 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 +++++++ .../{util-linux_2.35.1.bb => util-linux_2.34.bb} | 5 +- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++++++-- ...-Add-option-to-select-libc-implementation.patch | 103 +++++++++++++++------ ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 +++++++ ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 +++++++++ ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++----- ...stcases-fix-an-absent-format-string-issue.patch | 24 +++++ ...rollers-Link-with-libfts-explicitly-on-mu.patch | 47 ++++++++++ ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 +++++++ ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ++++++++++++++ .../ltp/{ltp_20200120.bb => ltp_20190930.bb} | 11 ++- 14 files changed, 430 insertions(+), 85 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch rename meta/recipes-core/util-linux/{util-linux_2.35.1.bb => util-linux_2.34.bb} (63%) create mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch create mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch create mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch create mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch rename meta/recipes-extended/ltp/{ltp_20200120.bb => ltp_20190930.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:42 +0000 Subject: [oe-commits] [openembedded-core] 04/27: python3-docutils: upgrade 0.15 -> 0.16 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.6D85023344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e7ddbf4fb2849f0f085dc012797ea7ef4d528a0c Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:28 2020 +0100 python3-docutils: upgrade 0.15 -> 0.16 License-Update: formatting Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-docutils_0.15.bb b/meta/recipes-devtools/python/python3-docutils_0.16.bb similarity index 60% rename from meta/recipes-devtools/python/python3-docutils_0.15.bb rename to meta/recipes-devtools/python/python3-docutils_0.16.bb index f5c3f5d..50547a1 100644 --- a/meta/recipes-devtools/python/python3-docutils_0.15.bb +++ b/meta/recipes-devtools/python/python3-docutils_0.16.bb @@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation" HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" DEPENDS = "python3" SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "f51729f19e70a9dc4837433193a5e798" -SRC_URI[sha256sum] = "c35e87e985f70106f6f97e050f3bed990641e0e104566134b9cd23849a460e96" +SRC_URI[md5sum] = "9ccb6f332e23360f964de72c8ea5f0ed" +SRC_URI[sha256sum] = "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573" S = "${WORKDIR}/docutils-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:39 +0000 Subject: [oe-commits] [openembedded-core] 01/27: qemu: Fix CVE-2020-1711 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.4113F233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8bf67bfff47b1fb24cfbc1ee265c28779c10ff94 Author: Lee Chee Yang AuthorDate: Mon Feb 24 13:46:53 2020 +0800 qemu: Fix CVE-2020-1711 see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..f26e722 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:41 +0000 Subject: [oe-commits] [openembedded-core] 03/27: libpcre: upgrade 8.43 -> 8.44 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.60EDC23344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2cfe74714c846bd1f5c19eec4aeaff4a68b9f4d0 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:26 2020 +0100 libpcre: upgrade 8.43 -> 8.44 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libpcre/libpcre/out-of-tree.patch | 26 ---------------------- .../libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} | 9 ++++---- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch deleted file mode 100644 index d567896..0000000 --- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb similarity index 91% rename from meta/recipes-support/libpcre/libpcre_8.43.bb rename to meta/recipes-support/libpcre/libpcre_8.44.bb index f9a22fe..e5471e8 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:43 +0000 Subject: [oe-commits] [openembedded-core] 05/27: python3-mako: upgrade 1.1.0 -> 1.1.1 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.81CC2233450@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2f6c3c80e80732f8d1fd4e076ef6b0eef50913d9 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:29 2020 +0100 python3-mako: upgrade 1.1.0 -> 1.1.1 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-mako_1.1.0.bb b/meta/recipes-devtools/python/python3-mako_1.1.1.bb similarity index 63% rename from meta/recipes-devtools/python/python3-mako_1.1.0.bb rename to meta/recipes-devtools/python/python3-mako_1.1.1.bb index b139e5a..bc38009 100644 --- a/meta/recipes-devtools/python/python3-mako_1.1.0.bb +++ b/meta/recipes-devtools/python/python3-mako_1.1.1.bb @@ -2,14 +2,14 @@ SUMMARY = "Templating library for Python" HOMEPAGE = "http://www.makotemplates.org/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=df7e6c7c82990acf0228a55e00d29bc9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=943eb67718222db21d44a4ef1836675f" PYPI_PACKAGE = "Mako" inherit pypi setuptools3 -SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2" -SRC_URI[sha256sum] = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" +SRC_URI[md5sum] = "2660a4916f2f63456e6885c727b7cd2f" +SRC_URI[sha256sum] = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4" RDEPENDS_${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:44 +0000 Subject: [oe-commits] [openembedded-core] 06/27: unifdef: upgrade 2.11 -> 2.12 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.8F950233452@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit daccb3e8540464a6a73ea0d8825103e1738ad013 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:30 2020 +0100 unifdef: upgrade 2.11 -> 2.12 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/unifdef/unifdef_2.11.bb b/meta/recipes-devtools/unifdef/unifdef_2.12.bb similarity index 53% rename from meta/recipes-devtools/unifdef/unifdef_2.11.bb rename to meta/recipes-devtools/unifdef/unifdef_2.12.bb index 1ffc11e..22b10ba 100644 --- a/meta/recipes-devtools/unifdef/unifdef_2.11.bb +++ b/meta/recipes-devtools/unifdef/unifdef_2.12.bb @@ -3,12 +3,13 @@ SECTION = "devel" LICENSE = "BSD-2-Clause" HOMEPAGE = "http://dotat.at/prog/unifdef/" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fc6c2c1dc4f18c891ed5b7a469fe32 \ - file://unifdef.c;endline=32;md5=aaec84d8b68d8b6dea71f45e9949ebfe" +LIC_FILES_CHKSUM = "file://COPYING;md5=3498caf346f6b77934882101749ada23 \ + file://unifdef.c;endline=32;md5=6f4ee8085d6e6ab0f7cb4390e1a9c497 \ + " SRC_URI = "http://dotat.at/prog/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "337053fd8a7d9ab3adf5e50f88af95b7" -SRC_URI[sha256sum] = "828ffc270ac262b88fe011136acef2780c05b0dc3c5435d005651740788d4537" +SRC_URI[md5sum] = "ae8c0b3b4c43c1f6bc5f32412a820818" +SRC_URI[sha256sum] = "43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400" UPSTREAM_CHECK_REGEX = "unifdef-(?P((\d+\.*)+)(?![a-f0-9]{6,})).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:45 +0000 Subject: [oe-commits] [openembedded-core] 07/27: gnutls: upgrade 3.6.11.1 -> 3.6.12 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.9EB4A233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d1bcb0859ed8e9219db9494c3be2148d39a57a4b Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:31 2020 +0100 gnutls: upgrade 3.6.11.1 -> 3.6.12 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb b/meta/recipes-support/gnutls/gnutls_3.6.12.bb similarity index 93% rename from meta/recipes-support/gnutls/gnutls_3.6.11.1.bb rename to meta/recipes-support/gnutls/gnutls_3.6.12.bb index 5b05364..f1eeebc 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.12.bb @@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" -SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" +SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" +SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:46 +0000 Subject: [oe-commits] [openembedded-core] 08/27: python3-setuptools: upgrade 45.0.0 -> 45.2.0 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.ACCA0233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 99dfd167dd061fb26b6248be81d7b27d719462dc Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:32 2020 +0100 python3-setuptools: upgrade 45.0.0 -> 45.2.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index b1a6813..5f99cd2 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 +From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 09066f8..d3039a5 100644 +index 426301d..55c8062 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -649,6 +649,11 @@ class easy_install(Command): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index c697937..f7c3202 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" -SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" +SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30" +SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_45.0.0.bb rename to meta/recipes-devtools/python/python3-setuptools_45.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:47 +0000 Subject: [oe-commits] [openembedded-core] 09/27: acpica: upgrade 20191213 -> 20200214 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.B9B31233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2723703c715fadb3cc7b6563758f0989fd13b552 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:34 2020 +0100 acpica: upgrade 20191213 -> 20200214 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../acpica/{acpica_20191213.bb => acpica_20200214.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/acpica/acpica_20191213.bb b/meta/recipes-extended/acpica/acpica_20200214.bb similarity index 88% rename from meta/recipes-extended/acpica/acpica_20191213.bb rename to meta/recipes-extended/acpica/acpica_20200214.bb index 6b1412e..cfa9fec 100644 --- a/meta/recipes-extended/acpica/acpica_20191213.bb +++ b/meta/recipes-extended/acpica/acpica_20200214.bb @@ -10,15 +10,15 @@ HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[md5sum] = "0f0eb38e796fac24c2aa4d9b6adcd950" -SRC_URI[sha256sum] = "304930df9836d3d4cdbf67a3ae6bd96dbc65f62602d869f571f4b6a12341e6c6" +SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113" +SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:48 +0000 Subject: [oe-commits] [openembedded-core] 10/27: gst-validate: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.C3E69233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a1ce79760bb36d27b9f0dc45bbabc043ebba7202 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:35 2020 +0100 gst-validate: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb similarity index 87% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb index 7d602ea..35492fe 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "793e75f4717f718ad204c554d577b160" -SRC_URI[sha256sum] = "7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899" +SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c" +SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:49 +0000 Subject: [oe-commits] [openembedded-core] 11/27: ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.CE7D0233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0f774a3b0e2791cda8a04447ea476e6467315b91 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:27 2020 +0100 ncurses: upgrade 6.1+20191019 -> 6.2 License-Update: copyright years and holders Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index b7bf4c0..4156bf4 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb similarity index 89% rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb rename to meta/recipes-core/ncurses/ncurses_6.2.bb index 187777f..b6d899c 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:50 +0000 Subject: [oe-commits] [openembedded-core] 12/27: webkitgtk: Disable GI data for musl/arm In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.DBEB923344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1246511902ee926e05ca7c632a5149ea73543c9f Author: Khem Raj AuthorDate: Tue Feb 25 07:28:57 2020 -0800 webkitgtk: Disable GI data for musl/arm qemu-arm hangs forever when running gobject introspection Signed-off-by: Khem Raj Cc: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7bffc15 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -123,5 +123,10 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED_libc-musl_armv7a = "False" +GI_DATA_ENABLED_libc-musl_armv7ve = "False" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:51 +0000 Subject: [oe-commits] [openembedded-core] 13/27: sysvinit: Fix install order/dependency In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.E706A233446@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f7f94034285b41b9e37df7f32f958d7aa8c9156 Author: Mark Hatle AuthorDate: Tue Feb 25 11:49:29 2020 -0600 sysvinit: Fix install order/dependency It is possible for sysvinit to be installed before the passwd/group files are installed from base-passwd. This results in an warning that the shutdown group can't be found. Adding a dependeny on base-passwd will resolve this issue. This has similar symptoms to the problem that oe-core commit 0227e929021263c51d2e7db36224000fecb01f1c fixed. The fix is simular in that it ensures that base-passwd is installed first, just at runtime vs setscene time. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 21ef0e9..63c1084 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -70,7 +70,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:52 +0000 Subject: [oe-commits] [openembedded-core] 14/27: layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122639.F3AFA233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c2ada6dc407046ef38785f5828ec0da2e3e47a50 Author: Khem Raj AuthorDate: Tue Feb 25 09:51:26 2020 -0800 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe These are added as dependencies by mime class, which could be inherited along with allarch and dependencies silently go into target specific recipes and which then can result in sstate hash signature mismatches when the allarch recipes are reused for another arch [YOCTO #13805] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index fcdf9ae..60f8e26 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -43,6 +43,8 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-utils \ gstreamer1.0-meta-base \ ca-certificates \ + shared-mime-info \ + desktop-file-utils \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:53 +0000 Subject: [oe-commits] [openembedded-core] 15/27: libedit/readline: Correct package alternatives link for manpage In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.0B63323344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1b4e66cf372586b12af6c9ed9bb44d7597b83c05 Author: Jeremy A. Puhlman AuthorDate: Tue Feb 25 11:25:44 2020 -0800 libedit/readline: Correct package alternatives link for manpage Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4babcbd..052e2d5 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 267fdcc..8d2d57a 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:57 +0000 Subject: [oe-commits] [openembedded-core] 19/27: tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.3988A233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5c9e88d14bb1aa149aa4201464e0bd14085a66bf Author: Jaewon Lee AuthorDate: Thu Jan 23 13:02:59 2020 -0800 tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES Without the proper default tune in TUNE_FEATURES, certain variables won't expand correctly. MACHINEOVERRIDES won't add cortexa72-cortexa53: TUNE_CCARGS won't add -mtune=cortexa72.cortexa-53, generating the toolchain incorrectly. Adding missing 'cortexa72-cortexa53' to both TUNE_FEATURES_tune-cortexa72-cortexa53 and TUNE_FEATURES_tune-cortexa72-cortexa53-crypto Signed-off-by: Jaewon Lee Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc index 0d43531..f208b98 100644 --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc @@ -14,8 +14,8 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", " - AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" -TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc}" -TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto}" +TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" +TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" BASE_LIB_tune-cortexa72-cortexa53 = "lib64" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:55 +0000 Subject: [oe-commits] [openembedded-core] 17/27: rt-tests: make manpages reproducible In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.216BB233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8a96c4b427e40cf5ebd18f09a113918635c6b524 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:34 2020 -0800 rt-tests: make manpages reproducible add -n to gzip call Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...0001-gzip-with-n-for-build-reproducibilty.patch | 62 ++++++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 0000000..3bafbbe --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 +0000 +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa1..dad252b 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ + file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:58 +0000 Subject: [oe-commits] [openembedded-core] 20/27: linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.439CC23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1b335e9671bec6b94289755a1e7cb9656ae8888a Author: Khem Raj AuthorDate: Thu Feb 27 00:05:55 2020 -0800 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR __UAPI_DEF_ETHHDR has been defined in kernel UAPI [1] and musl already defined it to 0 via [2] So these patches can now be dropped. [1] https://patchwork.ozlabs.org/patch/872502/ [2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 31 ---------------------- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 30 --------------------- .../linux-libc-headers/linux-libc-headers_5.4.bb | 2 -- 3 files changed, 63 deletions(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch deleted file mode 100644 index 68b2446..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 1 Mar 2018 18:31:01 -0500 -Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file - -Signed-off-by: Bruce Ashfield -Upstream-Status: Pending ---- - include/uapi/linux/if_ether.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 153c9c2..7b69b73 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -149,6 +149,12 @@ - * This is an Ethernet frame header. - */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ - #ifndef __UAPI_DEF_ETHHDR - #define __UAPI_DEF_ETHHDR 1 --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index fb7e1de..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Wed, 22 Jan 2014 00:57:48 +0100 -Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr - ---- -Signed-off-by: Khem Raj -Upstream-Status: Submitted - - include/uapi/linux/if_ether.h | 4 +++- - include/uapi/linux/libc-compat.h | 6 ++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: linux-4.15/include/uapi/linux/libc-compat.h -=================================================================== ---- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 -+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 -@@ -51,6 +51,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 5037739..8a12103 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -2,10 +2,8 @@ require linux-libc-headers.inc SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:27:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:27:02 +0000 Subject: [oe-commits] [openembedded-core] 24/27: maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.7314B233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit adc7eb4bc9ac7fd86424c9ed35e85ac5766097c5 Author: Tim Orling AuthorDate: Wed Feb 26 16:06:03 2020 -0800 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk For GUI automation purposes, strong motivation for accessibility (a11y) via python3-dogtail and python3-pyatspi2, so taking over from Anuj. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ac..10095ff 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -49,9 +49,9 @@ RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal " RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal " -RECIPE_MAINTAINER_pn-atk = "Anuj Mittal " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling " +RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling " +RECIPE_MAINTAINER_pn-atk = "Tim Orling " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:54 +0000 Subject: [oe-commits] [openembedded-core] 16/27: sysvinit: remove logsave.8 In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.1656D23344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 973ceee55ec26dd27511b37eb5d5064400535ec2 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:33 2020 -0800 sysvinit: remove logsave.8 logsave is a duplicate from e2fsprogs, which was already removed, but the man page remained which is also a duplicate. However it does not get modifed on install so it conflicts with the e2fsprogs version. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 63c1084..d2b85ed 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -110,4 +110,5 @@ do_install () { # Already provided by e2fsprogs; sysvinit's version is a copy from there rm ${D}${base_sbindir}/logsave + rm ${D}${mandir}/man8/logsave.8 } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:27:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:27:00 +0000 Subject: [oe-commits] [openembedded-core] 22/27: systemd: Drop local time64 patch in favour of upstreamed patches In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.5AA2E233452@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6688673499e0fb9c306669e2d13f310d6b1789c5 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:57 2020 -0800 systemd: Drop local time64 patch in favour of upstreamed patches https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ---------------------- meta/recipes-core/systemd/systemd_244.3.bb | 3 +-- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch deleted file mode 100644 index 33c5758..0000000 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Dec 2019 12:49:07 -0800 -Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout - -kernel prior to 64bit time_t support might not entertain such large -timeout therefore reduce it to INT_MAX which would set timer expiration -event after 68 years of uptime, should be good for all practical -purposes - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - src/basic/time-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index d7ef30d2fe52..4d3219f114b5 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1487,7 +1487,7 @@ int time_change_fd(void) { - - /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ - static const struct itimerspec its = { -- .it_value.tv_sec = TIME_T_MAX, -+ .it_value.tv_sec = INT_MAX, - }; - - _cleanup_close_ int fd; diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index e7d2997..dfb7ad5 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ + file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://99-default.preset \ " # patches needed by musl @@ -42,7 +42,6 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:27:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:27:01 +0000 Subject: [oe-commits] [openembedded-core] 23/27: go: Update to 1.14 release series In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.69563233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 122291ac4772a0ba9f80cfa679efd0365e77762c Author: Khem Raj AuthorDate: Thu Feb 27 00:05:58 2020 -0800 go: Update to 1.14 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++--- ...1-allow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...-content-based-hash-generation-less-pedan.patch | 33 ++++++++----------- ...OLDIR-to-be-overridden-in-the-environment.patch | 11 ++----- .../0004-ld-add-soname-to-shareable-objects.patch | 11 ++----- ...verride-CC-when-building-dist-and-go_boot.patch | 9 ++---- ...-cmd-dist-separate-host-and-target-builds.patch | 37 ++++++++++------------ ...07-cmd-go-make-GOROOT-precious-by-default.patch | 23 ++++---------- .../0008-use-GOBUILDMODE-to-set-buildmode.patch | 9 ++---- ...ld-replace-glibc-dynamic-linker-with-musl.patch | 23 ++------------ ...-canadian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 .../{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../go/{go-native_1.13.bb => go-native_1.14.bb} | 0 .../go/{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../recipes-devtools/go/{go_1.13.bb => go_1.14.bb} | 0 17 files changed, 53 insertions(+), 120 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e957e3a..31d4b3b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" -GOVERSION ?= "1.13%" +GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "9.0.1" diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc similarity index 81% rename from meta/recipes-devtools/go/go-1.13.inc rename to meta/recipes-devtools/go/go-1.14.inc index 7780ace..ac7b95c 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.13" -GO_MINOR = ".8" +GO_BASEVERSION = "1.14" +GO_MINOR = "" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" -SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" +SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" +SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e4..d47664d 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch @@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 17852de..7b5ec5e 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { +@@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { @@ -33,6 +31,3 @@ index 17852de..7b5ec5e 100644 } env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch rename to meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 4eddd39..9e88567 100644 --- a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -50,11 +50,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 19 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 7b5ec5e..292f117 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar { +@@ -156,7 +156,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { var b work.Builder b.Init() @@ -63,8 +61,6 @@ index 7b5ec5e..292f117 100644 if err != nil { // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 7dd9a90..ccebaf8 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -32,6 +32,8 @@ import ( @@ -76,16 +72,16 @@ index 7dd9a90..ccebaf8 100644 // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - // The compiler hides the exact value of $GOROOT - // when building things in GOROOT. +@@ -208,7 +210,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. + // When -trimpath is used with a package built from the module cache, + // use the module path and version instead of the directory. - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { fmt.Fprintf(h, "dir %s\n", p.Dir) - } - fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) -@@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + } else if cfg.BuildTrimpath && p.Module != nil { + fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) +@@ -224,13 +226,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -103,7 +99,7 @@ index 7dd9a90..ccebaf8 100644 } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2229,33 +2231,48 @@ var ( +@@ -2228,33 +2230,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -161,7 +157,7 @@ index 7dd9a90..ccebaf8 100644 } // compilerExe returns the compiler to use given an -@@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string { +@@ -2263,11 +2280,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -179,7 +175,7 @@ index 7dd9a90..ccebaf8 100644 return compiler } -@@ -2429,7 +2451,7 @@ func envList(key, def string) []string { +@@ -2428,7 +2450,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -188,7 +184,7 @@ index 7dd9a90..ccebaf8 100644 defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2447,6 +2469,14 @@ func (b *Builder) CFlags(p *load.Package return } @@ -203,7 +199,7 @@ index 7dd9a90..ccebaf8 100644 return } -@@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2461,7 +2491,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -212,7 +208,7 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return nil, nil, err } -@@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -2820,7 +2850,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -221,6 +217,3 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return "", "", err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch similarity index 83% rename from meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 9aa0119..662c705 100644 --- a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 9e50311..683ca6f 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -244,7 +244,9 @@ func xinit() { +@@ -246,7 +246,9 @@ func xinit() { workdir = xworkdir() xatexit(rmworkdir) @@ -32,11 +30,9 @@ index 9e50311..683ca6f 100644 } // compilerEnv returns a map from "goos/goarch" to the -diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a3277a6..db96350 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -60,7 +60,11 @@ func defaultContext() build.Context { +@@ -64,7 +64,11 @@ func defaultContext() build.Context { // variables. This matches the initialization of ToolDir in // go/build, except for using ctxt.GOROOT rather than // runtime.GOROOT. @@ -49,6 +45,3 @@ index a3277a6..db96350 100644 } ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch similarity index 82% rename from meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch index 40763ad..75c9c75 100644 --- a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 3fa258d..f96fb02 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() { +@@ -1280,6 +1280,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -29,7 +27,7 @@ index 3fa258d..f96fb02 100644 if ctxt.HeadType != objabi.Hwindows { // Pass -z nodelete to mark the shared library as // non-closeable: a dlclose will do nothing. -@@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() { +@@ -1291,6 +1292,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -37,7 +35,7 @@ index 3fa258d..f96fb02 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() { +@@ -1299,6 +1301,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -45,6 +43,3 @@ index 3fa258d..f96fb02 100644 } } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 4f2a46c..59c12d9 100644 --- a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/make.bash b/src/make.bash -index 92d1481..0c2822f 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; exit 1 fi rm -f cmd/dist/dist @@ -30,7 +28,7 @@ index 92d1481..0c2822f 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -208,7 +208,7 @@ fi +@@ -209,7 +209,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. # Throw ours, built with Go 1.4, away after bootstrap. @@ -39,6 +37,3 @@ index 92d1481..0c2822f 100755 rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch similarity index 95% rename from meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch index 354aaca..7aee0ba 100644 --- a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch @@ -38,8 +38,6 @@ Signed-off-by: Alexander J Kube src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ 1 file changed, 112 insertions(+), 43 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 683ca6f..0ad082b 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -41,6 +41,7 @@ var ( @@ -58,7 +56,7 @@ index 683ca6f..0ad082b 100644 vflag int // verbosity ) -@@ -247,6 +249,8 @@ func xinit() { +@@ -249,6 +251,8 @@ func xinit() { if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) } @@ -67,7 +65,7 @@ index 683ca6f..0ad082b 100644 } // compilerEnv returns a map from "goos/goarch" to the -@@ -478,8 +482,10 @@ func setup() { +@@ -480,8 +484,10 @@ func setup() { p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { xremoveall(p) @@ -78,7 +76,7 @@ index 683ca6f..0ad082b 100644 if goos != gohostos || goarch != gohostarch { p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1207,12 +1213,29 @@ func cmdbootstrap() { +@@ -1244,12 +1250,29 @@ func cmdbootstrap() { var noBanner bool var debug bool @@ -109,7 +107,7 @@ index 683ca6f..0ad082b 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1266,8 +1289,13 @@ func cmdbootstrap() { +@@ -1303,8 +1326,13 @@ func cmdbootstrap() { xprintf("\n") } @@ -125,7 +123,7 @@ index 683ca6f..0ad082b 100644 goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gobin) if debug { -@@ -1296,7 +1324,11 @@ func cmdbootstrap() { +@@ -1333,7 +1361,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -138,7 +136,7 @@ index 683ca6f..0ad082b 100644 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) if debug { run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -@@ -1333,50 +1365,84 @@ func cmdbootstrap() { +@@ -1370,50 +1402,84 @@ func cmdbootstrap() { } checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) @@ -190,8 +188,6 @@ index 683ca6f..0ad082b 100644 - timelog("build", "host toolchain") - if vflag > 0 { - xprintf("\n") -- } -- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) + + if goos == oldgoos && goarch == oldgoarch { + // Common case - not setting up for cross-compilation. @@ -223,7 +219,8 @@ index 683ca6f..0ad082b 100644 + os.Setenv("GOARCH", goarch) + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) -+ } + } +- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) goInstall(goBootstrap, "std", "cmd") checkNotStale(goBootstrap, "std", "cmd") checkNotStale(cmdGo, "std", "cmd") @@ -231,12 +228,7 @@ index 683ca6f..0ad082b 100644 - timelog("build", "target toolchain") - if vflag > 0 { - xprintf("\n") -+ if debug { -+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) -+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) -+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) - } +- } - goos = oldgoos - goarch = oldgoarch - os.Setenv("GOOS", goos) @@ -257,10 +249,16 @@ index 683ca6f..0ad082b 100644 - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ if debug { ++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") ++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) ++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) ++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ } } // Check that there are no new files in $GOROOT/bin other than -@@ -1393,8 +1459,11 @@ func cmdbootstrap() { +@@ -1430,8 +1496,11 @@ func cmdbootstrap() { } } @@ -274,6 +272,3 @@ index 683ca6f..0ad082b 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch index e232c79..b93f83d 100644 --- a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch @@ -27,11 +27,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) -diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 33b7818..7617b4c 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { +@@ -670,6 +670,9 @@ func (b *Builder) addTransitiveLinkDeps( if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -41,11 +39,9 @@ index 33b7818..7617b4c 100644 haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 9305b2d..6560317 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -155,6 +155,8 @@ See also: go install, go get, go clean. +@@ -167,6 +167,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -54,10 +50,10 @@ index 9305b2d..6560317 100644 func init() { // break init cycle CmdBuild.Run = runBuild -@@ -167,6 +169,10 @@ func init() { +@@ -179,6 +181,10 @@ func init() { - AddBuildFlags(CmdBuild) - AddBuildFlags(CmdInstall) + AddBuildFlags(CmdBuild, DefaultBuildFlags) + AddBuildFlags(CmdInstall, DefaultBuildFlags) + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -65,11 +61,9 @@ index 9305b2d..6560317 100644 } // Note that flags consulted by other parts of the code -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index ccebaf8..59450d7 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) { +@@ -464,6 +464,23 @@ func (b *Builder) build(a *Action) (err return errors.New("binary-only packages are no longer supported") } @@ -93,7 +87,7 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) { +@@ -1493,6 +1510,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } @@ -108,6 +102,3 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch rename to meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch index 68e132f..b15d981 100644 --- a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -23,11 +23,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 6560317..5f3a988 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) { +@@ -251,7 +251,13 @@ func AddBuildFlags(cmd *base.Command, ma cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -41,7 +39,4 @@ index 6560317..5f3a988 100644 + cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") - cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.17.1 (Apple Git-112) - + if mask&OmitModFlag == 0 { diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch rename to meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch index 4bb1106..427cfb0 100644 --- a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch +++ b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch @@ -25,11 +25,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/x86/obj.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go -index 23741eb..8e74576 100644 --- a/src/cmd/link/internal/amd64/obj.go +++ b/src/cmd/link/internal/amd64/obj.go -@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) { +@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { PEreloc1: pereloc1, TLSIEtoLE: tlsIEtoLE, @@ -38,8 +36,6 @@ index 23741eb..8e74576 100644 Freebsddynld: "/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go -index 45a406e..724d3e3 100644 --- a/src/cmd/link/internal/arm/obj.go +++ b/src/cmd/link/internal/arm/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -51,8 +47,6 @@ index 45a406e..724d3e3 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go -index 7c66623..d8b1db1 100644 --- a/src/cmd/link/internal/arm64/obj.go +++ b/src/cmd/link/internal/arm64/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -62,10 +56,8 @@ index 7c66623..d8b1db1 100644 - Linuxdynld: "/lib/ld-linux-aarch64.so.1", + Linuxdynld: "/lib/ld-musl-aarch64.so.1", - Freebsddynld: "XXX", + Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", -diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go -index 231e1ff..631dd7a 100644 --- a/src/cmd/link/internal/mips/obj.go +++ b/src/cmd/link/internal/mips/obj.go @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -77,8 +69,6 @@ index 231e1ff..631dd7a 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go -index 9604208..5ef3ffc 100644 --- a/src/cmd/link/internal/mips64/obj.go +++ b/src/cmd/link/internal/mips64/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -90,8 +80,6 @@ index 9604208..5ef3ffc 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", Netbsddynld: "XXX", -diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go -index 51d1791..b15da85 100644 --- a/src/cmd/link/internal/ppc64/obj.go +++ b/src/cmd/link/internal/ppc64/obj.go @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -103,8 +91,6 @@ index 51d1791..b15da85 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go -index 3454476..42cc346 100644 --- a/src/cmd/link/internal/s390x/obj.go +++ b/src/cmd/link/internal/s390x/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -116,8 +102,6 @@ index 3454476..42cc346 100644 // not relevant for s390x Freebsddynld: "XXX", -diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go -index f1fad20..d2ca10c 100644 --- a/src/cmd/link/internal/x86/obj.go +++ b/src/cmd/link/internal/x86/obj.go @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -129,6 +113,3 @@ index f1fad20..d2ca10c 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/usr/libexec/ld.elf_so", --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.13.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.14.bb diff --git a/meta/recipes-devtools/go/go-cross_1.13.bb b/meta/recipes-devtools/go/go-cross_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.13.bb rename to meta/recipes-devtools/go/go-cross_1.14.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.13.bb rename to meta/recipes-devtools/go/go-crosssdk_1.14.bb diff --git a/meta/recipes-devtools/go/go-native_1.13.bb b/meta/recipes-devtools/go/go-native_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.13.bb rename to meta/recipes-devtools/go/go-native_1.14.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.13.bb b/meta/recipes-devtools/go/go-runtime_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.13.bb rename to meta/recipes-devtools/go/go-runtime_1.14.bb diff --git a/meta/recipes-devtools/go/go_1.13.bb b/meta/recipes-devtools/go/go_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.13.bb rename to meta/recipes-devtools/go/go_1.14.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:27:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:27:03 +0000 Subject: [oe-commits] [openembedded-core] 25/27: webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.7E9CC233446@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ad808c725c4ebf1d6ccfd47c0cc9496fbf8c400 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:36 2020 +0200 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7bffc15..cc69653 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:56 +0000 Subject: [oe-commits] [openembedded-core] 18/27: lsb-release: fix likely reproducabilty timestamp In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.2E6CE233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b4a5734e328f1a715069b240cc70d8c227f7e27e Author: Jeremy A. Puhlman AuthorDate: Thu Feb 27 15:04:30 2020 -0800 lsb-release: fix likely reproducabilty timestamp Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Remove-timestamp-from-manpage.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 0000000..af095fd --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,27 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 +0000 +Subject: [PATCH] Remove timestamp from manpage + +Upstream-Status: Submitted [lsb-discuss at lists.linux-foundation.org] +Signed-off-by: Jeremy A. Puhlman +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e3026..a06cbcf 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:27:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:27:04 +0000 Subject: [oe-commits] [openembedded-core] 26/27: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.88B54233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6b72d512bc816da536fea0622fe2b804f3357b27 Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:37 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index cc69653..190bc78 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:26:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:26:59 +0000 Subject: [oe-commits] [openembedded-core] 21/27: systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.4EA3B233450@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6d53c5b2e666c02bd8c8cc17145600b70195ee91 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:56 2020 -0800 systemd: Do not force removing resolved from PACKAGECONFIG This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d86341..e7d2997 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ - resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " + # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 12:27:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 12:27:05 +0000 Subject: [oe-commits] [openembedded-core] 27/27: webkitgtk: Remove obsolete woff2 comment In-Reply-To: <158289279872.3317.14084630036104506101@git.openembedded.org> References: <158289279872.3317.14084630036104506101@git.openembedded.org> Message-ID: <20200228122640.9351223344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 35016db414fc39a63ab6241806b492f786bdc62a Author: Adrian Bunk AuthorDate: Wed Feb 26 13:49:23 2020 +0200 webkitgtk: Remove obsolete woff2 comment woff2 is now available in meta-webkit. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 190bc78..e4197d1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -55,7 +55,6 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" -# Source is at https://github.com/google/woff2 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 15:02:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 15:02:17 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: libowfat: fix sdk installation In-Reply-To: <158290213663.16227.10051893005195089971@git.openembedded.org> References: <158290213663.16227.10051893005195089971@git.openembedded.org> Message-ID: <20200228150216.CFEBD233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 83070e7e8691188ce125f339ca5eb51b3c98bf0f Author: Andr? Draszik AuthorDate: Fri Feb 28 09:34:37 2020 +0000 libowfat: fix sdk installation Building an SDK with this included fails: * calculate_dependencies_for: Cannot satisfy the following dependencies for ncp-dev: * libowfat (= 0.32-r0) * * opkg_solver_install: Cannot install package ncp-dev. libowfat only provides a static library, so there no ${PN} package is created by default. Add ALLOW_EMPTY_${PN} = "1" to allow creation of an empty ${PN} package. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-networking/recipes-support/ncp/libowfat_0.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-networking/recipes-support/ncp/libowfat_0.32.bb index 24f4135..d2f4df7 100644 --- a/meta-networking/recipes-support/ncp/libowfat_0.32.bb +++ b/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -26,4 +26,6 @@ do_install() { MAN3DIR=${mandir}/man3 } +ALLOW_EMPTY_${PN} = "1" + BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 15:02:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 15:02:16 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (f017ca0 -> 15d0a68) Message-ID: <158290213663.16227.10051893005195089971@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from f017ca0 python3-appdirs: enable ptest new 83070e7 libowfat: fix sdk installation new 5674b0a lmsensors: Fix sensord dependencies new e9f3512 meta-oe: use COMMON_LICENSE_DIR for license file location new bad5e41 meta-multimedia: use COMMON_LICENSE_DIR for license file location new 15d0a68 meta-networking: use COMMON_LICENSE_DIR for license file location The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +- .../recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 2 +- .../recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 2 +- .../recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 2 +- meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++-- meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb | 2 +- meta-networking/recipes-support/arptables/arptables_git.bb | 2 +- meta-networking/recipes-support/ncp/libowfat_0.32.bb | 2 ++ meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +- meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | 2 +- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 3 +-- .../recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++-- meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 2 +- meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 15:02:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 15:02:18 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: lmsensors: Fix sensord dependencies In-Reply-To: <158290213663.16227.10051893005195089971@git.openembedded.org> References: <158290213663.16227.10051893005195089971@git.openembedded.org> Message-ID: <20200228150216.EA926233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5674b0a9e8778f7538419451e629ef0c13711123 Author: Paul Barker AuthorDate: Fri Feb 28 13:15:25 2020 +0000 lmsensors: Fix sensord dependencies If sensord is removed from PACKAGECONFIG, the recipe should not depend on rrdtool and the lmsensors package should not depend on lmsensors-sensord. Signed-off-by: Paul Barker Signed-off-by: Khem Raj --- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 48490e8..890db55 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = " \ bison-native \ flex-native \ - rrdtool \ virtual/libiconv \ " @@ -91,7 +90,7 @@ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += " \ ${PN}-libsensors \ ${PN}-sensors \ - ${PN}-sensord \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ ${PN}-fancontrol \ ${PN}-sensorsdetect \ ${PN}-sensorsconfconvert \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 15:02:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 15:02:19 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: meta-oe: use COMMON_LICENSE_DIR for license file location In-Reply-To: <158290213663.16227.10051893005195089971@git.openembedded.org> References: <158290213663.16227.10051893005195089971@git.openembedded.org> Message-ID: <20200228150217.06430233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e9f3512be45e3984cddfe5cbcbf4f5bcd8898030 Author: Andr? Draszik AuthorDate: Fri Feb 28 13:36:04 2020 +0000 meta-oe: use COMMON_LICENSE_DIR for license file location COMMON_LICENSE_DIR is the official location for license files Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | 2 +- .../recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++-- meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 2 +- meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb index 17e8c70..39a0ccc 100644 --- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb +++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Dhrystone CPU benchmark" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851" SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \ file://dhrystone.patch" diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index d6da51b..9c16da4 100644 --- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb @@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \ that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \ it requires libxml2 and python 2 at the same time, which can no longer be satisfied. " LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" SRC_URI = "file://gnome-doc-utils.m4" PROVIDES = "gnome-doc-utils" diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb index d2058ba..fae760b 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Machine specific gpsd config" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb" # empty by default # BSP layers can add stuff like meta-openmoko example: diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb index 39629cc..44679c0 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Very fast, header only, C++ logging library." HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 15:02:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 15:02:20 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: meta-multimedia: use COMMON_LICENSE_DIR for license file location In-Reply-To: <158290213663.16227.10051893005195089971@git.openembedded.org> References: <158290213663.16227.10051893005195089971@git.openembedded.org> Message-ID: <20200228150217.156B9233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bad5e4175f9cebcf32042a4ba1d5254c2d4e0e91 Author: Andr? Draszik AuthorDate: Fri Feb 28 13:36:26 2020 +0000 meta-multimedia: use COMMON_LICENSE_DIR for license file location COMMON_LICENSE_DIR is the official location for license files Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +- meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 2 +- meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 2 +- meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb index cee386c..70eb6e4 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb @@ -1,7 +1,7 @@ SUMMARY = "Big Buck Bunny movie - 1080P" LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi" SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb index d395b92..df23689 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb @@ -1,7 +1,7 @@ SUMMARY = "Big Buck Bunny movie - 480P" LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "https://archive.org/download/BigBuckBunny/big_buck_bunny_480p_surround-fix.avi" SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb index 20d5627..cb8ece0 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb @@ -1,7 +1,7 @@ SUMMARY = "Big Buck Bunny movie - 720P" LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "https://archive.org/download/BigBuckBunny/big_buck_bunny_720p_surround.avi" SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc" diff --git a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb index 0582a48..04cbd2e 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb @@ -1,6 +1,6 @@ SUMMARY = "Tears of Steel movie - 1080P" LICENSE = "CC-BY-3.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "http://ftp.nluug.nl/pub/graphics/blender/demo/movies/ToS/ToS-4k-1920.mov" SRC_URI[md5sum] = "e3fee55b1779c553e37b1d3988e6fad6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 15:02:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 15:02:21 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: meta-networking: use COMMON_LICENSE_DIR for license file location In-Reply-To: <158290213663.16227.10051893005195089971@git.openembedded.org> References: <158290213663.16227.10051893005195089971@git.openembedded.org> Message-ID: <20200228150217.232E2233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 15d0a681d64fa2adaa44b49962ccf96a060e3dac Author: Andr? Draszik AuthorDate: Fri Feb 28 13:37:01 2020 +0000 meta-networking: use COMMON_LICENSE_DIR for license file location COMMON_LICENSE_DIR is the official location for license files Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++-- meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb | 2 +- meta-networking/recipes-support/arptables/arptables_git.bb | 2 +- meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb index 71d8fa2..4d57255 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb @@ -3,8 +3,8 @@ SECTION = "console/network" LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " + file://${COMMON_LICENSE_DIR}/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ + file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " SAMBA_MIRROR = "http://samba.org/samba/ftp" MIRRORS += "\ diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb index 8fdaf84..21b0268 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb @@ -1,7 +1,7 @@ SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" SECTION = "net/misc" LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" DEPENDS = "libbsd libevent" diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index cec1d1f..e88631e 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Administration tool for arp packet filtering" SECTION = "net" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" PV = "0.0.4+git${SRCPV}" diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb index f42223b..ba6e23e 100644 --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \ one: you don't have to type the coordinates of your peer." HOMEPAGE = "http://www.fefe.de/ncp" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "libowfat" SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:33 +0000 Subject: [oe-commits] [openembedded-core] 01/06: ltp: Update to 20200120 In-Reply-To: <158291283238.25028.12092978829935351027@git.openembedded.org> References: <158291283238.25028.12092978829935351027@git.openembedded.org> Message-ID: <20200228180033.05316233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6ab1a6a359e47d76b7d3a3567f45a38ab7ed685f Author: Petr Vorel AuthorDate: Fri Feb 28 18:57:30 2020 +0100 ltp: Update to 20200120 Removed ffsb copying file and associated runtest file fs_ext4 (both removed in this release). Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch IMHO this one shouldn't be needed not, but CI still fails without it Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/ltp.py | 2 +- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++------ ...-Add-option-to-select-libc-implementation.patch | 103 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 11 files changed, 95 insertions(+), 282 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py index b8b7300..6dc5ef2 100644 --- a/meta/lib/oeqa/runtime/cases/ltp.py +++ b/meta/lib/oeqa/runtime/cases/ltp.py @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] + ltp_fs = ["fs", "fsx", "fs_bind"] # skip kernel cpuhotplug ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] ltp_groups += ltp_fs diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f..773844d 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -25,34 +25,6 @@ index 504042e11..94db06266 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile index 8de247075..eb240f432 100644 --- a/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abc..0598046 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e731..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669..ecc6660 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch index eff9ed0..4120250 100644 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch @@ -1,21 +1,27 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 +From 2f6f356a49e28eb597df063e31770632e69a93aa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 +Date: Fri, 28 Feb 2020 14:55:26 +0100 Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl musl does not implement fts like glibc and therefore it depends on external implementation for all fts APIs -Upstream-Status: Pending +Upstream-Status: not acceptible Signed-off-by: Khem Raj +[ pvorel: rebased for 20200120 +IMHO this patch should not be needed as commits +22f510de8 ("Fix static linking with musl-fts") and +b24f3d32c ("cpuset: Detect missing fts.h") should handle it +but CI still report failures ] +Signed-off-by: Petr Vorel --- testcases/kernel/controllers/Makefile.inc | 3 +++ testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 +index 4ca0b5ac3..1d85e4d86 100644 --- a/testcases/kernel/controllers/Makefile.inc +++ b/testcases/kernel/controllers/Makefile.inc @@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) @@ -29,13 +35,13 @@ index 4ca0b5a..1d85e4d 100644 INSTALL_TARGETS ?= *.sh diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 +index c03dd77d7..6dd4ee619 100644 --- a/testcases/kernel/controllers/cpuset/Makefile.inc +++ b/testcases/kernel/controllers/cpuset/Makefile.inc @@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - LDLIBS += -lcpu_set -lcontrollers -lltp + LDLIBS := -lcpu_set -lcontrollers -lltp $(LDLIBS) +ifeq ($(LIBC),musl) +LDLIBS += -lfts +endif @@ -43,5 +49,5 @@ index db6a843..86dd2a8 100644 INSTALL_TARGETS ?= *.sh -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa..0000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325e..350091a 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 89% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc..312eeca 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:32 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (35016db -> decf5d4) Message-ID: <158291283238.25028.12092978829935351027@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 35016db webkitgtk: Remove obsolete woff2 comment new 6ab1a6a ltp: Update to 20200120 new 4098f53 ltp: Remove mips related open_posix_testsuite patch new 915755f coreutils: add ptest new dadf824 ptest-packagelists.inc: add coreutils to SLOW list new a915070 libgpg-error: upgrade 1.36 -> 1.37 new decf5d4 linux-yocto/5.2: update to v5.2.32 The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/lib/oeqa/runtime/cases/ltp.py | 2 +- meta/recipes-core/coreutils/coreutils/run-ptest | 17 +++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 ++++++ .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 +----- ...-Add-option-to-select-libc-implementation.patch | 103 +++++---------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ----- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 ------ ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 ++++-- ...stcases-fix-an-absent-format-string-issue.patch | 24 ---- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 20 ++- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ----- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++-- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 11 +- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 ++-- ...1-Do-not-fail-when-testing-config-scripts.patch | 27 ++++ .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 8 +- 21 files changed, 199 insertions(+), 517 deletions(-) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (88%) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:34 +0000 Subject: [oe-commits] [openembedded-core] 02/06: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158291283238.25028.12092978829935351027@git.openembedded.org> References: <158291283238.25028.12092978829935351027@git.openembedded.org> Message-ID: <20200228180033.1AA69233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4098f53dfc91a7f0feb49c88e9254a51e0641c18 Author: Petr Vorel AuthorDate: Fri Feb 28 18:57:31 2020 +0100 ltp: Remove mips related open_posix_testsuite patch Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1d..0000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca..847f267 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:35 +0000 Subject: [oe-commits] [openembedded-core] 03/06: coreutils: add ptest In-Reply-To: <158291283238.25028.12092978829935351027@git.openembedded.org> References: <158291283238.25028.12092978829935351027@git.openembedded.org> Message-ID: <20200228180033.2F22D233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 915755f40703c3a32fb6bc7ea131b09a6361adf9 Author: Trevor Gamblin AuthorDate: Fri Feb 28 06:49:28 2020 -0800 coreutils: add ptest coreutils has a large number of tests, including some added by the Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that significantly increase runtime (and that have been disabled). Note that the coreutils ptest directory is given blanket permissions at runtime with chmod -R 777 to ensure that the user created for the tests will be able to run the test scripts and create the necessary files in the process. There is still room to improve the results of this ptest without the aforementioned additions. Of the tests marked SKIP, there are 30 tests that are currently counted as SKIP because they require sudo permissions, and another 21 that require membership in multiple user groups. It is important to know that coreutils has tests for both root and non-root users. Testing showed that 42 tests are skipped when running as root versus 30 when running as a non-root user, so the decision was made to run the suite as the latter. Additionally, gdb, valgrind, and strace could be included in the RDEPENDS list to increase pass rate, but their total contribution is 13 tests, so they were omitted to reduce image size. Finally, note that at least one ptest (misc/head-write-error.sh) is prone to ERROR on builds of core-image-minimal if extra space is not provided with IMAGE_ROOTFS_EXTRA_SPACE. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils/run-ptest | 17 ++++++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest b/meta/recipes-core/coreutils/coreutils/run-ptest new file mode 100755 index 0000000..6d4a7b3 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# remove any stale lock files so that the calls to groupadd/useradd don't stop +# the ptest if re-using the same image +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock + +COREUTILSLIB=@libdir@/coreutils +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" +USERNAME="tester" +groupadd ugroup1 +groupadd ugroup2 +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists" + +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} +userdel $USERNAME +groupdel ugroup1 +groupdel ugroup2 diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 57b2c1b..04a0522 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ + file://run-ptest \ " SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" @@ -143,3 +144,39 @@ python __anonymous() { } BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` + install -d ${D}${PTEST_PATH}/build-aux + install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ + cp ${B}/Makefile ${D}${PTEST_PATH}/ + cp ${S}/init.cfg ${D}${PTEST_PATH}/ + cp -r ${B}/src ${D}${PTEST_PATH}/ + cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src + sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile + sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile + chmod -R 777 ${D}${PTEST_PATH} + + # Disable subcase stty-pairs.sh, it will cause test framework hang + sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile + + # Tweak test d_type-check to use python3 instead of python + sed -i "1s at .*@#!/usr/bin/python3@" ${D}${PTEST_PATH}/tests/d_type-check + install ${B}/src/getlimits ${D}/${bindir} + + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} + +FILES_${PN}-ptest += "${bindir}/getlimits" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:36 +0000 Subject: [oe-commits] [openembedded-core] 04/06: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158291283238.25028.12092978829935351027@git.openembedded.org> References: <158291283238.25028.12092978829935351027@git.openembedded.org> Message-ID: <20200228180033.4066F233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dadf82487010536e99b43bf50aa4fc0416159fc2 Author: Trevor Gamblin AuthorDate: Fri Feb 28 06:49:29 2020 -0800 ptest-packagelists.inc: add coreutils to SLOW list Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 4afac58..54ace39 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -65,6 +65,7 @@ PTESTS_FAST = "\ PTESTS_SLOW = "\ babeltrace-ptest \ busybox-ptest \ + coreutils-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ glib-2.0-ptest \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:38 +0000 Subject: [oe-commits] [openembedded-core] 06/06: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158291283238.25028.12092978829935351027@git.openembedded.org> References: <158291283238.25028.12092978829935351027@git.openembedded.org> Message-ID: <20200228180033.75B46233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit decf5d4ace374829b5cf72c200c6ff6c9a1b756e Author: Bruce Ashfield AuthorDate: Mon Feb 24 15:02:02 2020 -0500 linux-yocto/5.2: update to v5.2.32 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 18:00:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 18:00:37 +0000 Subject: [oe-commits] [openembedded-core] 05/06: libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <158291283238.25028.12092978829935351027@git.openembedded.org> References: <158291283238.25028.12092978829935351027@git.openembedded.org> Message-ID: <20200228180033.5BE9E233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a91507019f1029123cc2df7b38605da611f9d813 Author: Alexander Kanavin AuthorDate: Fri Feb 28 10:25:54 2020 +0100 libgpg-error: upgrade 1.36 -> 1.37 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...1-Do-not-fail-when-testing-config-scripts.patch | 27 ++++ .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 8 +- 3 files changed, 31 insertions(+), 148 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch new file mode 100644 index 0000000..a0ab4f2 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch @@ -0,0 +1,27 @@ +From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 28 Feb 2020 09:19:56 +0000 +Subject: [PATCH] Do not fail when testing config scripts + +In previous versions this was not a hard a failure, and so went +unnoticed. The test is unsuitable for building with sysroots anyway as the +failure is due to that. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9303954..7630540 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old + else \ + echo "no"; \ + echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ + fi + cp gpg-error-config-old $@ + diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 91% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..b9a2b01 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,11 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ - " + file://0001-Do-not-fail-when-testing-config-scripts.patch \ + " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:07 +0000 Subject: [oe-commits] [openembedded-core] 01/35: hosttools: add utilities for all supported checksums In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.7D9D9233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 78155e5fcff9362049b576d20e31c3519c48485b Author: Bartosz Golaszewski AuthorDate: Tue Feb 25 09:18:52 2020 +0100 hosttools: add utilities for all supported checksums Only md5sum and sha256sum are currently provided by HOSTTOOLS. Trying to use any other checksum conversion will result in a build failure. Fix it by adding other supported checksum utilities to HOSTTOOLS. Signed-off-by: Bartosz Golaszewski Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b..e201b67 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -489,7 +489,8 @@ HOSTTOOLS += " \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ - python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ + python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ + sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:08 +0000 Subject: [oe-commits] [openembedded-core] 02/35: ruby: install required files for ptest In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.87C57233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit be161be40c88fbac8ac17776daf3bf178a2e8f5e Author: Kai Kang AuthorDate: Tue Feb 25 17:06:19 2020 +0800 ruby: install required files for ptest After update to 2.7.0, it fails to start ptest of ruby with errors: | ./test/runner.rb:11:in `require_relative': cannot load such file -- /usr/lib64/ruby/ptest/tool/test/runner (LoadError) and | test/rdoc/test_rdoc_attr.rb: cannot load such file -- rdoc/version | test/did_you_mean/spell_checking/test_key_name_check.rb: cannot load such file -- /usr/lib64/ruby/ptest/lib/did_you_mean Install the required files for the ptest. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index c796318..268b4be 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -45,6 +45,12 @@ do_install_append_class-target () { do_install_ptest () { cp -rf ${S}/test ${D}${PTEST_PATH}/ + + install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb + cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ + mkdir -p ${D}${PTEST_PATH}/lib + cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib + # install test-binaries find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \ | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:09 +0000 Subject: [oe-commits] [openembedded-core] 03/35: ffmpeg: add PACKAGECONFIG support for fdk-aac In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.923B6233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c616731ed90f5b20ae9d59165140ecd242cf44b2 Author: Scott Branden AuthorDate: Mon Feb 24 16:11:15 2020 -0800 ffmpeg: add PACKAGECONFIG support for fdk-aac Add PACKAGECONFIG support for fdk-aac in ffmpeg. Signed-off-by: Scott Branden Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index 20a8249..d7b0641 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -59,6 +59,7 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" +PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:06 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (23ad05b -> a5beb97) Message-ID: <158293158598.5858.5212290702253207965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 23ad05b readline/ediline: Fix conflicting manpages add 1c2d5ae abi_version/sstatesig: Introduce HASHEQUIV_HASH_VERSION new 78155e5 hosttools: add utilities for all supported checksums new be161be ruby: install required files for ptest new c616731 ffmpeg: add PACKAGECONFIG support for fdk-aac new 44b46ae python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 new db02bd4 libevdev: fix upstream check new 5198aa9 perl: fix lib/warnings test on core-image-sato new 20e9ca7 opensbi: Update to v0.6 new 9b1d308 weston: PACKAGECONFIG clients requires wayland new 66289b3 qemu: Fix CVE-2020-1711 new addfcef libarchive: upgrade 3.4.1 -> 3.4.2 new 09f6639 libpcre: upgrade 8.43 -> 8.44 new 855d0b8 python3-docutils: upgrade 0.15 -> 0.16 new 3a6bc80 python3-mako: upgrade 1.1.0 -> 1.1.1 new 1e6a1f1 unifdef: upgrade 2.11 -> 2.12 new 8652c95 gnutls: upgrade 3.6.11.1 -> 3.6.12 new 9c25692 python3-setuptools: upgrade 45.0.0 -> 45.2.0 new c971258 acpica: upgrade 20191213 -> 20200214 new 62019c0 gst-validate: upgrade 1.16.1 -> 1.16.2 new f59334e ncurses: upgrade 6.1+20191019 -> 6.2 new 7a9d9a4 webkitgtk: Disable GI data for musl/arm new c4fb899 sysvinit: Fix install order/dependency new 510015a layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe new 2db3646 libedit/readline: Correct package alternatives link for manpage new 90ee555 sysvinit: remove logsave.8 new baebf24 rt-tests: make manpages reproducible new bd0236d lsb-release: fix likely reproducabilty timestamp new eee65be tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES new 6da3239 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR new fc05938 systemd: Do not force removing resolved from PACKAGECONFIG new d0f0061 systemd: Drop local time64 patch in favour of upstreamed patches new 3daa968 go: Update to 1.14 release series new fb0a7ab maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk new 082ccd8 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG new 1408c00 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements new a5beb97 webkitgtk: Remove obsolete woff2 comment The 35 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/abi_version.conf | 8 +++ meta/conf/bitbake.conf | 3 +- meta/conf/distro/include/maintainers.inc | 6 +- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/layer.conf | 2 + .../machine/include/tune-cortexa72-cortexa53.inc | 4 +- meta/lib/oe/sstatesig.py | 3 + ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 13 +++-- .../files/0001-build-Use-ffreestanding.patch | 28 ---------- .../opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +- meta/recipes-core/ncurses/ncurses.inc | 2 +- .../{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- meta/recipes-core/readline/readline.inc | 2 +- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ----------- meta/recipes-core/systemd/systemd_244.3.bb | 6 +- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 3 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 +-- ...1-allow-CC-and-CXX-to-have-multiple-words.patch | 7 +-- ...-content-based-hash-generation-less-pedan.patch | 33 +++++------ ...OLDIR-to-be-overridden-in-the-environment.patch | 11 +--- .../0004-ld-add-soname-to-shareable-objects.patch | 11 +--- ...verride-CC-when-building-dist-and-go_boot.patch | 9 +-- ...-cmd-dist-separate-host-and-target-builds.patch | 37 ++++++------- ...07-cmd-go-make-GOROOT-precious-by-default.patch | 23 +++----- .../0008-use-GOBUILDMODE-to-set-buildmode.patch | 9 +-- ...ld-replace-glibc-dynamic-linker-with-musl.patch | 23 +------- ...-canadian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 .../{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../go/{go-native_1.13.bb => go-native_1.14.bb} | 0 .../go/{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../recipes-devtools/go/{go_1.13.bb => go_1.14.bb} | 0 .../libedit/libedit_20191231-3.1.bb | 2 +- ...CH-perl-134117-Close-DATA-in-loc_tools.pl.patch | 30 ++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- ...ionally-do-not-fetch-code-by-easy_install.patch | 4 +- meta/recipes-devtools/python/python-setuptools.inc | 4 +- ...3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +- ...python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +- ...tive_3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 ---------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 +++++++++++ ...ools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++ .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +-- .../{acpica_20191213.bb => acpica_20200214.bb} | 6 +- .../{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 +- .../0001-Remove-timestamp-from-manpage.patch | 27 +++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 +- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 31 ----------- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 30 ---------- .../linux-libc-headers/linux-libc-headers_5.4.bb | 2 - meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + ...t-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 +- ...0001-gzip-with-n-for-build-reproducibilty.patch | 62 +++++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 18 ++++-- .../{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 +- meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 + .../libpcre/libpcre/out-of-tree.patch | 26 --------- .../libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} | 9 ++- 64 files changed, 364 insertions(+), 361 deletions(-) delete mode 100644 meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch rename meta/recipes-bsp/opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} (88%) rename meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} (89%) delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch rename meta/recipes-devtools/go/{go-1.13.inc => go-1.14.inc} (81%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (83%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0004-ld-add-soname-to-shareable-objects.patch (82%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0006-cmd-dist-separate-host-and-target-builds.patch (95%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0007-cmd-go-make-GOROOT-precious-by-default.patch (79%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0008-use-GOBUILDMODE-to-set-buildmode.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (79%) rename meta/recipes-devtools/go/{go-cross-canadian_1.13.bb => go-cross-canadian_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.13.bb => go-cross_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.13.bb => go-native_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.13.bb => go-runtime_1.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.13.bb => go_1.14.bb} (100%) create mode 100644 meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch rename meta/recipes-devtools/python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} (60%) rename meta/recipes-devtools/python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} (63%) rename meta/recipes-devtools/python/{python3-scons-native_3.1.1.bb => python3-scons-native_3.1.2.bb} (79%) delete mode 100644 meta/recipes-devtools/python/python3-scons_3.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-scons_3.1.2.bb rename meta/recipes-devtools/python/{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} (100%) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch rename meta/recipes-devtools/unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} (53%) rename meta/recipes-extended/acpica/{acpica_20191213.bb => acpica_20200214.bb} (88%) rename meta/recipes-extended/libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} (93%) create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch rename meta/recipes-multimedia/gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} (87%) create mode 100644 meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch rename meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} (93%) delete mode 100644 meta/recipes-support/libpcre/libpcre/out-of-tree.patch rename meta/recipes-support/libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:10 +0000 Subject: [oe-commits] [openembedded-core] 04/35: python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.9D56B233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 44b46ae6c65448901477def57a45d5a4ecc2d246 Author: Tim Orling AuthorDate: Mon Feb 24 20:21:42 2020 -0800 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 THis release is a mix of improvements and fixes: https://github.com/SCons/scons/blob/3.1.2/src/RELEASE.txt * Changed to inherit pypi rather than relying on SOURCEFORGE_MIRROR. * Add SRC_URI for LICENSE file (not included in pypi tarball). * Make it more obvious that RDEPENDS are for class-target and drop empty RDEPENDS from -native * python3-scons-native now DEPENDS on python3-setuptools-native * Tested with core-image-base + packagegroup-core-buildessential with "scons" oe-selftest via testimage. * Tested build of "serf" (which uses python3-scons-native via the scons.bbclass). License-Update: Added "MIT License" text, updated copyright years Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...tive_3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 ------------------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb similarity index 79% rename from meta/recipes-devtools/python/python3-scons-native_3.1.1.bb rename to meta/recipes-devtools/python/python3-scons-native_3.1.2.bb index 5cd5956..9e12730 100644 --- a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb @@ -1,7 +1,6 @@ require python3-scons_${PV}.bb inherit native python3native -DEPENDS = "python3-native" -RDEPENDS_${PN} = "" +DEPENDS = "python3-native python3-setuptools-native" do_install_append() { create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' diff --git a/meta/recipes-devtools/python/python3-scons_3.1.1.bb b/meta/recipes-devtools/python/python3-scons_3.1.1.bb deleted file mode 100644 index 0c7aaea..0000000 --- a/meta/recipes-devtools/python/python3-scons_3.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284" - -SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "35b2a3993313bbedd221d4d5758fd2fd" -SRC_URI[sha256sum] = "4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5" - -S = "${WORKDIR}/scons-${PV}" - -UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -do_install_prepend() { - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* -} - -RDEPENDS_${PN} = "\ - python3-core \ - python3-fcntl \ - python3-io \ - python3-json \ - python3-shell \ - python3-pickle \ - python3-pprint \ - " diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb new file mode 100644 index 0000000..aa7a2a8 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" + +# pypi package does not have a valid license file +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" + +SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" +SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" +SRC_URI[license.md5sum] = "e14e1b33428df24a40a782ae142785d0" +SRC_URI[license.sha256sum] = "72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6" + +S = "${WORKDIR}/scons-${PV}" + +UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +inherit pypi setuptools3 + +do_install_prepend() { + sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* +} + +RDEPENDS_${PN}_class-target = "\ + python3-core \ + python3-fcntl \ + python3-io \ + python3-json \ + python3-shell \ + python3-pickle \ + python3-pprint \ + " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:11 +0000 Subject: [oe-commits] [openembedded-core] 05/35: libevdev: fix upstream check In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.AA325233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit db02bd43d84d7ece3ed214a25e114e04c966e6c5 Author: Anuj Mittal AuthorDate: Tue Feb 25 14:45:26 2020 +0800 libevdev: fix upstream check Ignore the ones ending in .90x as they are -rc releases. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 46ed5d7..3523dc0 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -12,3 +12,5 @@ SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:14 +0000 Subject: [oe-commits] [openembedded-core] 08/35: weston: PACKAGECONFIG clients requires wayland In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.CA03D23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9b1d30810eeecb46b977c8eed68be69aef891312 Author: Robert Yang AuthorDate: Mon Feb 24 16:57:06 2020 +0800 weston: PACKAGECONFIG clients requires wayland Fixed: DISTRO_FEATURES_remove = "wayland" $ bitbake weston clients/meson.build:141:4: ERROR: Problem encountered: weston-simple-dmabuf-egl requires option renderer-gl which is not enabled. If you rather not build this, drop "dmabuf-egl" from simple-clients option. WARNING: exit code 1 from a shell command. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb index 83aee87..f8e9e15 100644 --- a/meta/recipes-graphics/wayland/weston_8.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb @@ -27,11 +27,11 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - clients launch" + launch" # # Compositor choices # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:16 +0000 Subject: [oe-commits] [openembedded-core] 10/35: libarchive: upgrade 3.4.1 -> 3.4.2 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.E040C23347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit addfcefecf64de99c098cd1d4fba1c778ed0d4fb Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:25 2020 +0100 libarchive: upgrade 3.4.1 -> 3.4.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.4.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 2d33dd8..c3edb57 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" -SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" +SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" +SRC_URI[sha256sum] = "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" inherit autotools update-alternatives pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:18 +0000 Subject: [oe-commits] [openembedded-core] 12/35: python3-docutils: upgrade 0.15 -> 0.16 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.0329E233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 855d0b8a36dd88e92d0a51c5797ef4a91a9f9c5a Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:28 2020 +0100 python3-docutils: upgrade 0.15 -> 0.16 License-Update: formatting Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-docutils_0.15.bb b/meta/recipes-devtools/python/python3-docutils_0.16.bb similarity index 60% rename from meta/recipes-devtools/python/python3-docutils_0.15.bb rename to meta/recipes-devtools/python/python3-docutils_0.16.bb index f5c3f5d..50547a1 100644 --- a/meta/recipes-devtools/python/python3-docutils_0.15.bb +++ b/meta/recipes-devtools/python/python3-docutils_0.16.bb @@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation" HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" DEPENDS = "python3" SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "f51729f19e70a9dc4837433193a5e798" -SRC_URI[sha256sum] = "c35e87e985f70106f6f97e050f3bed990641e0e104566134b9cd23849a460e96" +SRC_URI[md5sum] = "9ccb6f332e23360f964de72c8ea5f0ed" +SRC_URI[sha256sum] = "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573" S = "${WORKDIR}/docutils-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:13 +0000 Subject: [oe-commits] [openembedded-core] 07/35: opensbi: Update to v0.6 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.C074F233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 20e9ca7745fc8f2392c37c5e5e8d5b0a5f72c06c Author: Alistair Francis AuthorDate: Mon Feb 24 10:35:43 2020 -0800 opensbi: Update to v0.6 Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- ...0001-Makefile-Don-t-specify-mabi-or-march.patch | 13 ++++++---- .../files/0001-build-Use-ffreestanding.patch | 28 ---------------------- .../opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +---- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch index 74d9361..d2a8048 100644 --- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -1,4 +1,4 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 15 Feb 2019 14:57:41 -0800 Subject: [PATCH] Makefile: Don't specify mabi or march @@ -7,23 +7,26 @@ To avoid can't link double-float modules with soft-float modules errors when building 32-bit openSBI don't specify mabi or march. -Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] Signed-off-by: Alistair Francis + --- Makefile | 2 -- 1 file changed, 2 deletions(-) +diff --git a/Makefile b/Makefile +index ccf8ea3..69e5b38 100644 --- a/Makefile +++ b/Makefile -@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -mno-save-restore -mstrict-align -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) CFLAGS += $(GENFLAGS) CFLAGS += $(platform-cflags-y) -@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -mno-save-restore -mstrict-align diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch deleted file mode 100644 index 4899fad..0000000 --- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Jan 2020 18:21:02 -0800 -Subject: [PATCH] build: Use -ffreestanding - -this is a stand-alone/baremetal application, therefore demanding --ffreestanding would help it compile with hosted toolchains e.g. ( linux -toolchains ), it also ensures that it won't be using platform -optimizations like inlining mem* str* functions which gcc might decide -especially with wrapper string functions in opensbi code - -Upstream-Status: Accepted [https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961] -Signed-off-by: Khem Raj ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb similarity index 88% rename from meta/recipes-bsp/opensbi/opensbi_0.5.bb rename to meta/recipes-bsp/opensbi/opensbi_0.6.bb index 71d64fa..56f2d4b 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb @@ -7,17 +7,13 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" +SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" SRC_URI = "git://github.com/riscv/opensbi.git \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ - file://0001-build-Use-ffreestanding.patch \ " S = "${WORKDIR}/git" -SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df" -SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300" - EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:15 +0000 Subject: [oe-commits] [openembedded-core] 09/35: qemu: Fix CVE-2020-1711 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.D582523347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 66289b3ba800c1b9e74b35fd1af2f4825c698550 Author: Lee Chee Yang AuthorDate: Mon Feb 24 13:46:53 2020 +0800 qemu: Fix CVE-2020-1711 see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..f26e722 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:12 +0000 Subject: [oe-commits] [openembedded-core] 06/35: perl: fix lib/warnings test on core-image-sato In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.B5D4D233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5198aa954ad0bffb7d6609e5118f642a59595b18 Author: Mingde (Matthew) Zeng AuthorDate: Mon Feb 24 13:10:08 2020 -0500 perl: fix lib/warnings test on core-image-sato Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng Signed-off-by: Richard Purdie --- ...CH-perl-134117-Close-DATA-in-loc_tools.pl.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000..79cae0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-by: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012..9d747aa 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:20 +0000 Subject: [oe-commits] [openembedded-core] 14/35: unifdef: upgrade 2.11 -> 2.12 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.1B30E233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1e6a1f13d799d85d463edf259e3fbc13365ed5d0 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:30 2020 +0100 unifdef: upgrade 2.11 -> 2.12 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/unifdef/unifdef_2.11.bb b/meta/recipes-devtools/unifdef/unifdef_2.12.bb similarity index 53% rename from meta/recipes-devtools/unifdef/unifdef_2.11.bb rename to meta/recipes-devtools/unifdef/unifdef_2.12.bb index 1ffc11e..22b10ba 100644 --- a/meta/recipes-devtools/unifdef/unifdef_2.11.bb +++ b/meta/recipes-devtools/unifdef/unifdef_2.12.bb @@ -3,12 +3,13 @@ SECTION = "devel" LICENSE = "BSD-2-Clause" HOMEPAGE = "http://dotat.at/prog/unifdef/" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fc6c2c1dc4f18c891ed5b7a469fe32 \ - file://unifdef.c;endline=32;md5=aaec84d8b68d8b6dea71f45e9949ebfe" +LIC_FILES_CHKSUM = "file://COPYING;md5=3498caf346f6b77934882101749ada23 \ + file://unifdef.c;endline=32;md5=6f4ee8085d6e6ab0f7cb4390e1a9c497 \ + " SRC_URI = "http://dotat.at/prog/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "337053fd8a7d9ab3adf5e50f88af95b7" -SRC_URI[sha256sum] = "828ffc270ac262b88fe011136acef2780c05b0dc3c5435d005651740788d4537" +SRC_URI[md5sum] = "ae8c0b3b4c43c1f6bc5f32412a820818" +SRC_URI[sha256sum] = "43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400" UPSTREAM_CHECK_REGEX = "unifdef-(?P((\d+\.*)+)(?![a-f0-9]{6,})).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:19 +0000 Subject: [oe-commits] [openembedded-core] 13/35: python3-mako: upgrade 1.1.0 -> 1.1.1 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.0FB5F233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3a6bc80f46ea790c319d25cc67cb1e0ed32c3631 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:29 2020 +0100 python3-mako: upgrade 1.1.0 -> 1.1.1 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-mako_1.1.0.bb b/meta/recipes-devtools/python/python3-mako_1.1.1.bb similarity index 63% rename from meta/recipes-devtools/python/python3-mako_1.1.0.bb rename to meta/recipes-devtools/python/python3-mako_1.1.1.bb index b139e5a..bc38009 100644 --- a/meta/recipes-devtools/python/python3-mako_1.1.0.bb +++ b/meta/recipes-devtools/python/python3-mako_1.1.1.bb @@ -2,14 +2,14 @@ SUMMARY = "Templating library for Python" HOMEPAGE = "http://www.makotemplates.org/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=df7e6c7c82990acf0228a55e00d29bc9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=943eb67718222db21d44a4ef1836675f" PYPI_PACKAGE = "Mako" inherit pypi setuptools3 -SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2" -SRC_URI[sha256sum] = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" +SRC_URI[md5sum] = "2660a4916f2f63456e6885c727b7cd2f" +SRC_URI[sha256sum] = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4" RDEPENDS_${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:17 +0000 Subject: [oe-commits] [openembedded-core] 11/35: libpcre: upgrade 8.43 -> 8.44 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231306.EC930233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 09f6639ed599f71a4ec58305b9d684ccc8983ba0 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:26 2020 +0100 libpcre: upgrade 8.43 -> 8.44 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libpcre/libpcre/out-of-tree.patch | 26 ---------------------- .../libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} | 9 ++++---- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch deleted file mode 100644 index d567896..0000000 --- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb similarity index 91% rename from meta/recipes-support/libpcre/libpcre_8.43.bb rename to meta/recipes-support/libpcre/libpcre_8.44.bb index f9a22fe..e5471e8 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:21 +0000 Subject: [oe-commits] [openembedded-core] 15/35: gnutls: upgrade 3.6.11.1 -> 3.6.12 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.27E38233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8652c95ceb505dd7386166842486c833ea5a7ee7 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:31 2020 +0100 gnutls: upgrade 3.6.11.1 -> 3.6.12 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb b/meta/recipes-support/gnutls/gnutls_3.6.12.bb similarity index 93% rename from meta/recipes-support/gnutls/gnutls_3.6.11.1.bb rename to meta/recipes-support/gnutls/gnutls_3.6.12.bb index 5b05364..f1eeebc 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.12.bb @@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" -SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" +SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" +SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:25 +0000 Subject: [oe-commits] [openembedded-core] 19/35: ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.540BC233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f59334e70313676c7ab3216cb9583eefb27835e6 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:27 2020 +0100 ncurses: upgrade 6.1+20191019 -> 6.2 License-Update: copyright years and holders Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index b7bf4c0..4156bf4 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb similarity index 89% rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb rename to meta/recipes-core/ncurses/ncurses_6.2.bb index 187777f..b6d899c 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:22 +0000 Subject: [oe-commits] [openembedded-core] 16/35: python3-setuptools: upgrade 45.0.0 -> 45.2.0 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.32A77233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9c256927141deadebb0cf3e6c83e6a76b9f0c4b0 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:32 2020 +0100 python3-setuptools: upgrade 45.0.0 -> 45.2.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index b1a6813..5f99cd2 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 +From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 09066f8..d3039a5 100644 +index 426301d..55c8062 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -649,6 +649,11 @@ class easy_install(Command): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index c697937..f7c3202 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" -SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" +SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30" +SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_45.0.0.bb rename to meta/recipes-devtools/python/python3-setuptools_45.2.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:28 +0000 Subject: [oe-commits] [openembedded-core] 22/35: layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.7161C23348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 510015ac81df969f690d6c8661b00bebe73b7fca Author: Khem Raj AuthorDate: Tue Feb 25 09:51:26 2020 -0800 layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe These are added as dependencies by mime class, which could be inherited along with allarch and dependencies silently go into target specific recipes and which then can result in sstate hash signature mismatches when the allarch recipes are reused for another arch [YOCTO #13805] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index fcdf9ae..60f8e26 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -43,6 +43,8 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-utils \ gstreamer1.0-meta-base \ ca-certificates \ + shared-mime-info \ + desktop-file-utils \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:27 +0000 Subject: [oe-commits] [openembedded-core] 21/35: sysvinit: Fix install order/dependency In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.673C723348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c4fb899b19a905a2b027f33947b6ec56f55b81a6 Author: Mark Hatle AuthorDate: Tue Feb 25 11:49:29 2020 -0600 sysvinit: Fix install order/dependency It is possible for sysvinit to be installed before the passwd/group files are installed from base-passwd. This results in an warning that the shutdown group can't be found. Adding a dependeny on base-passwd will resolve this issue. This has similar symptoms to the problem that oe-core commit 0227e929021263c51d2e7db36224000fecb01f1c fixed. The fix is simular in that it ensures that base-passwd is installed first, just at runtime vs setscene time. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 21ef0e9..63c1084 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -70,7 +70,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:29 +0000 Subject: [oe-commits] [openembedded-core] 23/35: libedit/readline: Correct package alternatives link for manpage In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.7AD3423348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2db36468c98d67fe49fd71609721aa59f0bfffc8 Author: Jeremy A. Puhlman AuthorDate: Tue Feb 25 11:25:44 2020 -0800 libedit/readline: Correct package alternatives link for manpage Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4babcbd..052e2d5 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 267fdcc..8d2d57a 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:30 +0000 Subject: [oe-commits] [openembedded-core] 24/35: sysvinit: remove logsave.8 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.872B4233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 90ee5557c0e1d7088b5d9b7e66d70ff7fccac9a3 Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:33 2020 -0800 sysvinit: remove logsave.8 logsave is a duplicate from e2fsprogs, which was already removed, but the man page remained which is also a duplicate. However it does not get modifed on install so it conflicts with the e2fsprogs version. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 63c1084..d2b85ed 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -110,4 +110,5 @@ do_install () { # Already provided by e2fsprogs; sysvinit's version is a copy from there rm ${D}${base_sbindir}/logsave + rm ${D}${mandir}/man8/logsave.8 } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:23 +0000 Subject: [oe-commits] [openembedded-core] 17/35: acpica: upgrade 20191213 -> 20200214 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.3E8FB233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c971258a932820d990d1b5c6c85b98f9086e2d43 Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:34 2020 +0100 acpica: upgrade 20191213 -> 20200214 License-Update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../acpica/{acpica_20191213.bb => acpica_20200214.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/acpica/acpica_20191213.bb b/meta/recipes-extended/acpica/acpica_20200214.bb similarity index 88% rename from meta/recipes-extended/acpica/acpica_20191213.bb rename to meta/recipes-extended/acpica/acpica_20200214.bb index 6b1412e..cfa9fec 100644 --- a/meta/recipes-extended/acpica/acpica_20191213.bb +++ b/meta/recipes-extended/acpica/acpica_20200214.bb @@ -10,15 +10,15 @@ HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[md5sum] = "0f0eb38e796fac24c2aa4d9b6adcd950" -SRC_URI[sha256sum] = "304930df9836d3d4cdbf67a3ae6bd96dbc65f62602d869f571f4b6a12341e6c6" +SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113" +SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:32 +0000 Subject: [oe-commits] [openembedded-core] 26/35: lsb-release: fix likely reproducabilty timestamp In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.A2D22233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bd0236d1b35831b23882e1f1af86504d62e5d0b9 Author: Jeremy A. Puhlman AuthorDate: Thu Feb 27 15:04:30 2020 -0800 lsb-release: fix likely reproducabilty timestamp Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Remove-timestamp-from-manpage.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 0000000..af095fd --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,27 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 +0000 +Subject: [PATCH] Remove timestamp from manpage + +Upstream-Status: Submitted [lsb-discuss at lists.linux-foundation.org] +Signed-off-by: Jeremy A. Puhlman +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e3026..a06cbcf 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:33 +0000 Subject: [oe-commits] [openembedded-core] 27/35: tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.B1FAD233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eee65bed5ee39051541a0a3f2a311396d6e7326c Author: Jaewon Lee AuthorDate: Thu Jan 23 13:02:59 2020 -0800 tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES Without the proper default tune in TUNE_FEATURES, certain variables won't expand correctly. MACHINEOVERRIDES won't add cortexa72-cortexa53: TUNE_CCARGS won't add -mtune=cortexa72.cortexa-53, generating the toolchain incorrectly. Adding missing 'cortexa72-cortexa53' to both TUNE_FEATURES_tune-cortexa72-cortexa53 and TUNE_FEATURES_tune-cortexa72-cortexa53-crypto Signed-off-by: Jaewon Lee Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc index 0d43531..f208b98 100644 --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc @@ -14,8 +14,8 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", " - AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" -TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc}" -TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto}" +TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" +TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" BASE_LIB_tune-cortexa72-cortexa53 = "lib64" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:24 +0000 Subject: [oe-commits] [openembedded-core] 18/35: gst-validate: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.4A9CE233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 62019c0255512790eb201c1e9f6cd3e771485a7d Author: Alexander Kanavin AuthorDate: Tue Feb 25 19:53:35 2020 +0100 gst-validate: upgrade 1.16.1 -> 1.16.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb similarity index 87% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb index 7d602ea..35492fe 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "793e75f4717f718ad204c554d577b160" -SRC_URI[sha256sum] = "7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899" +SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c" +SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:26 +0000 Subject: [oe-commits] [openembedded-core] 20/35: webkitgtk: Disable GI data for musl/arm In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.5DC39233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7a9d9a4b5fb80a4b22b711c50ddcbd526c0955fb Author: Khem Raj AuthorDate: Tue Feb 25 07:28:57 2020 -0800 webkitgtk: Disable GI data for musl/arm qemu-arm hangs forever when running gobject introspection Signed-off-by: Khem Raj Cc: Andreas M?ller Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f..7bffc15 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -123,5 +123,10 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED_libc-musl_armv7a = "False" +GI_DATA_ENABLED_libc-musl_armv7ve = "False" + # Can't be built with ccache CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:35 +0000 Subject: [oe-commits] [openembedded-core] 29/35: systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.CC21C233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fc0593839f9bec7e0c21665ab6d9d742252f4210 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:56 2020 -0800 systemd: Do not force removing resolved from PACKAGECONFIG This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d86341..e7d2997 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ - resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " + # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:31 +0000 Subject: [oe-commits] [openembedded-core] 25/35: rt-tests: make manpages reproducible In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.9348F23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit baebf24a73044ffc4c8ec1210f4866b978c923ea Author: Jeremy Puhlman AuthorDate: Thu Feb 27 14:15:34 2020 -0800 rt-tests: make manpages reproducible add -n to gzip call Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...0001-gzip-with-n-for-build-reproducibilty.patch | 62 ++++++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 0000000..3bafbbe --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 +0000 +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa1..dad252b 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ + file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:34 +0000 Subject: [oe-commits] [openembedded-core] 28/35: linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.C028E233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6da3239b73fa3ebf8c62c7f38b5b4a3795d502b5 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:55 2020 -0800 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR __UAPI_DEF_ETHHDR has been defined in kernel UAPI [1] and musl already defined it to 0 via [2] So these patches can now be dropped. [1] https://patchwork.ozlabs.org/patch/872502/ [2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Richard Purdie --- ...move-muslc-ethhdr-protection-to-uapi-file.patch | 31 ---------------------- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 30 --------------------- .../linux-libc-headers/linux-libc-headers_5.4.bb | 2 -- 3 files changed, 63 deletions(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch deleted file mode 100644 index 68b2446..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 1 Mar 2018 18:31:01 -0500 -Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file - -Signed-off-by: Bruce Ashfield -Upstream-Status: Pending ---- - include/uapi/linux/if_ether.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 153c9c2..7b69b73 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -149,6 +149,12 @@ - * This is an Ethernet frame header. - */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ - #ifndef __UAPI_DEF_ETHHDR - #define __UAPI_DEF_ETHHDR 1 --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index fb7e1de..0000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Wed, 22 Jan 2014 00:57:48 +0100 -Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr - ---- -Signed-off-by: Khem Raj -Upstream-Status: Submitted - - include/uapi/linux/if_ether.h | 4 +++- - include/uapi/linux/libc-compat.h | 6 ++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: linux-4.15/include/uapi/linux/libc-compat.h -=================================================================== ---- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 -+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 -@@ -51,6 +51,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 5037739..8a12103 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -2,10 +2,8 @@ require linux-libc-headers.inc SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:38 +0000 Subject: [oe-commits] [openembedded-core] 32/35: maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.F2601233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fb0a7ab133434febc78ce4f4d00f1192935ad95e Author: Tim Orling AuthorDate: Wed Feb 26 16:06:03 2020 -0800 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk For GUI automation purposes, strong motivation for accessibility (a11y) via python3-dogtail and python3-pyatspi2, so taking over from Anuj. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ac..10095ff 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -49,9 +49,9 @@ RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal " RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal " -RECIPE_MAINTAINER_pn-atk = "Anuj Mittal " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling " +RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling " +RECIPE_MAINTAINER_pn-atk = "Tim Orling " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:36 +0000 Subject: [oe-commits] [openembedded-core] 30/35: systemd: Drop local time64 patch in favour of upstreamed patches In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.D934B233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d0f00610edf4e4f2d4e49213b160bafe329aaa87 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:57 2020 -0800 systemd: Drop local time64 patch in favour of upstreamed patches https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-instead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ---------------------- meta/recipes-core/systemd/systemd_244.3.bb | 3 +-- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch deleted file mode 100644 index 33c5758..0000000 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Dec 2019 12:49:07 -0800 -Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout - -kernel prior to 64bit time_t support might not entertain such large -timeout therefore reduce it to INT_MAX which would set timer expiration -event after 68 years of uptime, should be good for all practical -purposes - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - src/basic/time-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index d7ef30d2fe52..4d3219f114b5 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1487,7 +1487,7 @@ int time_change_fd(void) { - - /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ - static const struct itimerspec its = { -- .it_value.tv_sec = TIME_T_MAX, -+ .it_value.tv_sec = INT_MAX, - }; - - _cleanup_close_ int fd; diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index e7d2997..dfb7ad5 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ + file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://99-default.preset \ " # patches needed by musl @@ -42,7 +42,6 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:37 +0000 Subject: [oe-commits] [openembedded-core] 31/35: go: Update to 1.14 release series In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231307.E7329233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3daa9684e458b9c926e1a07acd9b1c0fe8bd2e86 Author: Khem Raj AuthorDate: Thu Feb 27 00:05:58 2020 -0800 go: Update to 1.14 release series Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++--- ...1-allow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...-content-based-hash-generation-less-pedan.patch | 33 ++++++++----------- ...OLDIR-to-be-overridden-in-the-environment.patch | 11 ++----- .../0004-ld-add-soname-to-shareable-objects.patch | 11 ++----- ...verride-CC-when-building-dist-and-go_boot.patch | 9 ++---- ...-cmd-dist-separate-host-and-target-builds.patch | 37 ++++++++++------------ ...07-cmd-go-make-GOROOT-precious-by-default.patch | 23 ++++---------- .../0008-use-GOBUILDMODE-to-set-buildmode.patch | 9 ++---- ...ld-replace-glibc-dynamic-linker-with-musl.patch | 23 ++------------ ...-canadian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 .../{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../go/{go-native_1.13.bb => go-native_1.14.bb} | 0 .../go/{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../recipes-devtools/go/{go_1.13.bb => go_1.14.bb} | 0 17 files changed, 53 insertions(+), 120 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e957e3a..31d4b3b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" -GOVERSION ?= "1.13%" +GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "9.0.1" diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc similarity index 81% rename from meta/recipes-devtools/go/go-1.13.inc rename to meta/recipes-devtools/go/go-1.14.inc index 7780ace..ac7b95c 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.13" -GO_MINOR = ".8" +GO_BASEVERSION = "1.14" +GO_MINOR = "" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" -SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" +SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" +SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e4..d47664d 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch @@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 17852de..7b5ec5e 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { +@@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { @@ -33,6 +31,3 @@ index 17852de..7b5ec5e 100644 } env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch rename to meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 4eddd39..9e88567 100644 --- a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -50,11 +50,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 19 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 7b5ec5e..292f117 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar { +@@ -156,7 +156,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { var b work.Builder b.Init() @@ -63,8 +61,6 @@ index 7b5ec5e..292f117 100644 if err != nil { // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 7dd9a90..ccebaf8 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -32,6 +32,8 @@ import ( @@ -76,16 +72,16 @@ index 7dd9a90..ccebaf8 100644 // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - // The compiler hides the exact value of $GOROOT - // when building things in GOROOT. +@@ -208,7 +210,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. + // When -trimpath is used with a package built from the module cache, + // use the module path and version instead of the directory. - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { fmt.Fprintf(h, "dir %s\n", p.Dir) - } - fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) -@@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + } else if cfg.BuildTrimpath && p.Module != nil { + fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) +@@ -224,13 +226,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -103,7 +99,7 @@ index 7dd9a90..ccebaf8 100644 } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2229,33 +2231,48 @@ var ( +@@ -2228,33 +2230,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -161,7 +157,7 @@ index 7dd9a90..ccebaf8 100644 } // compilerExe returns the compiler to use given an -@@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string { +@@ -2263,11 +2280,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -179,7 +175,7 @@ index 7dd9a90..ccebaf8 100644 return compiler } -@@ -2429,7 +2451,7 @@ func envList(key, def string) []string { +@@ -2428,7 +2450,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -188,7 +184,7 @@ index 7dd9a90..ccebaf8 100644 defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2447,6 +2469,14 @@ func (b *Builder) CFlags(p *load.Package return } @@ -203,7 +199,7 @@ index 7dd9a90..ccebaf8 100644 return } -@@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2461,7 +2491,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -212,7 +208,7 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return nil, nil, err } -@@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -2820,7 +2850,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -221,6 +217,3 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return "", "", err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch similarity index 83% rename from meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 9aa0119..662c705 100644 --- a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 9e50311..683ca6f 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -244,7 +244,9 @@ func xinit() { +@@ -246,7 +246,9 @@ func xinit() { workdir = xworkdir() xatexit(rmworkdir) @@ -32,11 +30,9 @@ index 9e50311..683ca6f 100644 } // compilerEnv returns a map from "goos/goarch" to the -diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a3277a6..db96350 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -60,7 +60,11 @@ func defaultContext() build.Context { +@@ -64,7 +64,11 @@ func defaultContext() build.Context { // variables. This matches the initialization of ToolDir in // go/build, except for using ctxt.GOROOT rather than // runtime.GOROOT. @@ -49,6 +45,3 @@ index a3277a6..db96350 100644 } ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch similarity index 82% rename from meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch index 40763ad..75c9c75 100644 --- a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 3fa258d..f96fb02 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() { +@@ -1280,6 +1280,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -29,7 +27,7 @@ index 3fa258d..f96fb02 100644 if ctxt.HeadType != objabi.Hwindows { // Pass -z nodelete to mark the shared library as // non-closeable: a dlclose will do nothing. -@@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() { +@@ -1291,6 +1292,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -37,7 +35,7 @@ index 3fa258d..f96fb02 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() { +@@ -1299,6 +1301,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -45,6 +43,3 @@ index 3fa258d..f96fb02 100644 } } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 4f2a46c..59c12d9 100644 --- a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/make.bash b/src/make.bash -index 92d1481..0c2822f 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; exit 1 fi rm -f cmd/dist/dist @@ -30,7 +28,7 @@ index 92d1481..0c2822f 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -208,7 +208,7 @@ fi +@@ -209,7 +209,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. # Throw ours, built with Go 1.4, away after bootstrap. @@ -39,6 +37,3 @@ index 92d1481..0c2822f 100755 rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch similarity index 95% rename from meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch index 354aaca..7aee0ba 100644 --- a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch @@ -38,8 +38,6 @@ Signed-off-by: Alexander J Kube src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ 1 file changed, 112 insertions(+), 43 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 683ca6f..0ad082b 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -41,6 +41,7 @@ var ( @@ -58,7 +56,7 @@ index 683ca6f..0ad082b 100644 vflag int // verbosity ) -@@ -247,6 +249,8 @@ func xinit() { +@@ -249,6 +251,8 @@ func xinit() { if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) } @@ -67,7 +65,7 @@ index 683ca6f..0ad082b 100644 } // compilerEnv returns a map from "goos/goarch" to the -@@ -478,8 +482,10 @@ func setup() { +@@ -480,8 +484,10 @@ func setup() { p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { xremoveall(p) @@ -78,7 +76,7 @@ index 683ca6f..0ad082b 100644 if goos != gohostos || goarch != gohostarch { p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1207,12 +1213,29 @@ func cmdbootstrap() { +@@ -1244,12 +1250,29 @@ func cmdbootstrap() { var noBanner bool var debug bool @@ -109,7 +107,7 @@ index 683ca6f..0ad082b 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1266,8 +1289,13 @@ func cmdbootstrap() { +@@ -1303,8 +1326,13 @@ func cmdbootstrap() { xprintf("\n") } @@ -125,7 +123,7 @@ index 683ca6f..0ad082b 100644 goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gobin) if debug { -@@ -1296,7 +1324,11 @@ func cmdbootstrap() { +@@ -1333,7 +1361,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -138,7 +136,7 @@ index 683ca6f..0ad082b 100644 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) if debug { run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -@@ -1333,50 +1365,84 @@ func cmdbootstrap() { +@@ -1370,50 +1402,84 @@ func cmdbootstrap() { } checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) @@ -190,8 +188,6 @@ index 683ca6f..0ad082b 100644 - timelog("build", "host toolchain") - if vflag > 0 { - xprintf("\n") -- } -- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) + + if goos == oldgoos && goarch == oldgoarch { + // Common case - not setting up for cross-compilation. @@ -223,7 +219,8 @@ index 683ca6f..0ad082b 100644 + os.Setenv("GOARCH", goarch) + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) -+ } + } +- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) goInstall(goBootstrap, "std", "cmd") checkNotStale(goBootstrap, "std", "cmd") checkNotStale(cmdGo, "std", "cmd") @@ -231,12 +228,7 @@ index 683ca6f..0ad082b 100644 - timelog("build", "target toolchain") - if vflag > 0 { - xprintf("\n") -+ if debug { -+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) -+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) -+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) - } +- } - goos = oldgoos - goarch = oldgoarch - os.Setenv("GOOS", goos) @@ -257,10 +249,16 @@ index 683ca6f..0ad082b 100644 - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ if debug { ++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") ++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) ++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) ++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ } } // Check that there are no new files in $GOROOT/bin other than -@@ -1393,8 +1459,11 @@ func cmdbootstrap() { +@@ -1430,8 +1496,11 @@ func cmdbootstrap() { } } @@ -274,6 +272,3 @@ index 683ca6f..0ad082b 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch index e232c79..b93f83d 100644 --- a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch @@ -27,11 +27,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) -diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 33b7818..7617b4c 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { +@@ -670,6 +670,9 @@ func (b *Builder) addTransitiveLinkDeps( if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -41,11 +39,9 @@ index 33b7818..7617b4c 100644 haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 9305b2d..6560317 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -155,6 +155,8 @@ See also: go install, go get, go clean. +@@ -167,6 +167,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -54,10 +50,10 @@ index 9305b2d..6560317 100644 func init() { // break init cycle CmdBuild.Run = runBuild -@@ -167,6 +169,10 @@ func init() { +@@ -179,6 +181,10 @@ func init() { - AddBuildFlags(CmdBuild) - AddBuildFlags(CmdInstall) + AddBuildFlags(CmdBuild, DefaultBuildFlags) + AddBuildFlags(CmdInstall, DefaultBuildFlags) + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -65,11 +61,9 @@ index 9305b2d..6560317 100644 } // Note that flags consulted by other parts of the code -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index ccebaf8..59450d7 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) { +@@ -464,6 +464,23 @@ func (b *Builder) build(a *Action) (err return errors.New("binary-only packages are no longer supported") } @@ -93,7 +87,7 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) { +@@ -1493,6 +1510,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } @@ -108,6 +102,3 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch rename to meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch index 68e132f..b15d981 100644 --- a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -23,11 +23,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 6560317..5f3a988 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) { +@@ -251,7 +251,13 @@ func AddBuildFlags(cmd *base.Command, ma cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -41,7 +39,4 @@ index 6560317..5f3a988 100644 + cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") - cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.17.1 (Apple Git-112) - + if mask&OmitModFlag == 0 { diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch rename to meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch index 4bb1106..427cfb0 100644 --- a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch +++ b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch @@ -25,11 +25,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/x86/obj.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go -index 23741eb..8e74576 100644 --- a/src/cmd/link/internal/amd64/obj.go +++ b/src/cmd/link/internal/amd64/obj.go -@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) { +@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { PEreloc1: pereloc1, TLSIEtoLE: tlsIEtoLE, @@ -38,8 +36,6 @@ index 23741eb..8e74576 100644 Freebsddynld: "/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go -index 45a406e..724d3e3 100644 --- a/src/cmd/link/internal/arm/obj.go +++ b/src/cmd/link/internal/arm/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -51,8 +47,6 @@ index 45a406e..724d3e3 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go -index 7c66623..d8b1db1 100644 --- a/src/cmd/link/internal/arm64/obj.go +++ b/src/cmd/link/internal/arm64/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -62,10 +56,8 @@ index 7c66623..d8b1db1 100644 - Linuxdynld: "/lib/ld-linux-aarch64.so.1", + Linuxdynld: "/lib/ld-musl-aarch64.so.1", - Freebsddynld: "XXX", + Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", -diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go -index 231e1ff..631dd7a 100644 --- a/src/cmd/link/internal/mips/obj.go +++ b/src/cmd/link/internal/mips/obj.go @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -77,8 +69,6 @@ index 231e1ff..631dd7a 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go -index 9604208..5ef3ffc 100644 --- a/src/cmd/link/internal/mips64/obj.go +++ b/src/cmd/link/internal/mips64/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -90,8 +80,6 @@ index 9604208..5ef3ffc 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", Netbsddynld: "XXX", -diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go -index 51d1791..b15da85 100644 --- a/src/cmd/link/internal/ppc64/obj.go +++ b/src/cmd/link/internal/ppc64/obj.go @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -103,8 +91,6 @@ index 51d1791..b15da85 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go -index 3454476..42cc346 100644 --- a/src/cmd/link/internal/s390x/obj.go +++ b/src/cmd/link/internal/s390x/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -116,8 +102,6 @@ index 3454476..42cc346 100644 // not relevant for s390x Freebsddynld: "XXX", -diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go -index f1fad20..d2ca10c 100644 --- a/src/cmd/link/internal/x86/obj.go +++ b/src/cmd/link/internal/x86/obj.go @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -129,6 +113,3 @@ index f1fad20..d2ca10c 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/usr/libexec/ld.elf_so", --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.13.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.14.bb diff --git a/meta/recipes-devtools/go/go-cross_1.13.bb b/meta/recipes-devtools/go/go-cross_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.13.bb rename to meta/recipes-devtools/go/go-cross_1.14.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.13.bb rename to meta/recipes-devtools/go/go-crosssdk_1.14.bb diff --git a/meta/recipes-devtools/go/go-native_1.13.bb b/meta/recipes-devtools/go/go-native_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.13.bb rename to meta/recipes-devtools/go/go-native_1.14.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.13.bb b/meta/recipes-devtools/go/go-runtime_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.13.bb rename to meta/recipes-devtools/go/go-runtime_1.14.bb diff --git a/meta/recipes-devtools/go/go_1.13.bb b/meta/recipes-devtools/go/go_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.13.bb rename to meta/recipes-devtools/go/go_1.14.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:39 +0000 Subject: [oe-commits] [openembedded-core] 33/35: webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231308.09AA4233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 082ccd85589a230810621425ddbf438a03df437e Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:36 2020 +0200 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7bffc15..cc69653 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:40 +0000 Subject: [oe-commits] [openembedded-core] 34/35: webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231308.141AF233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1408c00d619d862d4da63882a86ff096a891ad5d Author: Adrian Bunk AuthorDate: Wed Feb 26 13:51:37 2020 +0200 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index cc69653..190bc78 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:13:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:13:41 +0000 Subject: [oe-commits] [openembedded-core] 35/35: webkitgtk: Remove obsolete woff2 comment In-Reply-To: <158293158598.5858.5212290702253207965@git.openembedded.org> References: <158293158598.5858.5212290702253207965@git.openembedded.org> Message-ID: <20200228231308.1CA36233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a5beb977a57e7b1941a2a1c5c130881b74da3b6b Author: Adrian Bunk AuthorDate: Wed Feb 26 13:49:23 2020 +0200 webkitgtk: Remove obsolete woff2 comment woff2 is now available in meta-webkit. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 190bc78..e4197d1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -55,7 +55,6 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" -# Source is at https://github.com/google/woff2 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:07 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (decf5d4 -> 8b10bb4) Message-ID: <158293164794.7355.16998162103340702645@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard decf5d4 linux-yocto/5.2: update to v5.2.32 discard a915070 libgpg-error: upgrade 1.36 -> 1.37 discard dadf824 ptest-packagelists.inc: add coreutils to SLOW list discard 915755f coreutils: add ptest discard 4098f53 ltp: Remove mips related open_posix_testsuite patch discard 6ab1a6a ltp: Update to 20200120 discard 35016db webkitgtk: Remove obsolete woff2 comment discard 6b72d51 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements discard 8ad808c webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG discard adc7eb4 maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk discard 122291a go: Update to 1.14 release series discard 6688673 systemd: Drop local time64 patch in favour of upstreamed patches discard 6d53c5b systemd: Do not force removing resolved from PACKAGECONFIG discard 1b335e9 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR discard 5c9e88d tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES discard b4a5734 lsb-release: fix likely reproducabilty timestamp discard 8a96c4b rt-tests: make manpages reproducible discard 973ceee sysvinit: remove logsave.8 discard 1b4e66c libedit/readline: Correct package alternatives link for manpage discard c2ada6d layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe discard 1f7f940 sysvinit: Fix install order/dependency discard 1246511 webkitgtk: Disable GI data for musl/arm discard 0f774a3b ncurses: upgrade 6.1+20191019 -> 6.2 discard a1ce797 gst-validate: upgrade 1.16.1 -> 1.16.2 discard 2723703 acpica: upgrade 20191213 -> 20200214 discard 99dfd16 python3-setuptools: upgrade 45.0.0 -> 45.2.0 discard d1bcb08 gnutls: upgrade 3.6.11.1 -> 3.6.12 discard daccb3e unifdef: upgrade 2.11 -> 2.12 discard 2f6c3c8 python3-mako: upgrade 1.1.0 -> 1.1.1 discard e7ddbf4 python3-docutils: upgrade 0.15 -> 0.16 discard 2cfe747 libpcre: upgrade 8.43 -> 8.44 discard 8700c19 libarchive: upgrade 3.4.1 -> 3.4.2 discard 8bf67bf qemu: Fix CVE-2020-1711 discard 9d2f67f weston: PACKAGECONFIG clients requires wayland discard 13a0d12 opensbi: Update to v0.6 discard 2541a5c perl: fix lib/warnings test on core-image-sato discard d4ca89a libevdev: fix upstream check discard 83248d5 python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 discard 23d67f4 ffmpeg: add PACKAGECONFIG support for fdk-aac discard bdc121b ruby: install required files for ptest discard e91f785 hosttools: add utilities for all supported checksums discard 654306b HACK: extra debug discard 2802967 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard b7b2d94 sstatesig: Log timestamps for hashequiv in reprodubile builds discard af1ac2a HACK: signing: Add extra test debug discard ac8d2375 glew/curl: specify exclusive package configs discard 6b3e550 base.bbclass: extend PACKAGECONFIG for conflict package configs add 78155e5 hosttools: add utilities for all supported checksums add be161be ruby: install required files for ptest add c616731 ffmpeg: add PACKAGECONFIG support for fdk-aac add 44b46ae python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 add db02bd4 libevdev: fix upstream check add 5198aa9 perl: fix lib/warnings test on core-image-sato add 20e9ca7 opensbi: Update to v0.6 add 9b1d308 weston: PACKAGECONFIG clients requires wayland add 66289b3 qemu: Fix CVE-2020-1711 add addfcef libarchive: upgrade 3.4.1 -> 3.4.2 add 09f6639 libpcre: upgrade 8.43 -> 8.44 add 855d0b8 python3-docutils: upgrade 0.15 -> 0.16 add 3a6bc80 python3-mako: upgrade 1.1.0 -> 1.1.1 add 1e6a1f1 unifdef: upgrade 2.11 -> 2.12 add 8652c95 gnutls: upgrade 3.6.11.1 -> 3.6.12 add 9c25692 python3-setuptools: upgrade 45.0.0 -> 45.2.0 add c971258 acpica: upgrade 20191213 -> 20200214 add 62019c0 gst-validate: upgrade 1.16.1 -> 1.16.2 add f59334e ncurses: upgrade 6.1+20191019 -> 6.2 add 7a9d9a4 webkitgtk: Disable GI data for musl/arm add c4fb899 sysvinit: Fix install order/dependency add 510015a layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe add 2db3646 libedit/readline: Correct package alternatives link for manpage add 90ee555 sysvinit: remove logsave.8 add baebf24 rt-tests: make manpages reproducible add bd0236d lsb-release: fix likely reproducabilty timestamp add eee65be tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES add 6da3239 linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR add fc05938 systemd: Do not force removing resolved from PACKAGECONFIG add d0f0061 systemd: Drop local time64 patch in favour of upstreamed patches add 3daa968 go: Update to 1.14 release series add fb0a7ab maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk add 082ccd8 webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG add 1408c00 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements add a5beb97 webkitgtk: Remove obsolete woff2 comment new 79ddd28 base.bbclass: extend PACKAGECONFIG for conflict package configs new 64e9710 glew/curl: specify exclusive package configs new 9077ce2 HACK: signing: Add extra test debug new 6af69b1 sstatesig: Log timestamps for hashequiv in reprodubile builds new 3701416 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 465e904 HACK: extra debug new b67a08d libgpg-error: upgrade 1.36 -> 1.37 new 28965bf linux-yocto/5.2: update to v5.2.32 new 2288166 libxcrypt: add native to BBCLASSEXTEND new 12bba63 mesa: add fix for arm6 new ae10c37 apr: add mulitlib scripts apr-1-config, apr_rules.mk new e10b214 apr-util: add multilib script for apu-1-config new 5f7a3af cups: make cups-config a multilib script new e0dea3f binutils: fix multilib header difference new 4bd02f1 xorgproto: move pc files to libdir new 8b10bb4 libmodule-build-perl: upgrade 0.4229 -> 0.4231 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (decf5d4) \ N -- N -- N refs/heads/master-next (8b10bb4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/ptest-packagelists.inc | 1 - meta/lib/oeqa/runtime/cases/ltp.py | 2 +- meta/recipes-core/coreutils/coreutils/run-ptest | 17 ---- meta/recipes-core/coreutils/coreutils_8.31.bb | 37 -------- meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- meta/recipes-devtools/binutils/binutils.inc | 2 + ...rl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 ++- meta/recipes-extended/cups/cups.inc | 4 +- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++++++-- ...-Add-option-to-select-libc-implementation.patch | 103 +++++++++++++++------ ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 +++++++ ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 +++++++++ ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++----- ...stcases-fix-an-absent-format-string-issue.patch | 24 +++++ ...rollers-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 +++++++ ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ++++++++++++++ .../ltp/{ltp_20200120.bb => ltp_20190930.bb} | 11 ++- meta/recipes-graphics/mesa/mesa.inc | 1 + .../xorg-proto/xorgproto_2019.2.bb | 2 + meta/recipes-support/apr/apr-util_1.6.1.bb | 4 +- meta/recipes-support/apr/apr_1.7.0.bb | 5 +- 23 files changed, 376 insertions(+), 159 deletions(-) delete mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (90%) create mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch create mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch create mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch rename meta/recipes-extended/ltp/{ltp_20200120.bb => ltp_20190930.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:08 +0000 Subject: [oe-commits] [openembedded-core] 01/16: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.5FE19233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 79ddd28430800b238b88961ed8c81f671ff202c0 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:10 +0000 Subject: [oe-commits] [openembedded-core] 03/16: HACK: signing: Add extra test debug In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.7D48D233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9077ce21afda476b2606a9016b1ef4f16c89b09b Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:11 +0000 Subject: [oe-commits] [openembedded-core] 04/16: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.88DD5233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6af69b174f4f4e9895fe2ab5536ea8b8192e1c22 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..4fc75a9 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -478,6 +478,7 @@ def OEOuthashBasic(path, sigfile, task, d): prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' extra_content = d.getVar('HASHEQUIV_HASH_VERSION') + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -551,6 +552,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:09 +0000 Subject: [oe-commits] [openembedded-core] 02/16: glew/curl: specify exclusive package configs In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.6E340233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 64e971043b2320b3878168a4eaa0b762a8001ea9 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:13 +0000 Subject: [oe-commits] [openembedded-core] 06/16: HACK: extra debug In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.A7B48233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 465e9048b4cf5f40f5a94ff35db8d31f91775370 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:17 +0000 Subject: [oe-commits] [openembedded-core] 10/16: mesa: add fix for arm6 In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.E2BD3233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 12bba630f3b7f239cd31c558bd9a5926334711bf Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:51:51 2020 -0800 mesa: add fix for arm6 We have had similar problems with missing atomics on arm6 that arm5 has. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 87f167c..54d7ea8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false" FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" +CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS" # Remove the mesa dependency on mesa-dev, as mesa is empty RDEPENDS_${PN}-dev = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:16 +0000 Subject: [oe-commits] [openembedded-core] 09/16: libxcrypt: add native to BBCLASSEXTEND In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.D52D223347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 22881662f1bfb66bccefe1b6ac59a2d7f385b0aa Author: Jeremy A. Puhlman AuthorDate: Fri Feb 28 14:51:16 2020 -0800 libxcrypt: add native to BBCLASSEXTEND buildtools-extended does not provide libcrypt, and some native applications require it, like clang. While it would likely make sense to include nativesdk-libxcrypt in the buildtools it would also likely make sense to remove the dependancy on the host libcrypt for those applications that need it. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 416205c..e59a096 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -32,4 +32,4 @@ CFLAGS += "-fcommon" API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:18 +0000 Subject: [oe-commits] [openembedded-core] 11/16: apr: add mulitlib scripts apr-1-config, apr_rules.mk In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.EF787233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ae10c3744e18690f1e3bd2e538f009953a13e7df Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:53:33 2020 -0800 apr: add mulitlib scripts apr-1-config, apr_rules.mk apr_rules.mk encodes build options in to file 35c35 < CC=x86_64-montavista-linux-gcc -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 --sysroot= Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr_1.7.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index eca9cde..8a9b780 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -23,7 +23,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" -inherit autotools-brokensep lib_package binconfig multilib_header ptest +inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" @@ -51,6 +51,9 @@ do_configure_prepend() { ./buildconf 2 } +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ + ${PN}-dev:${datadir}/build-1/apr_rules.mk" + FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" RDEPENDS_${PN}-dev += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:12 +0000 Subject: [oe-commits] [openembedded-core] 05/16: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.98732233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3701416c9ecd68c90ebcefaaedd4c8837ad8c8b8 Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:19 +0000 Subject: [oe-commits] [openembedded-core] 12/16: apr-util: add multilib script for apu-1-config In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231409.0AFB9233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e10b214fb1c5541709922b1b63186a7a6f76ebc1 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:53:34 2020 -0800 apr-util: add multilib script for apu-1-config apu-1-config encodes library path in to script 27c27 < libdir="/usr/lib64" Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr-util_1.6.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb index 1f9fea2..3896c92 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -28,7 +28,9 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools lib_package binconfig +inherit autotools lib_package binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:15 +0000 Subject: [oe-commits] [openembedded-core] 08/16: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.C53C723347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 28965bf19dca47f1c740fee0433211a72556daec Author: Bruce Ashfield AuthorDate: Mon Feb 24 15:02:02 2020 -0500 linux-yocto/5.2: update to v5.2.32 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:14 +0000 Subject: [oe-commits] [openembedded-core] 07/16: libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231408.B67E0233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b67a08dd9a29df9640c627fe6185b98790b93738 Author: Alexander Kanavin AuthorDate: Fri Feb 28 10:25:54 2020 +0100 libgpg-error: upgrade 1.36 -> 1.37 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...1-Do-not-fail-when-testing-config-scripts.patch | 27 ++++ .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 8 +- 3 files changed, 31 insertions(+), 148 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch new file mode 100644 index 0000000..a0ab4f2 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch @@ -0,0 +1,27 @@ +From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 28 Feb 2020 09:19:56 +0000 +Subject: [PATCH] Do not fail when testing config scripts + +In previous versions this was not a hard a failure, and so went +unnoticed. The test is unsuitable for building with sysroots anyway as the +failure is due to that. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9303954..7630540 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old + else \ + echo "no"; \ + echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ + fi + cp gpg-error-config-old $@ + diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 91% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..b9a2b01 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,11 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ - " + file://0001-Do-not-fail-when-testing-config-scripts.patch \ + " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:20 +0000 Subject: [oe-commits] [openembedded-core] 13/16: cups: make cups-config a multilib script In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231409.16773233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5f7a3afbde1d04f0ec94a1dd7c560cb02dcbef38 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:53:35 2020 -0800 cups: make cups-config a multilib script cups-config encodes the library dir in the script. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-extended/cups/cups.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 3498281..c5a60bd 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so" CLEANBROKEN = "1" -inherit autotools-brokensep binconfig useradd systemd pkgconfig +inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" @@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \ " CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" + SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:21 +0000 Subject: [oe-commits] [openembedded-core] 14/16: binutils: fix multilib header difference In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231409.21212233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e0dea3ff0bb438bf2ee3e81319fd6dedad4c6773 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:54:09 2020 -0800 binutils: fix multilib header difference bfd_stdint.h encodes the name of the compiler in the header which is different between mutlilibs. Remvoe target prefix to make the headers match. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 6ed40a1..b0937e6 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -163,6 +163,8 @@ do_install () { done oe_multilib_header bfd.h + # bfd_stdint.h encodes the compiler name in the header + sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},," } inherit update-alternatives -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:23 +0000 Subject: [oe-commits] [openembedded-core] 16/16: libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231409.3486D233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8b10bb4392bfe724e519e61112c0e9b7db33b19d Author: Tim Orling AuthorDate: Tue Feb 25 15:46:03 2020 -0800 libmodule-build-perl: upgrade 0.4229 -> 0.4231 Upstream release notes: " 0.4231 - Wed Jan 29 08:47:56 CET 2020 - Released 0.42_30 without code changes 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 - Add dependency on ExtUtils::PL2Bat " Add ptest RDEPENDS: - ExtUtils::Command::MM for t/compat.t - gcc, make didn't seem like enough for ptest, replace with packagegroup-core-buildessential which definitely works - perl-dev for EXTERN.h in t/xs.t Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev Five tests from t/help.t are skipped because they are TODO t/par.t is skipped because PAR::Dist (0.17+) is not present t/ppm.t is skipped because "HTML support not installed" All other tests pass. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb similarity index 90% rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index e3ba40d..b1967c7 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \ file://run-ptest \ - " -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" -SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" + " +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" +SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" S = "${WORKDIR}/Module-Build-${PV}" @@ -75,9 +75,10 @@ RDEPENDS_${PN} += " \ " RDEPENDS_${PN}-ptest += " \ - gcc \ - make \ + packagegroup-core-buildessential \ + perl-dev \ perl-module-blib \ + perl-module-extutils-command-mm \ perl-module-file-temp \ perl-module-lib \ perl-module-perlio \ @@ -103,4 +104,7 @@ RPROVIDES_${PN} += "\ libmodule-build-podparser-perl \ " +# t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev +INSANE_SKIP_${PN}-ptest = "dev-deps" + BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Feb 28 23:14:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 28 Feb 2020 23:14:22 +0000 Subject: [oe-commits] [openembedded-core] 15/16: xorgproto: move pc files to libdir In-Reply-To: <158293164794.7355.16998162103340702645@git.openembedded.org> References: <158293164794.7355.16998162103340702645@git.openembedded.org> Message-ID: <20200228231409.2A11923347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4bd02f1403199db3fc4942dc98071b050c439e28 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 15:00:06 2020 -0800 xorgproto: move pc files to libdir We fixed this two years go: http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151922.html However xorgproto moved to meson and uses pkgconfig module to generate the .pc which does not provide a method of omitting the libdir, which now means any pc generated from meson using the module will always be mulitlib incompatible. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb index fb3f3ae..c0785cc 100644 --- a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb @@ -19,6 +19,8 @@ inherit meson PACKAGECONFIG ??= "" PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" +# Datadir only used to install pc files, $datadir/pkgconfig +datadir="${libdir}" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 00:06:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 00:06:24 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (15d0a68 -> 1a42deb) Message-ID: <158293478420.902.8461165643043964143@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. discard 15d0a68 meta-networking: use COMMON_LICENSE_DIR for license file location discard bad5e41 meta-multimedia: use COMMON_LICENSE_DIR for license file location discard e9f3512 meta-oe: use COMMON_LICENSE_DIR for license file location new 1a42deb meta-multimedia: use COMMON_LICENSE_DIR for license file location This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (15d0a68) \ N -- N -- N refs/heads/master-next (1a42deb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++-- meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb | 2 +- meta-networking/recipes-support/arptables/arptables_git.bb | 2 +- meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +- meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | 2 +- .../recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++-- meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 2 +- meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 00:06:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 00:06:25 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: meta-multimedia: use COMMON_LICENSE_DIR for license file location In-Reply-To: <158293478420.902.8461165643043964143@git.openembedded.org> References: <158293478420.902.8461165643043964143@git.openembedded.org> Message-ID: <20200229000624.673DF233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1a42debe446a585b08a690f01cf72de80b961e2e Author: Andr? Draszik AuthorDate: Fri Feb 28 13:36:26 2020 +0000 meta-multimedia: use COMMON_LICENSE_DIR for license file location COMMON_LICENSE_DIR is the official location for license files Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +- meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 2 +- meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 2 +- meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb index cee386c..70eb6e4 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb @@ -1,7 +1,7 @@ SUMMARY = "Big Buck Bunny movie - 1080P" LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi" SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb index d395b92..df23689 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb @@ -1,7 +1,7 @@ SUMMARY = "Big Buck Bunny movie - 480P" LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "https://archive.org/download/BigBuckBunny/big_buck_bunny_480p_surround-fix.avi" SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb index 20d5627..cb8ece0 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb @@ -1,7 +1,7 @@ SUMMARY = "Big Buck Bunny movie - 720P" LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "https://archive.org/download/BigBuckBunny/big_buck_bunny_720p_surround.avi" SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc" diff --git a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb index 0582a48..04cbd2e 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb @@ -1,6 +1,6 @@ SUMMARY = "Tears of Steel movie - 1080P" LICENSE = "CC-BY-3.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" SRC_URI = "http://ftp.nluug.nl/pub/graphics/blender/demo/movies/ToS/ToS-4k-1920.mov" SRC_URI[md5sum] = "e3fee55b1779c553e37b1d3988e6fad6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 07:15:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 07:15:11 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (b09d0bd -> 1a42deb) Message-ID: <158296051122.17240.9691442425495662844@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master in repository meta-openembedded. from b09d0bd libp11: revert version back to the 0.4.10 release add 14eb476 luajit: Upgrade to 2.1.0-beta3 add 1b8d355 fio: change four python shebangs add 0acb728 evolution-data-server: upgrade 3.34.3 -> 3.34.4 add 76b5722 file-roller: upgrade 3.32.3 -> 3.32.4 add 5b244a2 gjs: upgrade 1.58.4 -> 1.58.5 add c93fbcf gnome-control-center: upgrade 3.34.2 -> 3.34.4 add d958d1a gnome-desktop3: upgrade 3.34.3 -> 3.34.4 add 66a19d8 gspell: upgrade 1.8.2 -> 1.8.3 add 32896d2 libgee: upgrade 0.20.2 -> 0.20.3 add f17928d gmime: upgrade 3.2.5 -> 3.2.6 add aba9bee netkit-ftp: clean in configure step broken add f953932 libmtp: upgrade 1.1.16 -> 1.1.17 add b48cb2b zabbix: upgrade 4.4.5 -> 4.4.6 add f017ca0 python3-appdirs: enable ptest add 83070e7 libowfat: fix sdk installation add 5674b0a lmsensors: Fix sensord dependencies add 1a42deb meta-multimedia: use COMMON_LICENSE_DIR for license file location No new revisions were added by this update. Summary of changes: .../evolution-data-server.inc | 6 ++-- ...file-roller_3.32.3.bb => file-roller_3.32.4.bb} | 4 +-- .../gjs/{gjs_1.58.4.bb => gjs_1.58.5.bb} | 4 +-- ...er_3.34.2.bb => gnome-control-center_3.34.4.bb} | 4 +-- ...desktop3_3.34.3.bb => gnome-desktop3_3.34.4.bb} | 4 +-- .../gspell/{gspell_1.8.2.bb => gspell_1.8.3.bb} | 4 +-- .../sample-content/bigbuckbunny-1080p.bb | 2 +- .../sample-content/bigbuckbunny-480p.bb | 2 +- .../sample-content/bigbuckbunny-720p.bb | 2 +- .../sample-content/tearsofsteel-1080p.bb | 2 +- .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 2 ++ .../recipes-support/ncp/libowfat_0.32.bb | 2 ++ .../fio/files/python3_shebangs.patch | 38 ++++++++++++++++++++++ meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 3 +- .../libmtp/{libmtp_1.1.16.bb => libmtp_1.1.17.bb} | 4 +-- .../zabbix/{zabbix_4.4.5.bb => zabbix_4.4.6.bb} | 4 +-- .../libgee/{libgee_0.20.2.bb => libgee_0.20.3.bb} | 4 +-- meta-oe/recipes-devtools/luajit/luajit/clang.patch | 4 +-- .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 13 ++++---- .../gmime/{gmime_3.2.5.bb => gmime_3.2.6.bb} | 4 +-- .../python/python3-appdirs/run-ptest | 3 ++ .../python/python3-appdirs_1.4.3.bb | 15 ++++++++- 23 files changed, 94 insertions(+), 37 deletions(-) rename meta-gnome/recipes-gnome/file-roller/{file-roller_3.32.3.bb => file-roller_3.32.4.bb} (77%) rename meta-gnome/recipes-gnome/gjs/{gjs_1.58.4.bb => gjs_1.58.5.bb} (87%) rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_3.34.2.bb => gnome-control-center_3.34.4.bb} (89%) rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.34.3.bb => gnome-desktop3_3.34.4.bb} (88%) rename meta-gnome/recipes-gnome/gspell/{gspell_1.8.2.bb => gspell_1.8.3.bb} (65%) create mode 100644 meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch rename meta-oe/recipes-connectivity/libmtp/{libmtp_1.1.16.bb => libmtp_1.1.17.bb} (93%) rename meta-oe/recipes-connectivity/zabbix/{zabbix_4.4.5.bb => zabbix_4.4.6.bb} (95%) rename meta-oe/recipes-devtools/libgee/{libgee_0.20.2.bb => libgee_0.20.3.bb} (77%) rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (90%) rename meta-oe/recipes-gnome/gmime/{gmime_3.2.5.bb => gmime_3.2.6.bb} (72%) create mode 100644 meta-python/recipes-devtools/python/python3-appdirs/run-ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:40 +0000 Subject: [oe-commits] [openembedded-core] 01/06: yocto-uninative.inc: version 2.8 updates glibc to 2.31 In-Reply-To: <158296839937.16635.2141311278679105175@git.openembedded.org> References: <158296839937.16635.2141311278679105175@git.openembedded.org> Message-ID: <20200229092639.CBDAF233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4169642e63b0e79e4ae6f9b8ba6c759f487f7eb3 Author: Michael Halstead AuthorDate: Fri Feb 28 18:12:38 2020 -0800 yocto-uninative.inc: version 2.8 updates glibc to 2.31 Allow sstate use in Tumbleweed and other distros as they update glibc. Signed-off-by: Richard Purdie --- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index ad75d3e..889695e 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,9 +6,9 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.30" +UNINATIVE_MAXGLIBCVERSION = "2.31" -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.7/" -UNINATIVE_CHECKSUM[aarch64] ?= "e76a45886ee8a0b3904b761c17ac8ff91edf9811ee455f1832d10763ba794dfc" -UNINATIVE_CHECKSUM[i686] ?= "810d027dfb1c7675226afbcec07808770516c969ee7378f6d8240281083f8924" -UNINATIVE_CHECKSUM[x86_64] ?= "9498d8bba047499999a7310ac2576d0796461184965351a56f6d32c888a1f216" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.8/" +UNINATIVE_CHECKSUM[aarch64] ?= "989187344bf9539b464fb7ed9c223e51f4bdb4c7a677d2c314e6fed393176efe" +UNINATIVE_CHECKSUM[i686] ?= "cc3e45bc8594488b407363e3fa9af5a099279dab2703c64342098719bd674990" +UNINATIVE_CHECKSUM[x86_64] ?= "a09922172c3a439105e0ae6b943daad2d83505b17da0aba97961ff433b8c21ab" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:42 +0000 Subject: [oe-commits] [openembedded-core] 03/06: make: disable use of posix_spawn on mips In-Reply-To: <158296839937.16635.2141311278679105175@git.openembedded.org> References: <158296839937.16635.2141311278679105175@git.openembedded.org> Message-ID: <20200229092639.EEA91233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f76d073bc79559ee55859c90e95456843d23d357 Author: Victor Kamensky AuthorDate: Fri Feb 28 23:55:46 2020 -0800 make: disable use of posix_spawn on mips After make-4.3 migration child_execute_job function started using posix_spawn function, which happens to be broken on mips. It manifests itself as when make executed by root, it switches real user id to wrong value because of some issues with direct setresuid system call done in glibc __spawni_child function through inline assemble and/or gcc compiling it produces wrong code. I.e instead of passing -1 posix_spawn function incorrectly passes 127 as ruid. Subsequently job started by make can fail with permission issue because they run under wrong user. For now workaround is used by explicitly disabling posix_spawn call use by make on mips through configure variable. Signed-off-by: Victor Kamensky Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make_4.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0a..5fa7059 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,6 +12,9 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" +EXTRA_OECONF_append_mips=" ac_cv_func_posix_spawn=no" +EXTRA_OECONF_append_mips64=" ac_cv_func_posix_spawn=no" + SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:41 +0000 Subject: [oe-commits] [openembedded-core] 02/06: make: 4.2.1 -> 4.3 In-Reply-To: <158296839937.16635.2141311278679105175@git.openembedded.org> References: <158296839937.16635.2141311278679105175@git.openembedded.org> Message-ID: <20200229092639.DF44B233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b08ad56dfb0109d18efc353ba2ceb1884ac05384 Author: Jens Rehsack AuthorDate: Mon Feb 24 15:39:20 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Fix incompatibility issues between gnulib bundled with updated make fix issues in w32 compat sources. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ 10 files changed, 246 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch new file mode 100644 index 0000000..096bcfd --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch @@ -0,0 +1,38 @@ +From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 17:39:56 +0100 +Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX + +When cross compiling for a system without getloadavg, do not try add +additional linker paths unless it's absolutely necessary. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + m4/getloadavg.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 3bd2a14..696c5de 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], + fi + + if test $gl_func_getloadavg_done = no; then ++ AS_CASE([$host_os], ++ [aix*], [ + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + gl_getloadavg_LIBS=$LIBS +@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], + AC_CHECK_LIB([getloadavg], [getloadavg], + [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], + [LIBS=$gl_getloadavg_LIBS]) ++ ], [:]) + fi + + # Set up the replacement function if necessary. +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch new file mode 100644 index 0000000..5797082 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch @@ -0,0 +1,41 @@ +From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 10:52:21 +0100 +Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning + +Fix compiler warning: + src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the + length of the source argument [-Wstringop-overflow=] + +The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the +size of the buffer is increased by 1 to hold a path with the length of +`MAXPATHLEN` and trailing `0`. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/dir.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dir.c b/src/dir.c +index 862a18e..cad4c4a 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) + if (plen > 1 && path[plen - 1] == '.' + && (path[plen - 2] == '/' || path[plen - 2] == '\\')) + { +- char parent[MAXPATHLEN]; ++ char parent[MAXPATHLEN+1]; + +- strncpy (parent, path, plen - 2); +- parent[plen - 2] = '\0'; ++ strncpy (parent, path, MAXPATHLEN); ++ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; + if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) + return -1; + } +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch new file mode 100644 index 0000000..b3d97f9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch @@ -0,0 +1,33 @@ +From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 12:10:06 +0100 +Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing + projects + +GNU project `make` relies on gnulib but provides some own compatibility +functions - including an `fcntl`, which fails on mingw. +The intension of gnulib is providing these functions and being wider tested, +but silently injecting a function opens battle of compatibility layers. + +So adding a hint into target `config.h` to allow deciding whether using +an own compatibility implementation or not. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + + m4/gnulib-comp.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 3ee0811..cf75541 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -147,6 +147,7 @@ + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) ++ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch new file mode 100644 index 0000000..9ecc445 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch @@ -0,0 +1,36 @@ +From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 11:12:43 +0100 +Subject: [PATCH 2/3] w32: compat: dirent.c: follow header + +src/w32/include/dirent.h completely delegates to mingw dirent implementation, +gnulib detects it as fine and completely usable - trust in that. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/w32/compat/dirent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c +index b8ec615..de80f72 100644 +--- a/src/w32/compat/dirent.c ++++ b/src/w32/compat/dirent.c +@@ -23,7 +23,7 @@ this program. If not, see . */ + #include + #include "dirent.h" + +- ++#ifndef __MINGW32__ + DIR* + opendir(const char* pDirName) + { +@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) + + return; + } ++#endif /* !__MINGW32__ */ +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch new file mode 100644 index 0000000..70414c5 --- /dev/null +++ b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch @@ -0,0 +1,79 @@ +From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 19:29:49 +0100 +Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated + +Rate the fcntl emulation from gnulib higher than the own one. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/output.h | 19 ++++++++++++++----- + src/w32/compat/posixfcn.c | 2 ++ + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/output.h b/src/output.h +index a506505..d3ce6b7 100644 +--- a/src/output.h ++++ b/src/output.h +@@ -67,14 +67,21 @@ void output_dump (struct output *out); + + # ifdef WINDOWS32 + /* For emulations in w32/compat/posixfcn.c. */ +-# define F_GETFD 1 +-# define F_SETLKW 2 ++# ifndef F_GETFD ++# define F_GETFD 1 ++# endif ++# ifndef F_SETLKW ++# define F_SETLKW 2 ++# endif + /* Implementation note: None of the values of l_type below can be zero + -- they are compared with a static instance of the struct, so zero + means unknown/invalid, see w32/compat/posixfcn.c. */ +-# define F_WRLCK 1 +-# define F_UNLCK 2 +- ++# ifndef F_WRLCK ++# define F_WRLCK 1 ++# endif ++# ifndef F_UNLCK ++# define F_UNLCK 2 ++# endif + struct flock + { + short l_type; +@@ -89,7 +96,9 @@ struct flock + typedef intptr_t sync_handle_t; + + /* Public functions emulated/provided in posixfcn.c. */ ++# ifndef HAVE_GNULIB_FCNTL + int fcntl (intptr_t fd, int cmd, ...); ++# endif + intptr_t create_mutex (void); + int same_stream (FILE *f1, FILE *f2); + +diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c +index 975dfb7..d337b9c 100644 +--- a/src/w32/compat/posixfcn.c ++++ b/src/w32/compat/posixfcn.c +@@ -29,6 +29,7 @@ this program. If not, see . */ + #ifndef NO_OUTPUT_SYNC + /* Support for OUTPUT_SYNC and related functionality. */ + ++#ifndef HAVE_GNULIB_FCNTL + /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ + int + fcntl (intptr_t fd, int cmd, ...) +@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) + return -1; + } + } ++#endif /* GNULIB_TEST_FCNTL */ + + static intptr_t mutex_handle = -1; + +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..70caf0a --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,18 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +SRC_URI += "\ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ + file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ + file://0002-w32-compat-dirent.c-follow-header.patch \ + file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ +" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:39 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (8b10bb4 -> b128d64) Message-ID: <158296839937.16635.2141311278679105175@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 8b10bb4 libmodule-build-perl: upgrade 0.4229 -> 0.4231 new 4169642 yocto-uninative.inc: version 2.8 updates glibc to 2.31 new b08ad56 make: 4.2.1 -> 4.3 new f76d073 make: disable use of posix_spawn on mips new 9f36bdb atk: upgrade 2.32.0 -> 2.34.1 new a0aebfe at-spi2-core: upgrade 2.32.1 -> 2.34.0 new b128d64 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/yocto-uninative.inc | 10 +-- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 21 ++++++ ...est_util.h-add-missing-sys-time.h-include.patch | 61 +++++++++++++++++ ...at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 11 +-- ...-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 +-- ...ld-enable-introspection-for-cross-compile.patch | 29 -------- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 +- 16 files changed, 328 insertions(+), 168 deletions(-) delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch create mode 100644 meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch create mode 100644 meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch create mode 100644 meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb create mode 100644 meta/recipes-devtools/make/make_4.3.bb create mode 100644 meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (53%) rename meta/recipes-support/atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} (83%) delete mode 100644 meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch rename meta/recipes-support/atk/{atk_2.32.0.bb => atk_2.34.1.bb} (73%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:43 +0000 Subject: [oe-commits] [openembedded-core] 04/06: atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158296839937.16635.2141311278679105175@git.openembedded.org> References: <158296839937.16635.2141311278679105175@git.openembedded.org> Message-ID: <20200229092640.09B6C233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9f36bdbdef98bdb7f9b8e68a7fc101bd821b709f Author: Tim Orling AuthorDate: Wed Feb 26 16:06:00 2020 -0800 atk: upgrade 2.32.0 -> 2.34.1 Patch no longer applies (nor is needed) upstream. Release notes: https://gitlab.gnome.org/GNOME/atk/-/raw/633bde11f93ee971ba8902c6fadbc29c121f71af/NEWS Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...ld-enable-introspection-for-cross-compile.patch | 29 ---------------------- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc..0000000 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.32.0.bb b/meta/recipes-support/atk/atk_2.34.1.bb similarity index 73% rename from meta/recipes-support/atk/atk_2.32.0.bb rename to meta/recipes-support/atk/atk_2.34.1.bb index 6722372..277397c 100644 --- a/meta/recipes-support/atk/atk_2.32.0.bb +++ b/meta/recipes-support/atk/atk_2.34.1.bb @@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:44 +0000 Subject: [oe-commits] [openembedded-core] 05/06: at-spi2-core: upgrade 2.32.1 -> 2.34.0 In-Reply-To: <158296839937.16635.2141311278679105175@git.openembedded.org> References: <158296839937.16635.2141311278679105175@git.openembedded.org> Message-ID: <20200229092640.17348233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a0aebfe653fd85647ae4629c56732eded0735951 Author: Tim Orling AuthorDate: Wed Feb 26 16:06:01 2020 -0800 at-spi2-core: upgrade 2.32.1 -> 2.34.0 Release notes: https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/6da122f1e8d6b02dda0f368610ab72fc3d1720cf/NEWS License-Update: Changed to LPGL-2.1+ Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb similarity index 83% rename from meta/recipes-support/atk/at-spi2-core_2.32.1.bb rename to meta/recipes-support/atk/at-spi2-core_2.34.0.bb index 18b5de2..84e05e7 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -1,15 +1,15 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Fix-source-reproducibility.patch" -SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254" -SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53" +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" X11DEPENDS = "virtual/libx11 libxi libxtst" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 09:26:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 09:26:45 +0000 Subject: [oe-commits] [openembedded-core] 06/06: at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158296839937.16635.2141311278679105175@git.openembedded.org> References: <158296839937.16635.2141311278679105175@git.openembedded.org> Message-ID: <20200229092640.24BAF233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b128d640b641f8335d73896c1f58fd27cb59e3d4 Author: Tim Orling AuthorDate: Fri Feb 28 21:03:59 2020 -0800 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 Add patch to fix missing sys/time.h include in tests/atk_test_util.h Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...est_util.h-add-missing-sys-time.h-include.patch | 61 ++++++++++++++++++++++ ...at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 11 ++-- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch new file mode 100644 index 0000000..f64e46e --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch @@ -0,0 +1,61 @@ +From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Fri, 28 Feb 2020 10:49:41 -0800 +Subject: [PATCH] atk_test_util.h: add missing sys/time.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On centos-7, we see errors likei [1]: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_sec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_nsec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ?timeout? isn?t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ?nanosleep? [-Wimplicit-function-declaration] + nanosleep(&timeout, NULL); + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ?timeout? has initializer but incomplete type + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_sec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_nsec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ?timeout? isn?t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + +This is because of missing sys/time.h in tests/atk_test_util.h [2] + +Thanks go to Khem Raj for pointing this out [3] + +[1] http://errors.yoctoproject.org/Errors/Details/392974/ +[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 +[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html + +Upstream-Status: Pending + +Signed-off-by: Tim Orling +--- + tests/atk_test_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h +index d69e650..98a2c01 100644 +--- a/tests/atk_test_util.h ++++ b/tests/atk_test_util.h +@@ -26,6 +26,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb similarity index 53% rename from meta/recipes-support/atk/at-spi2-atk_2.32.0.bb rename to meta/recipes-support/atk/at-spi2-atk_2.34.1.bb index b717a9c..6947559 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -1,16 +1,19 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" -SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check upstream-version-is-even +# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native +SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" + PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 12:57:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 12:57:31 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: psplash: Update to latest git revision Message-ID: <158298105190.10361.4174717991212839932@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 2d16f8c psplash: Update to latest git revision 2d16f8c is described below commit 2d16f8ce3186055a05b0c948fb90ee03df83fd5b Author: Richard Purdie AuthorDate: Sat Feb 29 12:52:40 2020 +0000 psplash: Update to latest git revision Image files are always generated now so make the gdk-pixbuf dependency required. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/psplash_git.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 6ff0393..875adb1 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" +DEPENDS = "gdk-pixbuf-native" -SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" +SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" PV = "0.1+git${SRCPV}" PR = "r15" @@ -49,9 +50,6 @@ python __anonymous() { d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) - if haspng: - d.appendVar("DEPENDS", " gdk-pixbuf-native") - d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) mlprefix = d.getVar('MLPREFIX') or '' pn = d.getVar('PN') or '' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:43 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (a5beb97 -> dd78eee) Message-ID: <158298154394.15847.1693953109670835988@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from a5beb97 webkitgtk: Remove obsolete woff2 comment new 1038aae libgpg-error: upgrade 1.36 -> 1.37 new 34278c3 linux-yocto/5.2: update to v5.2.32 new 4fa12fa libxcrypt: add native to BBCLASSEXTEND new 3971b62 mesa: add fix for arm6 new 9cdfafe apr: add mulitlib scripts apr-1-config, apr_rules.mk new 3682d0c apr-util: add multilib script for apu-1-config new 0e19b25 cups: make cups-config a multilib script new 62cd67a binutils: fix multilib header difference new fceed19 xorgproto: move pc files to libdir new 7c22dc2 libmodule-build-perl: upgrade 0.4229 -> 0.4231 new ccb374c yocto-uninative.inc: version 2.8 updates glibc to 2.31 new 4a5d4cf make: 4.2.1 -> 4.3 new de5572d make: disable use of posix_spawn on mips new eaf19af atk: upgrade 2.32.0 -> 2.34.1 new 3956af4 at-spi2-core: upgrade 2.32.1 -> 2.34.0 new dd78eee at-spi2-atk: upgrade 2.32.0 -> 2.34.1 The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/yocto-uninative.inc | 10 +- meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- meta/recipes-devtools/binutils/binutils.inc | 2 + meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ---------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 ++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 ++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ------ ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 +++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 -- meta/recipes-devtools/make/make_4.3.bb | 23 ++++ ...rl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +- meta/recipes-extended/cups/cups.inc | 4 +- meta/recipes-graphics/mesa/mesa.inc | 1 + .../xorg-proto/xorgproto_2019.2.bb | 2 + meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 ++-- meta/recipes-support/apr/apr-util_1.6.1.bb | 4 +- meta/recipes-support/apr/apr_1.7.0.bb | 5 +- ...est_util.h-add-missing-sys-time.h-include.patch | 61 +++++++++ ...at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 11 +- ...-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 +- ...ld-enable-introspection-for-cross-compile.patch | 29 ----- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 +- ...1-Do-not-fail-when-testing-config-scripts.patch | 27 ++++ .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 8 +- 30 files changed, 404 insertions(+), 343 deletions(-) delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch create mode 100644 meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch create mode 100644 meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch create mode 100644 meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb create mode 100644 meta/recipes-devtools/make/make_4.3.bb rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (90%) create mode 100644 meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (53%) rename meta/recipes-support/atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} (83%) delete mode 100644 meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch rename meta/recipes-support/atk/{atk_2.32.0.bb => atk_2.34.1.bb} (73%) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:46 +0000 Subject: [oe-commits] [openembedded-core] 03/16: libxcrypt: add native to BBCLASSEXTEND In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.65A1A233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4fa12fac6d320723d08fa7ab1635f63fbe01ad4d Author: Jeremy A. Puhlman AuthorDate: Fri Feb 28 14:51:16 2020 -0800 libxcrypt: add native to BBCLASSEXTEND buildtools-extended does not provide libcrypt, and some native applications require it, like clang. While it would likely make sense to include nativesdk-libxcrypt in the buildtools it would also likely make sense to remove the dependancy on the host libcrypt for those applications that need it. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 416205c..e59a096 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -32,4 +32,4 @@ CFLAGS += "-fcommon" API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:44 +0000 Subject: [oe-commits] [openembedded-core] 01/16: libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.4D897233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1038aaee556f32516129a536772850e5a401a331 Author: Alexander Kanavin AuthorDate: Fri Feb 28 10:25:54 2020 +0100 libgpg-error: upgrade 1.36 -> 1.37 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...1-Do-not-fail-when-testing-config-scripts.patch | 27 ++++ .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 8 +- 3 files changed, 31 insertions(+), 148 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch new file mode 100644 index 0000000..a0ab4f2 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch @@ -0,0 +1,27 @@ +From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 28 Feb 2020 09:19:56 +0000 +Subject: [PATCH] Do not fail when testing config scripts + +In previous versions this was not a hard a failure, and so went +unnoticed. The test is unsuitable for building with sysroots anyway as the +failure is due to that. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9303954..7630540 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old + else \ + echo "no"; \ + echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ + fi + cp gpg-error-config-old $@ + diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 91% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..b9a2b01 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,11 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ - " + file://0001-Do-not-fail-when-testing-config-scripts.patch \ + " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:47 +0000 Subject: [oe-commits] [openembedded-core] 04/16: mesa: add fix for arm6 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.6F388233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3971b6278f88b7f780f6d03847c2fed6bfd98d8c Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:51:51 2020 -0800 mesa: add fix for arm6 We have had similar problems with missing atomics on arm6 that arm5 has. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 87f167c..54d7ea8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false" FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" +CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS" # Remove the mesa dependency on mesa-dev, as mesa is empty RDEPENDS_${PN}-dev = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:48 +0000 Subject: [oe-commits] [openembedded-core] 05/16: apr: add mulitlib scripts apr-1-config, apr_rules.mk In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.7914A233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9cdfafe487fc5e7fecdc56a8fa5c3ea70829fb99 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:53:33 2020 -0800 apr: add mulitlib scripts apr-1-config, apr_rules.mk apr_rules.mk encodes build options in to file 35c35 < CC=x86_64-montavista-linux-gcc -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 --sysroot= Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr_1.7.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index eca9cde..8a9b780 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -23,7 +23,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" -inherit autotools-brokensep lib_package binconfig multilib_header ptest +inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" @@ -51,6 +51,9 @@ do_configure_prepend() { ./buildconf 2 } +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ + ${PN}-dev:${datadir}/build-1/apr_rules.mk" + FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" RDEPENDS_${PN}-dev += "bash" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:45 +0000 Subject: [oe-commits] [openembedded-core] 02/16: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.5C4A0233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 34278c33bf1f2f3a7810946ca07765014f228c9d Author: Bruce Ashfield AuthorDate: Mon Feb 24 15:02:02 2020 -0500 linux-yocto/5.2: update to v5.2.32 Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:50 +0000 Subject: [oe-commits] [openembedded-core] 07/16: cups: make cups-config a multilib script In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.8C0ED233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0e19b25fbf1d760c06dd6a2cb8e291c7482330c4 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:53:35 2020 -0800 cups: make cups-config a multilib script cups-config encodes the library dir in the script. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-extended/cups/cups.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 3498281..c5a60bd 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so" CLEANBROKEN = "1" -inherit autotools-brokensep binconfig useradd systemd pkgconfig +inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" @@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \ " CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" + SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:51 +0000 Subject: [oe-commits] [openembedded-core] 08/16: binutils: fix multilib header difference In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.953FD23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 62cd67ac4ca39edac3c57f648669f1427b6fe7dd Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:54:09 2020 -0800 binutils: fix multilib header difference bfd_stdint.h encodes the name of the compiler in the header which is different between mutlilibs. Remvoe target prefix to make the headers match. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 6ed40a1..b0937e6 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -163,6 +163,8 @@ do_install () { done oe_multilib_header bfd.h + # bfd_stdint.h encodes the compiler name in the header + sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},," } inherit update-alternatives -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:52 +0000 Subject: [oe-commits] [openembedded-core] 09/16: xorgproto: move pc files to libdir In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.9E44823347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fceed19bf1ab26adaea54edcc8af7f767a872269 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 15:00:06 2020 -0800 xorgproto: move pc files to libdir We fixed this two years go: http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151922.html However xorgproto moved to meson and uses pkgconfig module to generate the .pc which does not provide a method of omitting the libdir, which now means any pc generated from meson using the module will always be mulitlib incompatible. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb index fb3f3ae..c0785cc 100644 --- a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb @@ -19,6 +19,8 @@ inherit meson PACKAGECONFIG ??= "" PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" +# Datadir only used to install pc files, $datadir/pkgconfig +datadir="${libdir}" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:54 +0000 Subject: [oe-commits] [openembedded-core] 11/16: yocto-uninative.inc: version 2.8 updates glibc to 2.31 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.B148A233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ccb374c279b260b1fd3460f6bfd1567240816055 Author: Michael Halstead AuthorDate: Fri Feb 28 18:12:38 2020 -0800 yocto-uninative.inc: version 2.8 updates glibc to 2.31 Allow sstate use in Tumbleweed and other distros as they update glibc. Signed-off-by: Richard Purdie --- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index ad75d3e..889695e 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,9 +6,9 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.30" +UNINATIVE_MAXGLIBCVERSION = "2.31" -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.7/" -UNINATIVE_CHECKSUM[aarch64] ?= "e76a45886ee8a0b3904b761c17ac8ff91edf9811ee455f1832d10763ba794dfc" -UNINATIVE_CHECKSUM[i686] ?= "810d027dfb1c7675226afbcec07808770516c969ee7378f6d8240281083f8924" -UNINATIVE_CHECKSUM[x86_64] ?= "9498d8bba047499999a7310ac2576d0796461184965351a56f6d32c888a1f216" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.8/" +UNINATIVE_CHECKSUM[aarch64] ?= "989187344bf9539b464fb7ed9c223e51f4bdb4c7a677d2c314e6fed393176efe" +UNINATIVE_CHECKSUM[i686] ?= "cc3e45bc8594488b407363e3fa9af5a099279dab2703c64342098719bd674990" +UNINATIVE_CHECKSUM[x86_64] ?= "a09922172c3a439105e0ae6b943daad2d83505b17da0aba97961ff433b8c21ab" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:49 +0000 Subject: [oe-commits] [openembedded-core] 06/16: apr-util: add multilib script for apu-1-config In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.82195233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3682d0ca3ffeb84fd2f935a9c9b253e015c9e137 Author: Jeremy Puhlman AuthorDate: Fri Feb 28 14:53:34 2020 -0800 apr-util: add multilib script for apu-1-config apu-1-config encodes library path in to script 27c27 < libdir="/usr/lib64" Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr-util_1.6.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb index 1f9fea2..3896c92 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -28,7 +28,9 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools lib_package binconfig +inherit autotools lib_package binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:56 +0000 Subject: [oe-commits] [openembedded-core] 13/16: make: disable use of posix_spawn on mips In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.C5813233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit de5572deff36ecf7dd209600a94b3b7fb991cdc1 Author: Victor Kamensky AuthorDate: Fri Feb 28 23:55:46 2020 -0800 make: disable use of posix_spawn on mips After make-4.3 migration child_execute_job function started using posix_spawn function, which happens to be broken on mips. It manifests itself as when make executed by root, it switches real user id to wrong value because of some issues with direct setresuid system call done in glibc __spawni_child function through inline assemble and/or gcc compiling it produces wrong code. I.e instead of passing -1 posix_spawn function incorrectly passes 127 as ruid. Subsequently job started by make can fail with permission issue because they run under wrong user. For now workaround is used by explicitly disabling posix_spawn call use by make on mips through configure variable. Signed-off-by: Victor Kamensky Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make_4.3.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0a..ede90b9 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,6 +12,11 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" +# This was breaking on target kernel modules tests from testimage on mips/mips64. Likely a +# glibc issue in 2.31 which may be fixed in branch updates (testing pending). +EXTRA_OECONF_append_mips=" ac_cv_func_posix_spawn=no" +EXTRA_OECONF_append_mips64=" ac_cv_func_posix_spawn=no" + SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:53 +0000 Subject: [oe-commits] [openembedded-core] 10/16: libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.A7B3123347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7c22dc2e34af2530a73f3af2876f0f5f5b65c7c8 Author: Tim Orling AuthorDate: Tue Feb 25 15:46:03 2020 -0800 libmodule-build-perl: upgrade 0.4229 -> 0.4231 Upstream release notes: " 0.4231 - Wed Jan 29 08:47:56 CET 2020 - Released 0.42_30 without code changes 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 - Add dependency on ExtUtils::PL2Bat " Add ptest RDEPENDS: - ExtUtils::Command::MM for t/compat.t - gcc, make didn't seem like enough for ptest, replace with packagegroup-core-buildessential which definitely works - perl-dev for EXTERN.h in t/xs.t Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev Five tests from t/help.t are skipped because they are TODO t/par.t is skipped because PAR::Dist (0.17+) is not present t/ppm.t is skipped because "HTML support not installed" All other tests pass. Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb similarity index 90% rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index e3ba40d..b1967c7 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \ file://run-ptest \ - " -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" -SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" + " +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" +SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" S = "${WORKDIR}/Module-Build-${PV}" @@ -75,9 +75,10 @@ RDEPENDS_${PN} += " \ " RDEPENDS_${PN}-ptest += " \ - gcc \ - make \ + packagegroup-core-buildessential \ + perl-dev \ perl-module-blib \ + perl-module-extutils-command-mm \ perl-module-file-temp \ perl-module-lib \ perl-module-perlio \ @@ -103,4 +104,7 @@ RPROVIDES_${PN} += "\ libmodule-build-podparser-perl \ " +# t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev +INSANE_SKIP_${PN}-ptest = "dev-deps" + BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:55 +0000 Subject: [oe-commits] [openembedded-core] 12/16: make: 4.2.1 -> 4.3 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.BC4E1233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4a5d4cf0cc8a4a6af76f23dd8a29627042230f98 Author: Jens Rehsack AuthorDate: Mon Feb 24 15:39:20 2020 +0100 make: 4.2.1 -> 4.3 Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Fix incompatibility issues between gnulib bundled with updated make fix issues in w32 compat sources. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 4 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...davg.m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++++ ...001-src-dir.c-fix-buffer-overflow-warning.patch | 41 +++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ----------- ...tl-allow-being-detected-by-importing-proj.patch | 33 +++++++++ .../0002-w32-compat-dirent.c-follow-header.patch | 36 ++++++++++ .../0003-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ 10 files changed, 246 insertions(+), 123 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc..4142cf2 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d4..0000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch new file mode 100644 index 0000000..096bcfd --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch @@ -0,0 +1,38 @@ +From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 17:39:56 +0100 +Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX + +When cross compiling for a system without getloadavg, do not try add +additional linker paths unless it's absolutely necessary. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + m4/getloadavg.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 3bd2a14..696c5de 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], + fi + + if test $gl_func_getloadavg_done = no; then ++ AS_CASE([$host_os], ++ [aix*], [ + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + gl_getloadavg_LIBS=$LIBS +@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], + AC_CHECK_LIB([getloadavg], [getloadavg], + [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], + [LIBS=$gl_getloadavg_LIBS]) ++ ], [:]) + fi + + # Set up the replacement function if necessary. +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch new file mode 100644 index 0000000..5797082 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch @@ -0,0 +1,41 @@ +From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 10:52:21 +0100 +Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning + +Fix compiler warning: + src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the + length of the source argument [-Wstringop-overflow=] + +The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the +size of the buffer is increased by 1 to hold a path with the length of +`MAXPATHLEN` and trailing `0`. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/dir.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dir.c b/src/dir.c +index 862a18e..cad4c4a 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) + if (plen > 1 && path[plen - 1] == '.' + && (path[plen - 2] == '/' || path[plen - 2] == '\\')) + { +- char parent[MAXPATHLEN]; ++ char parent[MAXPATHLEN+1]; + +- strncpy (parent, path, plen - 2); +- parent[plen - 2] = '\0'; ++ strncpy (parent, path, MAXPATHLEN); ++ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; + if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) + return -1; + } +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9..0000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch new file mode 100644 index 0000000..b3d97f9 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch @@ -0,0 +1,33 @@ +From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 12:10:06 +0100 +Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing + projects + +GNU project `make` relies on gnulib but provides some own compatibility +functions - including an `fcntl`, which fails on mingw. +The intension of gnulib is providing these functions and being wider tested, +but silently injecting a function opens battle of compatibility layers. + +So adding a hint into target `config.h` to allow deciding whether using +an own compatibility implementation or not. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + + m4/gnulib-comp.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 3ee0811..cf75541 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -147,6 +147,7 @@ + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) ++ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch new file mode 100644 index 0000000..9ecc445 --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch @@ -0,0 +1,36 @@ +From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 11:12:43 +0100 +Subject: [PATCH 2/3] w32: compat: dirent.c: follow header + +src/w32/include/dirent.h completely delegates to mingw dirent implementation, +gnulib detects it as fine and completely usable - trust in that. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/w32/compat/dirent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c +index b8ec615..de80f72 100644 +--- a/src/w32/compat/dirent.c ++++ b/src/w32/compat/dirent.c +@@ -23,7 +23,7 @@ this program. If not, see . */ + #include + #include "dirent.h" + +- ++#ifndef __MINGW32__ + DIR* + opendir(const char* pDirName) + { +@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) + + return; + } ++#endif /* !__MINGW32__ */ +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch new file mode 100644 index 0000000..70414c5 --- /dev/null +++ b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch @@ -0,0 +1,79 @@ +From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 19:29:49 +0100 +Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated + +Rate the fcntl emulation from gnulib higher than the own one. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/output.h | 19 ++++++++++++++----- + src/w32/compat/posixfcn.c | 2 ++ + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/output.h b/src/output.h +index a506505..d3ce6b7 100644 +--- a/src/output.h ++++ b/src/output.h +@@ -67,14 +67,21 @@ void output_dump (struct output *out); + + # ifdef WINDOWS32 + /* For emulations in w32/compat/posixfcn.c. */ +-# define F_GETFD 1 +-# define F_SETLKW 2 ++# ifndef F_GETFD ++# define F_GETFD 1 ++# endif ++# ifndef F_SETLKW ++# define F_SETLKW 2 ++# endif + /* Implementation note: None of the values of l_type below can be zero + -- they are compared with a static instance of the struct, so zero + means unknown/invalid, see w32/compat/posixfcn.c. */ +-# define F_WRLCK 1 +-# define F_UNLCK 2 +- ++# ifndef F_WRLCK ++# define F_WRLCK 1 ++# endif ++# ifndef F_UNLCK ++# define F_UNLCK 2 ++# endif + struct flock + { + short l_type; +@@ -89,7 +96,9 @@ struct flock + typedef intptr_t sync_handle_t; + + /* Public functions emulated/provided in posixfcn.c. */ ++# ifndef HAVE_GNULIB_FCNTL + int fcntl (intptr_t fd, int cmd, ...); ++# endif + intptr_t create_mutex (void); + int same_stream (FILE *f1, FILE *f2); + +diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c +index 975dfb7..d337b9c 100644 +--- a/src/w32/compat/posixfcn.c ++++ b/src/w32/compat/posixfcn.c +@@ -29,6 +29,7 @@ this program. If not, see . */ + #ifndef NO_OUTPUT_SYNC + /* Support for OUTPUT_SYNC and related functionality. */ + ++#ifndef HAVE_GNULIB_FCNTL + /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ + int + fcntl (intptr_t fd, int cmd, ...) +@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) + return -1; + } + } ++#endif /* GNULIB_TEST_FCNTL */ + + static intptr_t mutex_handle = -1; + +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0c..0000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000..70caf0a --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,18 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +SRC_URI += "\ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ + file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ + file://0002-w32-compat-dirent.c-follow-header.patch \ + file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ +" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:57 +0000 Subject: [oe-commits] [openembedded-core] 14/16: atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.CEE16233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eaf19af52d166295494863379049868375498c0a Author: Tim Orling AuthorDate: Wed Feb 26 16:06:00 2020 -0800 atk: upgrade 2.32.0 -> 2.34.1 Patch no longer applies (nor is needed) upstream. Release notes: https://gitlab.gnome.org/GNOME/atk/-/raw/633bde11f93ee971ba8902c6fadbc29c121f71af/NEWS Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...ld-enable-introspection-for-cross-compile.patch | 29 ---------------------- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc..0000000 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.32.0.bb b/meta/recipes-support/atk/atk_2.34.1.bb similarity index 73% rename from meta/recipes-support/atk/atk_2.32.0.bb rename to meta/recipes-support/atk/atk_2.34.1.bb index 6722372..277397c 100644 --- a/meta/recipes-support/atk/atk_2.32.0.bb +++ b/meta/recipes-support/atk/atk_2.34.1.bb @@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:58 +0000 Subject: [oe-commits] [openembedded-core] 15/16: at-spi2-core: upgrade 2.32.1 -> 2.34.0 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.D75DF233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3956af4bf8a55ae0a64363c591c74c38d8468c58 Author: Tim Orling AuthorDate: Wed Feb 26 16:06:01 2020 -0800 at-spi2-core: upgrade 2.32.1 -> 2.34.0 Release notes: https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/6da122f1e8d6b02dda0f368610ab72fc3d1720cf/NEWS License-Update: Changed to LPGL-2.1+ Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb similarity index 83% rename from meta/recipes-support/atk/at-spi2-core_2.32.1.bb rename to meta/recipes-support/atk/at-spi2-core_2.34.0.bb index 18b5de2..84e05e7 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -1,15 +1,15 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Fix-source-reproducibility.patch" -SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254" -SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53" +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" X11DEPENDS = "virtual/libx11 libxi libxtst" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:05:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:05:59 +0000 Subject: [oe-commits] [openembedded-core] 16/16: at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <158298154394.15847.1693953109670835988@git.openembedded.org> References: <158298154394.15847.1693953109670835988@git.openembedded.org> Message-ID: <20200229130544.E18FF233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit dd78eeef75cb94f14dda8ae50c0a0bee1fcfca07 Author: Tim Orling AuthorDate: Fri Feb 28 21:03:59 2020 -0800 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 Add patch to fix missing sys/time.h include in tests/atk_test_util.h Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...est_util.h-add-missing-sys-time.h-include.patch | 61 ++++++++++++++++++++++ ...at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 11 ++-- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch new file mode 100644 index 0000000..f64e46e --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch @@ -0,0 +1,61 @@ +From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Fri, 28 Feb 2020 10:49:41 -0800 +Subject: [PATCH] atk_test_util.h: add missing sys/time.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On centos-7, we see errors likei [1]: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_sec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_nsec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ?timeout? isn?t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ?nanosleep? [-Wimplicit-function-declaration] + nanosleep(&timeout, NULL); + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ?timeout? has initializer but incomplete type + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_sec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_nsec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ?timeout? isn?t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + +This is because of missing sys/time.h in tests/atk_test_util.h [2] + +Thanks go to Khem Raj for pointing this out [3] + +[1] http://errors.yoctoproject.org/Errors/Details/392974/ +[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 +[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html + +Upstream-Status: Pending + +Signed-off-by: Tim Orling +--- + tests/atk_test_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h +index d69e650..98a2c01 100644 +--- a/tests/atk_test_util.h ++++ b/tests/atk_test_util.h +@@ -26,6 +26,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb similarity index 53% rename from meta/recipes-support/atk/at-spi2-atk_2.32.0.bb rename to meta/recipes-support/atk/at-spi2-atk_2.34.1.bb index b717a9c..6947559 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -1,16 +1,19 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" -SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check upstream-version-is-even +# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native +SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" + PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:11 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2d16f8c -> 06bf504) Message-ID: <158298157120.16625.13244284701427569676@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 2d16f8c psplash: Update to latest git revision discard b128d64 at-spi2-atk: upgrade 2.32.0 -> 2.34.1 discard a0aebfe at-spi2-core: upgrade 2.32.1 -> 2.34.0 discard 9f36bdb atk: upgrade 2.32.0 -> 2.34.1 discard f76d073 make: disable use of posix_spawn on mips discard b08ad56 make: 4.2.1 -> 4.3 discard 4169642 yocto-uninative.inc: version 2.8 updates glibc to 2.31 discard 8b10bb4 libmodule-build-perl: upgrade 0.4229 -> 0.4231 discard 4bd02f1 xorgproto: move pc files to libdir discard e0dea3f binutils: fix multilib header difference discard 5f7a3af cups: make cups-config a multilib script discard e10b214 apr-util: add multilib script for apu-1-config discard ae10c37 apr: add mulitlib scripts apr-1-config, apr_rules.mk discard 12bba63 mesa: add fix for arm6 discard 2288166 libxcrypt: add native to BBCLASSEXTEND discard 28965bf linux-yocto/5.2: update to v5.2.32 discard b67a08d libgpg-error: upgrade 1.36 -> 1.37 discard 465e904 HACK: extra debug discard 3701416 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 6af69b1 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 9077ce2 HACK: signing: Add extra test debug discard 64e9710 glew/curl: specify exclusive package configs discard 79ddd28 base.bbclass: extend PACKAGECONFIG for conflict package configs add 1038aae libgpg-error: upgrade 1.36 -> 1.37 add 34278c3 linux-yocto/5.2: update to v5.2.32 add 4fa12fa libxcrypt: add native to BBCLASSEXTEND add 3971b62 mesa: add fix for arm6 add 9cdfafe apr: add mulitlib scripts apr-1-config, apr_rules.mk add 3682d0c apr-util: add multilib script for apu-1-config add 0e19b25 cups: make cups-config a multilib script add 62cd67a binutils: fix multilib header difference add fceed19 xorgproto: move pc files to libdir add 7c22dc2 libmodule-build-perl: upgrade 0.4229 -> 0.4231 add ccb374c yocto-uninative.inc: version 2.8 updates glibc to 2.31 add 4a5d4cf make: 4.2.1 -> 4.3 add de5572d make: disable use of posix_spawn on mips add eaf19af atk: upgrade 2.32.0 -> 2.34.1 add 3956af4 at-spi2-core: upgrade 2.32.1 -> 2.34.0 add dd78eee at-spi2-atk: upgrade 2.32.0 -> 2.34.1 new 3023dea base.bbclass: extend PACKAGECONFIG for conflict package configs new 8908471 glew/curl: specify exclusive package configs new 155b2e2 HACK: signing: Add extra test debug new 612bb07 sstatesig: Log timestamps for hashequiv in reprodubile builds new c00842e rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 1e21dd8 HACK: extra debug new 06bf504 psplash: Update to latest git revision This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2d16f8c) \ N -- N -- N refs/heads/master-next (06bf504) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-devtools/make/make_4.3.bb | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:14 +0000 Subject: [oe-commits] [openembedded-core] 03/07: HACK: signing: Add extra test debug In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.6E495233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 155b2e287f4a6736d8a986b862d22e49fc21f622 Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:15 +0000 Subject: [oe-commits] [openembedded-core] 04/07: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.772F8233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 612bb0714485d9987dedbe4b463f61ccec088d49 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..4fc75a9 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -478,6 +478,7 @@ def OEOuthashBasic(path, sigfile, task, d): prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' extra_content = d.getVar('HASHEQUIV_HASH_VERSION') + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -551,6 +552,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:12 +0000 Subject: [oe-commits] [openembedded-core] 01/07: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.5A6CB233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3023deac7b4ebf111193dad81d37ecacf1e48fe3 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:13 +0000 Subject: [oe-commits] [openembedded-core] 02/07: glew/curl: specify exclusive package configs In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.65784233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8908471e5767ad51f674e1e5545a61ea4d629ecd Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:17 +0000 Subject: [oe-commits] [openembedded-core] 06/07: HACK: extra debug In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.9374D233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1e21dd846e8c71243aaae02d455101c267bf8014 Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:18 +0000 Subject: [oe-commits] [openembedded-core] 07/07: psplash: Update to latest git revision In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.9E675233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 06bf504e90a015be4760f36331d5a406f215454c Author: Richard Purdie AuthorDate: Sat Feb 29 12:52:40 2020 +0000 psplash: Update to latest git revision Image files are always generated now so make the gdk-pixbuf dependency required. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/psplash_git.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 6ff0393..875adb1 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" +DEPENDS = "gdk-pixbuf-native" -SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" +SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" PV = "0.1+git${SRCPV}" PR = "r15" @@ -49,9 +50,6 @@ python __anonymous() { d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) - if haspng: - d.appendVar("DEPENDS", " gdk-pixbuf-native") - d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) mlprefix = d.getVar('MLPREFIX') or '' pn = d.getVar('PN') or '' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 13:06:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 13:06:16 +0000 Subject: [oe-commits] [openembedded-core] 05/07: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158298157120.16625.13244284701427569676@git.openembedded.org> References: <158298157120.16625.13244284701427569676@git.openembedded.org> Message-ID: <20200229130611.8500B233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c00842e4911f3a63d533e2c05a4c9ab7169c2a3a Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:11 +0000 Subject: [oe-commits] [openembedded-core] 01/07: ncurses: Comment out version parsing that broke CVE checking In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145310.CD562233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7112f25bc04e0f7902cb79fde38c9057904ddef1 Author: Adrian Bunk AuthorDate: Sat Feb 29 11:51:04 2020 +0200 ncurses: Comment out version parsing that broke CVE checking This will be needed again when using patchlevel versions again. Also make it more generic. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses_6.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb index b6d899c..723e685 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -10,4 +10,5 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" +# This is needed when using patchlevel versions like 6.1+20181013 +#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:10 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (06bf504 -> f95ea5f) Message-ID: <158298799052.15748.4267372580737252031@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 06bf504 psplash: Update to latest git revision new 7112f25 ncurses: Comment out version parsing that broke CVE checking new 09b254b ltp: Update to 20200120 new d150c1f ltp: Remove mips related open_posix_testsuite patch new a9b6973 ltp: fixup new 58a8d21 util-linux: upgrade 2.34 -> 2.35.1 new dcc15b0 wic/engine: dump the partition table in JSON format only new f95ea5f systemd: Add missing leading space for CFLAGS append The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/runtime/cases/ltp.py | 2 +- meta/recipes-core/ncurses/ncurses_6.2.bb | 3 +- meta/recipes-core/systemd/systemd_244.3.bb | 2 +- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ------- .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 +- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++------ ...-Add-option-to-select-libc-implementation.patch | 103 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 -------------- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- scripts/lib/wic/engine.py | 2 +- 18 files changed, 103 insertions(+), 393 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch rename meta/recipes-core/util-linux/{util-linux_2.34.bb => util-linux_2.35.1.bb} (63%) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:12 +0000 Subject: [oe-commits] [openembedded-core] 02/07: ltp: Update to 20200120 In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145310.DA0F3233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 09b254b1c722edd74ef1447d789fbaad7bcd8ae5 Author: Petr Vorel AuthorDate: Fri Feb 28 18:57:30 2020 +0100 ltp: Update to 20200120 Removed ffsb copying file and associated runtest file fs_ext4 (both removed in this release). Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch IMHO this one shouldn't be needed not, but CI still fails without it Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/ltp.py | 2 +- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 37 ++------ ...-Add-option-to-select-libc-implementation.patch | 103 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 41 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 11 files changed, 95 insertions(+), 282 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py index b8b7300..6dc5ef2 100644 --- a/meta/lib/oeqa/runtime/cases/ltp.py +++ b/meta/lib/oeqa/runtime/cases/ltp.py @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] + ltp_fs = ["fs", "fsx", "fs_bind"] # skip kernel cpuhotplug ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] ltp_groups += ltp_fs diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f..773844d 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -25,34 +25,6 @@ index 504042e11..94db06266 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile index 8de247075..eb240f432 100644 --- a/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abc..0598046 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e731..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669..ecc6660 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch index eff9ed0..4120250 100644 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch @@ -1,21 +1,27 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 +From 2f6f356a49e28eb597df063e31770632e69a93aa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 +Date: Fri, 28 Feb 2020 14:55:26 +0100 Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl musl does not implement fts like glibc and therefore it depends on external implementation for all fts APIs -Upstream-Status: Pending +Upstream-Status: not acceptible Signed-off-by: Khem Raj +[ pvorel: rebased for 20200120 +IMHO this patch should not be needed as commits +22f510de8 ("Fix static linking with musl-fts") and +b24f3d32c ("cpuset: Detect missing fts.h") should handle it +but CI still report failures ] +Signed-off-by: Petr Vorel --- testcases/kernel/controllers/Makefile.inc | 3 +++ testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 +index 4ca0b5ac3..1d85e4d86 100644 --- a/testcases/kernel/controllers/Makefile.inc +++ b/testcases/kernel/controllers/Makefile.inc @@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) @@ -29,13 +35,13 @@ index 4ca0b5a..1d85e4d 100644 INSTALL_TARGETS ?= *.sh diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 +index c03dd77d7..6dd4ee619 100644 --- a/testcases/kernel/controllers/cpuset/Makefile.inc +++ b/testcases/kernel/controllers/cpuset/Makefile.inc @@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - LDLIBS += -lcpu_set -lcontrollers -lltp + LDLIBS := -lcpu_set -lcontrollers -lltp $(LDLIBS) +ifeq ($(LIBC),musl) +LDLIBS += -lfts +endif @@ -43,5 +49,5 @@ index db6a843..86dd2a8 100644 INSTALL_TARGETS ?= *.sh -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa..0000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325e..350091a 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 89% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc..312eeca 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:14 +0000 Subject: [oe-commits] [openembedded-core] 04/07: ltp: fixup In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145311.0025E233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a9b697361c0ad816bbe5695f4f2200ac1637d25c Author: Richard Purdie AuthorDate: Sat Feb 29 14:50:51 2020 +0000 ltp: fixup Signed-off-by: Richard Purdie --- meta/recipes-extended/ltp/ltp_20200120.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 847f267..5be9489 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -16,7 +16,8 @@ LIC_FILES_CHKSUM = "\ DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:13 +0000 Subject: [oe-commits] [openembedded-core] 03/07: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145310.E6ED1233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d150c1f5e69bd184bcc7446953256907d6cffc66 Author: Petr Vorel AuthorDate: Fri Feb 28 18:57:31 2020 +0100 ltp: Remove mips related open_posix_testsuite patch Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Richard Purdie --- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1d..0000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca..847f267 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:17 +0000 Subject: [oe-commits] [openembedded-core] 07/07: systemd: Add missing leading space for CFLAGS append In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145311.1EDDA23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f95ea5fb41d950571c33184ddf68e3ee7d59e1ed Author: Khem Raj AuthorDate: Sat Feb 29 06:37:56 2020 -0800 systemd: Add missing leading space for CFLAGS append Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index dfb7ad5..c5c0ce4 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -102,7 +102,7 @@ PACKAGECONFIG_remove_libc-musl = " \ utmp \ " -CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:16 +0000 Subject: [oe-commits] [openembedded-core] 06/07: wic/engine: dump the partition table in JSON format only In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145311.15A6A233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dcc15b0e680a9a0280b305216b355f0ab7e4e982 Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 15:16:43 2020 +0100 wic/engine: dump the partition table in JSON format only since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") in util-linux [1], the '-J' can't be used with the '-d' option anymore. So, since we're using json format output, drop the '-d' option. Fixes: ERROR: _exec_cmd: /usr/sbin/sfdisk -dJ /core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 2479751..83c42c9 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -439,7 +439,7 @@ class Disk: outf.flush() def read_ptable(path): - out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) + out = exec_cmd("{} -J {}".format(self.sfdisk, path)) return json.loads(out) def write_ptable(parts, target): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 14:53:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 14:53:15 +0000 Subject: [oe-commits] [openembedded-core] 05/07: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158298799052.15748.4267372580737252031@git.openembedded.org> References: <158298799052.15748.4267372580737252031@git.openembedded.org> Message-ID: <20200229145311.0C08F233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 58a8d21c10c8d5f265b39c77378f56e5d7223f17 Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 15:16:42 2020 +0100 util-linux: upgrade 2.34 -> 2.35.1 License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 ++- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb similarity index 63% rename from meta/recipes-core/util-linux/util-linux_2.34.bb rename to meta/recipes-core/util-linux/util-linux_2.35.1.bb index 557449d..03afd2a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -7,8 +7,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:10 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f95ea5f -> 45a0f13) Message-ID: <158299321074.3583.1351721579494040677@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard f95ea5f systemd: Add missing leading space for CFLAGS append discard dcc15b0 wic/engine: dump the partition table in JSON format only discard 58a8d21 util-linux: upgrade 2.34 -> 2.35.1 discard a9b6973 ltp: fixup new 15a4559 ltp: fixup new d3d6ab0 util-linux: upgrade 2.34 -> 2.35.1 new 87ee55b wic/engine: dump the partition table in JSON format only new 8192522 systemd: Add missing leading space for CFLAGS append new 56ec2e8 python3-scons: Fix license file collision new 0f4207f glibc: Syscall fixes for mips/risc-v/mucroblaze new 45a0f13 make: Drop mips glibc workaround This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f95ea5f) \ N -- N -- N refs/heads/master-next (45a0f13) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/glibc/glibc-version.inc | 4 +- meta/recipes-devtools/make/make_4.3.bb | 5 -- .../recipes-devtools/python/python3-scons_3.1.2.bb | 4 +- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 53 ---------------------- 4 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:13 +0000 Subject: [oe-commits] [openembedded-core] 03/07: wic/engine: dump the partition table in JSON format only In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162010.F0085233459@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 87ee55becd5b4e1c270db3b09d2b9b45a8c82124 Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 15:16:43 2020 +0100 wic/engine: dump the partition table in JSON format only since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") in util-linux [1], the '-J' can't be used with the '-d' option anymore. So, since we're using json format output, drop the '-d' option. Fixes: ERROR: _exec_cmd: /usr/sbin/sfdisk -dJ /core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 2479751..83c42c9 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -439,7 +439,7 @@ class Disk: outf.flush() def read_ptable(path): - out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) + out = exec_cmd("{} -J {}".format(self.sfdisk, path)) return json.loads(out) def write_ptable(parts, target): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:14 +0000 Subject: [oe-commits] [openembedded-core] 04/07: systemd: Add missing leading space for CFLAGS append In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162011.0797A233470@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 81925223f488efca6ec6f258359ec9c64e9ce609 Author: Khem Raj AuthorDate: Sat Feb 29 06:37:56 2020 -0800 systemd: Add missing leading space for CFLAGS append Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index dfb7ad5..c5c0ce4 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -102,7 +102,7 @@ PACKAGECONFIG_remove_libc-musl = " \ utmp \ " -CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:12 +0000 Subject: [oe-commits] [openembedded-core] 02/07: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162010.E4DED233457@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d3d6ab0be6142ba31bb0800ad0b14f11d72d71b0 Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 15:16:42 2020 +0100 util-linux: upgrade 2.34 -> 2.35.1 License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 5 ++- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb similarity index 63% rename from meta/recipes-core/util-linux/util-linux_2.34.bb rename to meta/recipes-core/util-linux/util-linux_2.35.1.bb index 557449d..03afd2a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -7,8 +7,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:11 +0000 Subject: [oe-commits] [openembedded-core] 01/07: ltp: fixup In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162010.DA814233456@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 15a45594caee395c120070d0040985af34f049cb Author: Richard Purdie AuthorDate: Sat Feb 29 14:50:51 2020 +0000 ltp: fixup Signed-off-by: Richard Purdie --- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 53 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 3 +- 2 files changed, 2 insertions(+), 54 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index 4120250..0000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2f6f356a49e28eb597df063e31770632e69a93aa Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 28 Feb 2020 14:55:26 +0100 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: not acceptible - -Signed-off-by: Khem Raj -[ pvorel: rebased for 20200120 -IMHO this patch should not be needed as commits -22f510de8 ("Fix static linking with musl-fts") and -b24f3d32c ("cpuset: Detect missing fts.h") should handle it -but CI still report failures ] -Signed-off-by: Petr Vorel ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5ac3..1d85e4d86 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index c03dd77d7..6dd4ee619 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS := -lcpu_set -lcontrollers -lltp $(LDLIBS) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.25.1 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 847f267..5be9489 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -16,7 +16,8 @@ LIC_FILES_CHKSUM = "\ DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:16 +0000 Subject: [oe-commits] [openembedded-core] 06/07: glibc: Syscall fixes for mips/risc-v/mucroblaze In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162011.1C5AD233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0f4207f9ab1a3d9284a062b5325b7e102abf22a7 Author: Khem Raj AuthorDate: Sat Feb 29 07:40:52 2020 -0800 glibc: Syscall fixes for mips/risc-v/mucroblaze Should fix the mips make 4.3 issue on target Changes in this delta * 71f2b249a2 malloc/tst-mallocfork2: Kill lingering process for unexpected failures * 5d31b083e4 riscv: Avoid clobbering register parameters in syscall * f4f8843515 microblaze: Avoid clobbering register parameters in syscall * aa638b86b2 mips: Fix argument passing for inlined syscalls on Linux [BZ #25523] * ae1b6b13d4 mips: Use 'long int' and 'long long int' in linux syscall code Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index f489650..4c72eed 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.31/master" -PV = "2.31" -SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" +PV = "2.31+git${SRCPV}" +SRCREV_glibc ?= "71f2b249a28e17eac0e47c53af44d5c5b65101aa" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:17 +0000 Subject: [oe-commits] [openembedded-core] 07/07: make: Drop mips glibc workaround In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162011.27EE023347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 45a0f1339afdaa95902d5f5095d486a967f13fed Author: Richard Purdie AuthorDate: Sat Feb 29 16:19:46 2020 +0000 make: Drop mips glibc workaround Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make_4.3.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index ede90b9..70caf0a 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,11 +12,6 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" -# This was breaking on target kernel modules tests from testimage on mips/mips64. Likely a -# glibc issue in 2.31 which may be fixed in branch updates (testing pending). -EXTRA_OECONF_append_mips=" ac_cv_func_posix_spawn=no" -EXTRA_OECONF_append_mips64=" ac_cv_func_posix_spawn=no" - SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:15 +0000 Subject: [oe-commits] [openembedded-core] 05/07: python3-scons: Fix license file collision In-Reply-To: <158299321074.3583.1351721579494040677@git.openembedded.org> References: <158299321074.3583.1351721579494040677@git.openembedded.org> Message-ID: <20200229162011.11A6C233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 56ec2e80a87d9362f7401008e0ae89f91492b556 Author: Richard Purdie AuthorDate: Sat Feb 29 15:38:12 2020 +0000 python3-scons: Fix license file collision Downloading a file called "LICENSE" into DL_DIR is 'problematic' and collides with the file from other versions of the recipe at best. Rename it to something more specific to avoid collision problems. Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb index aa7a2a8..ce117a9 100644 --- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Software Construction tool (make/autotools replacement)" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0" # pypi package does not have a valid license file -SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license" SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:20:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:20:29 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: fetch2: Limit shown checksums to sha256 Message-ID: <158299322910.4075.17786036012111628743@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new a3e911e fetch2: Limit shown checksums to sha256 a3e911e is described below commit a3e911e27cc175d5061fce88195a8683e57a55a0 Author: Richard Purdie AuthorDate: Sat Feb 29 16:13:14 2020 +0000 fetch2: Limit shown checksums to sha256 Currently bitbake will list many checksums for a recipe when none are present, encouraging users to add them all to a recipe. We don't need/want them all. We used to show md5 and sha256 but given the concerns about md5, switch to showing just sha256 going forward which seems like the sensible one to standardise upon. There will be no change to existing recipe functionality. Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index b83347a..9734e21 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -34,6 +34,7 @@ _checksum_cache = bb.checksum.FileChecksumCache() logger = logging.getLogger("BitBake.Fetcher") CHECKSUM_LIST = [ "md5", "sha256", "sha1", "sha384", "sha512" ] +SHOWN_CHECKSUM_LIST = ["sha256"] class BBFetchException(Exception): """Class all fetch exceptions inherit from""" @@ -580,7 +581,9 @@ def verify_checksum(ud, d, precomputed={}): checksum_dict = {ci["id"] : ci["data"] for ci in checksum_infos} checksum_event = {"%ssum" % ci["id"] : ci["data"] for ci in checksum_infos} - checksum_lines = ["SRC_URI[%s] = \"%s\"" % (ci["name"], ci["data"]) for ci in checksum_infos] + for ci in checksum_infos: + if ci["id"] in SHOWN_CHECKSUM_LIST: + checksum_lines = ["SRC_URI[%s] = \"%s\"" % (ci["name"], ci["data"])] # If no checksum has been provided if ud.method.recommends_checksum(ud) and all(ci["expected"] is None for ci in checksum_infos): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:28:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:28:02 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (1a42deb -> af22a7a) Message-ID: <158299368217.5946.17507097462368025261@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a change to branch master-next in repository meta-openembedded. from 1a42deb meta-multimedia: use COMMON_LICENSE_DIR for license file location new 24d6260 python3-numpy: add from oe-core new af22a7a piglist: add from oe-core The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...stall-bash-completions-in-the-right-place.patch | 35 +++++++++++ ...-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch | 32 ++++++++++ meta-oe/recipes-graphics/piglit/piglit_git.bb | 64 ++++++++++++++++++++ ...h-usr-and-so-on-for-libraries-by-default-.patch | 70 ++++++++++++++++++++++ ...m-setup.py-remove-the-detection-of-x86-ta.patch | 32 ++++++++++ .../recipes-devtools/python-numpy/python-numpy.inc | 52 ++++++++++++++++ .../python-numpy/python3-numpy_1.17.4.bb | 3 + 7 files changed, 288 insertions(+) create mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch create mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch create mode 100644 meta-oe/recipes-graphics/piglit/piglit_git.bb create mode 100644 meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch create mode 100644 meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch create mode 100644 meta-python/recipes-devtools/python-numpy/python-numpy.inc create mode 100644 meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:28:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:28:03 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: python3-numpy: add from oe-core In-Reply-To: <158299368217.5946.17507097462368025261@git.openembedded.org> References: <158299368217.5946.17507097462368025261@git.openembedded.org> Message-ID: <20200229162802.A04A1233474@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 24d6260ea0ebe808939fdd0b396ef5f6cf355596 Author: Alexander Kanavin AuthorDate: Sat Feb 29 11:13:35 2020 +0100 python3-numpy: add from oe-core Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj --- ...h-usr-and-so-on-for-libraries-by-default-.patch | 70 ++++++++++++++++++++++ ...m-setup.py-remove-the-detection-of-x86-ta.patch | 32 ++++++++++ .../recipes-devtools/python-numpy/python-numpy.inc | 52 ++++++++++++++++ .../python-numpy/python3-numpy_1.17.4.bb | 3 + 4 files changed, 157 insertions(+) diff --git a/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch new file mode 100644 index 0000000..98a9705 --- /dev/null +++ b/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -0,0 +1,70 @@ +From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 10 Dec 2015 13:20:30 +0200 +Subject: [PATCH] Don't search /usr and so on for libraries by default to + + avoid host contamination. + +Upstream-Status: Inappropriate (As the code stands, this is a hack) +Signed-off-by: Ross Burton +Signed-off-by: Alexander Kanavin + +--- + numpy/distutils/system_info.py | 42 ++++------------------------------ + 1 file changed, 5 insertions(+), 37 deletions(-) + +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index ba2b1f4..f94dce1 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -278,45 +278,13 @@ if sys.platform == 'win32': + add_system_root(os.path.join(conda_dir, 'Library')) + + else: +- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', +- '/opt/local/lib', '/sw/lib'], platform_bits) + default_runtime_dirs = [] +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- # path of umfpack under macports +- '/opt/local/include/ufsparse', +- '/opt/local/include', '/sw/include', +- '/usr/include/suitesparse'] +- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] +- +- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', +- '/usr/lib'], platform_bits) +- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', +- '/usr/include'] +- +- if os.path.exists('/usr/lib/X11'): +- globbed_x11_dir = glob('/usr/lib/*/libX11.so') +- if globbed_x11_dir: +- x11_so_dir = os.path.split(globbed_x11_dir[0])[0] +- default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11']) +- default_x11_include_dirs.extend(['/usr/lib/X11/include', +- '/usr/include/X11']) +- +- with open(os.devnull, 'w') as tmp: +- try: +- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE, +- stderr=tmp) +- except (OSError, DistutilsError): +- # OSError if gcc is not installed, or SandboxViolation (DistutilsError +- # subclass) if an old setuptools bug is triggered (see gh-3160). +- pass +- else: +- triplet = str(p.communicate()[0].decode().strip()) +- if p.returncode == 0: +- # gcc supports the "-print-multiarch" option +- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] +- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] ++ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) ++ default_include_dirs = ['/deaddir/include'] ++ default_src_dirs = ['.', '/deaddir/src'] + ++ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) ++ default_x11_include_dirs = ['/deaddir/include'] + + if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: + default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) diff --git a/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch b/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch new file mode 100644 index 0000000..9da6a2b --- /dev/null +++ b/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch @@ -0,0 +1,32 @@ +From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 12 Aug 2019 15:37:36 +0200 +Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets + via uname() + +This was badly breaking compilation for ARM targets (and possibly +other non-x86 targets); if -msse2 is desirable for x86 builds it has +to be passed through another channel. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + numpy/random/setup.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/numpy/random/setup.py b/numpy/random/setup.py +index a1bf3b8..60fb534 100644 +--- a/numpy/random/setup.py ++++ b/numpy/random/setup.py +@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None): + elif not is_msvc: + # Some bit generators require c99 + EXTRA_COMPILE_ARGS += ['-std=c99'] +- INTEL_LIKE = any(arch in platform.machine() +- for arch in ('x86', 'i686', 'i386', 'amd64')) +- if INTEL_LIKE: +- # Assumes GCC or GCC-like compiler +- EXTRA_COMPILE_ARGS += ['-msse2'] + + # Use legacy integer variable sizes + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')] diff --git a/meta-python/recipes-devtools/python-numpy/python-numpy.inc b/meta-python/recipes-devtools/python-numpy/python-numpy.inc new file mode 100644 index 0000000..8413434 --- /dev/null +++ b/meta-python/recipes-devtools/python-numpy/python-numpy.inc @@ -0,0 +1,52 @@ +SUMMARY = "A sophisticated Numeric Processing Package for Python" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" + +SRCNAME = "numpy" + +SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ + file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ + file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ + " +SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" +SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" + +UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +# Needed for building with gcc 4.x from centos 7 +CFLAGS_append_class-native = " -std=c99" + +S = "${WORKDIR}/numpy-${PV}" + +CLEANBROKEN = "1" + +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" + +# install what is needed for numpy.test() +RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-nose \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-mmap \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pydoc \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-multiprocessing \ +" + +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb b/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb new file mode 100644 index 0000000..d388e88 --- /dev/null +++ b/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb @@ -0,0 +1,3 @@ +inherit setuptools3 +require python-numpy.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 16:28:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 16:28:04 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: piglist: add from oe-core In-Reply-To: <158299368217.5946.17507097462368025261@git.openembedded.org> References: <158299368217.5946.17507097462368025261@git.openembedded.org> Message-ID: <20200229162802.AC4AE233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit af22a7a46ab6306aa4d59037e59b4dcf373b2603 Author: Alexander Kanavin AuthorDate: Sat Feb 29 11:13:36 2020 +0100 piglist: add from oe-core Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj --- ...stall-bash-completions-in-the-right-place.patch | 35 ++++++++++++ ...-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch | 32 +++++++++++ meta-oe/recipes-graphics/piglit/piglit_git.bb | 64 ++++++++++++++++++++++ 3 files changed, 131 insertions(+) diff --git a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch new file mode 100644 index 0000000..e07e810 --- /dev/null +++ b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch @@ -0,0 +1,35 @@ +From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Wed, 13 Jul 2016 19:19:02 +0300 +Subject: [PATCH] cmake: install bash-completions in the right place + +The completionsdir variable is a full path and should not be +prefixed. + +This does mean the files may be installed outside of +CMAKE_INSTALL_PREFIX -- the alternative is more difficult and +means that bash completion files may be installed where +bash-completion can't find them. + +Signed-off-by: Jussi Kukkonen +Upstream-Status: Submitted [mailing list] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e2abba..784a8f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,7 +532,7 @@ install ( + if (BASH_COMPLETION_FOUND) + install( + FILES completions/bash/piglit +- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/ ++ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/ + ) + endif (BASH_COMPLETION_FOUND) + +-- +2.8.1 + diff --git a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch new file mode 100644 index 0000000..5d6ec36 --- /dev/null +++ b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch @@ -0,0 +1,32 @@ +From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Thu, 4 Oct 2018 14:43:17 +0200 +Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable + +WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly +set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even +when cross compiling. + +Signed-off-by: Pascal Bach + +Upstream-Status: Submitted [piglit at lists.freedesktop.org] +--- + tests/util/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt +index a5f080156..a303a9f58 100644 +--- a/tests/util/CMakeLists.txt ++++ b/tests/util/CMakeLists.txt +@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE) + piglit-framework-gl/piglit_wl_framework.c + ) + list(APPEND UTIL_GL_INCLUDES +- ${WAYLAND_wayland-client_INCLUDEDIR} ++ ${WAYLAND_INCLUDE_DIRS} + ) + endif() + if(PIGLIT_HAS_X11) +-- +2.11.0 + diff --git a/meta-oe/recipes-graphics/piglit/piglit_git.bb b/meta-oe/recipes-graphics/piglit/piglit_git.bb new file mode 100644 index 0000000..58d10d6 --- /dev/null +++ b/meta-oe/recipes-graphics/piglit/piglit_git.bb @@ -0,0 +1,64 @@ +SUMMARY = "OpenGL driver testing framework" +DESCRIPTION = "Piglit is an open-source test suite for OpenGL and OpenCL \ +implementations." +LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" + +SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ + file://0001-cmake-install-bash-completions-in-the-right-place.patch \ + file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ + " +UPSTREAM_CHECK_COMMITS = "1" + +SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813" +# (when PV goes above 1.0 remove the trailing r) +PV = "1.0+gitr${SRCPV}" + +S = "${WORKDIR}/git" + +X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}" +X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}" + +DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl" + +inherit cmake pkgconfig python3native features_check bash-completion + +# depends on virtual/libgl +REQUIRED_DISTRO_FEATURES += "opengl" + +# The built scripts go into the temporary directory according to tempfile +# (typically /tmp) which can race if multiple builds happen on the same machine, +# so tell it to use a directory in ${B} to avoid overwriting. +export TEMP = "${B}/temp/" +do_compile[dirs] =+ "${B}/temp/" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," +PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" + + +do_configure_prepend() { + if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then + sed -i -e "/^#.*include $/d" ${S}/src/piglit/glut_wrap.h + sed -i -e "/^#.*include.*$/d" ${S}/src/piglit/glut_wrap.h + fi +} + +# Forcibly strip because Piglit is *huge* +OECMAKE_TARGET_INSTALL = "install/strip" + +RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ + python3-misc \ + python3-unixadmin python3-xml python3-multiprocessing \ + python3-six python3-shell python3-io \ + python3-netserver bash \ + " + +INSANE_SKIP_${PN} += "dev-so already-stripped" + +# As nothing builds against Piglit we don't need to have anything in the +# sysroot, especially when this is ~2GB of test suite +SYSROOT_DIRS_remove = "${libdir}" + +# Can't be built with ccache +CCACHE_DISABLE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 18:55:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 18:55:58 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: sysdig: Upgrade to 0.26.5 Message-ID: <158300255834.1180.11919308851237879996@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 733af15 sysdig: Upgrade to 0.26.5 733af15 is described below commit 733af1518b957bcb7841bec286af8182e655b71c Author: Khem Raj AuthorDate: Wed Jan 2 17:59:20 2019 -0800 sysdig: Upgrade to 0.26.5 * License changed to Apache-2.0 upstream as well [1] * Forward port patches to apply on 0.26 * Just build libb64 from internal modules everything else should be provided by OE recipes * Disable luajit mips64 since luajit on these arches is not available, fall back to liblua * Disable build on musl, it needs fixing in sysdig Signed-off-by: Khem Raj --- ...ith-musl-backtrace-APIs-are-glibc-specifi.patch | 37 ++++--- .../0001-fix-build-with-LuaJIT-2.1-betas.patch | 96 ++++++++++++++++++ .../0001-libsinsp-Port-to-build-with-lua-5.2.patch | 108 --------------------- .../sysdig/sysdig/fix-uint64-const.patch | 16 +++ meta-oe/recipes-extended/sysdig/sysdig_git.bb | 47 +++++---- 5 files changed, 158 insertions(+), 146 deletions(-) diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch index 7d3f8a1..cb80611 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch @@ -9,42 +9,41 @@ Signed-off-by: Khem Raj userspace/libsinsp/utils.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/userspace/libsinsp/utils.cpp b/userspace/libsinsp/utils.cpp -index 8f23f9c..c496a57 100644 --- a/userspace/libsinsp/utils.cpp +++ b/userspace/libsinsp/utils.cpp -@@ -21,7 +21,9 @@ along with sysdig. If not, see . +@@ -22,7 +22,7 @@ limitations under the License. #include #include #include -+#ifdef __GLIBC__ +-#ifndef CYGWING_AGENT ++#if !defined(CYGWING_AGENT) || defined(__GLIBC__) #include -+#endif + #endif #include - #include - #include -@@ -741,7 +743,7 @@ uint64_t sinsp_utils::get_current_time_ns() - return tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000; - } +@@ -780,6 +780,7 @@ bool sinsp_utils::glob_match(const char --#ifndef _WIN32 -+#if defined(_WIN32) && defined(__GLIBC__) + #ifndef CYGWING_AGENT + #ifndef _WIN32 ++#ifdef __GLIBC__ void sinsp_utils::bt(void) { static const char start[] = "BACKTRACE ------------"; -diff --git a/userspace/libsinsp/utils.h b/userspace/libsinsp/utils.h -index 600d00b..4ab4650 100644 +@@ -801,6 +802,7 @@ void sinsp_utils::bt(void) + + free(bt_syms); + } ++#endif // Glibc + #endif // _WIN32 + #endif // CYGWING_AGENT + --- a/userspace/libsinsp/utils.h +++ b/userspace/libsinsp/utils.h -@@ -79,7 +79,7 @@ public: +@@ -104,7 +104,7 @@ public: - static uint64_t get_current_time_ns(); + static bool glob_match(const char *pattern, const char *string); -#ifndef _WIN32 +#if not defined(_WIN32) && defined(__GLIBC__) // // Print the call stack // --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-fix-build-with-LuaJIT-2.1-betas.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-fix-build-with-LuaJIT-2.1-betas.patch new file mode 100644 index 0000000..71b0b8c --- /dev/null +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-fix-build-with-LuaJIT-2.1-betas.patch @@ -0,0 +1,96 @@ +From ae82de664a6ba6ab2654adf9bed81f22b6fdc19d Mon Sep 17 00:00:00 2001 +From: Evgeni Golov +Date: Sun, 27 Aug 2017 13:51:19 +0200 +Subject: [PATCH] fix build with LuaJIT 2.1 betas + +LuaJIT 2.1 drops some compat symbols [1]. And while I think that this is +wrong, as it breaks compatibility with Lua 5.1 [2], it is quite easy to +adopt the code to work with both versions (2.0 and 2.1) of LuaJIT and +remain Lua 5.1 compatible. + +[1] https://github.com/LuaJIT/LuaJIT/commit/dc320ca70f2c5bb3977b82853bcee6dad2523d01 +[2] https://github.com/LuaJIT/LuaJIT/issues/325 + +Upstream-Status: Submitted [https://github.com/LuaJIT/LuaJIT/issues/325] +Signed-off-by: Evgeni Golov +sysdig-CLA-1.0-signed-off-by: Evgeni Golov +--- + CMakeLists.txt | 2 +- + userspace/libsinsp/chisel.cpp | 6 +++--- + userspace/libsinsp/lua_parser.cpp | 2 +- + userspace/libsinsp/lua_parser_api.cpp | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7020493..33e524f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,7 +140,7 @@ option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system + option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_DEPS}) + + if(NOT USE_BUNDLED_LUAJIT) +- find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.0 luajit) ++ find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.1 luajit-2.0 luajit) + find_library(LUAJIT_LIB NAMES luajit luajit-5.1) + if(LUAJIT_INCLUDE AND LUAJIT_LIB) + message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}") +diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp +index 0a6e3cf8..0c2e255a 100644 +--- a/userspace/libsinsp/chisel.cpp ++++ b/userspace/libsinsp/chisel.cpp +@@ -98,7 +98,7 @@ void lua_stackdump(lua_State *L) + // Lua callbacks + /////////////////////////////////////////////////////////////////////////////// + #ifdef HAS_LUA_CHISELS +-const static struct luaL_reg ll_sysdig [] = ++const static struct luaL_Reg ll_sysdig [] = + { + {"set_filter", &lua_cbacks::set_global_filter}, + {"set_snaplen", &lua_cbacks::set_snaplen}, +@@ -134,7 +134,7 @@ const static struct luaL_reg ll_sysdig [] = + {NULL,NULL} + }; + +-const static struct luaL_reg ll_chisel [] = ++const static struct luaL_Reg ll_chisel [] = + { + {"request_field", &lua_cbacks::request_field}, + {"set_filter", &lua_cbacks::set_filter}, +@@ -146,7 +146,7 @@ const static struct luaL_reg ll_chisel [] = + {NULL,NULL} + }; + +-const static struct luaL_reg ll_evt [] = ++const static struct luaL_Reg ll_evt [] = + { + {"field", &lua_cbacks::field}, + {"get_num", &lua_cbacks::get_num}, +diff --git a/userspace/libsinsp/lua_parser.cpp b/userspace/libsinsp/lua_parser.cpp +index 0e26617d..78810d96 100644 +--- a/userspace/libsinsp/lua_parser.cpp ++++ b/userspace/libsinsp/lua_parser.cpp +@@ -32,7 +32,7 @@ extern "C" { + #include "lauxlib.h" + } + +-const static struct luaL_reg ll_filter [] = ++const static struct luaL_Reg ll_filter [] = + { + {"rel_expr", &lua_parser_cbacks::rel_expr}, + {"bool_op", &lua_parser_cbacks::bool_op}, +diff --git a/userspace/libsinsp/lua_parser_api.cpp b/userspace/libsinsp/lua_parser_api.cpp +index c89e9126..e0169fe1 100644 +--- a/userspace/libsinsp/lua_parser_api.cpp ++++ b/userspace/libsinsp/lua_parser_api.cpp +@@ -266,7 +266,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls) + string err = "Got non-table as in-expression operand\n"; + throw sinsp_exception("parser API error"); + } +- int n = luaL_getn(ls, 4); /* get size of table */ ++ int n = (int)lua_objlen(ls, 4); /* get size of table */ + for (i=1; i<=n; i++) + { + lua_rawgeti(ls, 4, i); +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch deleted file mode 100644 index 8fec0ca..0000000 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch +++ /dev/null @@ -1,108 +0,0 @@ -From c2782a6ca968190e221c25b0890600ba8cd43798 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 23 Oct 2015 00:23:15 -0700 -Subject: [PATCH] libsinsp: Port to build with lua >= 5.2 - -Signed-off-by: Khem Raj ---- - userspace/libsinsp/chisel.cpp | 40 +++++++++++++++++++++++++++++----------- - 1 file changed, 29 insertions(+), 11 deletions(-) - -diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp -index 3cfbd8d..2db9348 100644 ---- a/userspace/libsinsp/chisel.cpp -+++ b/userspace/libsinsp/chisel.cpp -@@ -94,7 +94,7 @@ void lua_stackdump(lua_State *L) - // Lua callbacks - /////////////////////////////////////////////////////////////////////////////// - #ifdef HAS_LUA_CHISELS --const static struct luaL_reg ll_sysdig [] = -+const static struct luaL_Reg ll_sysdig [] = - { - {"set_filter", &lua_cbacks::set_global_filter}, - {"set_snaplen", &lua_cbacks::set_snaplen}, -@@ -120,7 +120,7 @@ const static struct luaL_reg ll_sysdig [] = - {NULL,NULL} - }; - --const static struct luaL_reg ll_chisel [] = -+const static struct luaL_Reg ll_chisel [] = - { - {"request_field", &lua_cbacks::request_field}, - {"set_filter", &lua_cbacks::set_filter}, -@@ -131,7 +131,7 @@ const static struct luaL_reg ll_chisel [] = - {NULL,NULL} - }; - --const static struct luaL_reg ll_evt [] = -+const static struct luaL_Reg ll_evt [] = - { - {"field", &lua_cbacks::field}, - {"get_num", &lua_cbacks::get_num}, -@@ -853,10 +853,28 @@ bool sinsp_chisel::parse_view_info(lua_State *ls, OUT chisel_desc* cd) - - - #ifdef HAS_LUA_CHISELS -+static void chisel_lua_registerlib(lua_State *L, const char *libname, -+ const luaL_Reg *l, int ind) -+{ -+#if LUA_VERSION_NUM >= 502 -+ if (libname) -+ { -+ lua_newtable(L); -+ luaL_setfuncs(L, l, ind); -+ lua_pushvalue(L, -1); -+ lua_setglobal(L, libname); -+ } -+ else -+ luaL_setfuncs(L, l, ind); -+#else -+ luaL_register(L, libname, l); -+#endif -+} -+ - // Initializes a lua chisel - bool sinsp_chisel::init_lua_chisel(chisel_desc &cd, string const &fpath) - { -- lua_State* ls = lua_open(); -+ lua_State* ls = luaL_newstate(); - if(ls == NULL) - { - return false; -@@ -867,9 +885,9 @@ bool sinsp_chisel::init_lua_chisel(chisel_desc &cd, string const &fpath) - // - // Load our own lua libs - // -- luaL_openlib(ls, "sysdig", ll_sysdig, 0); -- luaL_openlib(ls, "chisel", ll_chisel, 0); -- luaL_openlib(ls, "evt", ll_evt, 0); -+ chisel_lua_registerlib(ls, "sysdig", ll_sysdig, 0); -+ chisel_lua_registerlib(ls, "chisel", ll_chisel, 0); -+ chisel_lua_registerlib(ls, "evt", ll_evt, 0); - - // - // Add our chisel paths to package.path -@@ -1111,16 +1129,16 @@ void sinsp_chisel::load(string cmdstr) - // - // Open the script - // -- m_ls = lua_open(); -+ m_ls = luaL_newstate(); - - luaL_openlibs(m_ls); - - // - // Load our own lua libs - // -- luaL_openlib(m_ls, "sysdig", ll_sysdig, 0); -- luaL_openlib(m_ls, "chisel", ll_chisel, 0); -- luaL_openlib(m_ls, "evt", ll_evt, 0); -+ chisel_lua_registerlib(m_ls, "sysdig", ll_sysdig, 0); -+ chisel_lua_registerlib(m_ls, "chisel", ll_chisel, 0); -+ chisel_lua_registerlib(m_ls, "evt", ll_evt, 0); - - // - // Add our chisel paths to package.path --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch b/meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch new file mode 100644 index 0000000..5c75629 --- /dev/null +++ b/meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch @@ -0,0 +1,16 @@ +Fix x86 build + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/userspace/libsinsp/cgroup_limits.cpp ++++ b/userspace/libsinsp/cgroup_limits.cpp +@@ -9,7 +9,7 @@ namespace { + // This reports extremely large values (e.g. almost-but-not-quite 9EiB as set by k8s) as unlimited. + // Note: we use the same maximum value for cpu shares/quotas as well; the typical values are much lower + // and so should never exceed CGROUP_VAL_MAX either +-constexpr const int64_t CGROUP_VAL_MAX = (1UL << 42u) - 1; ++constexpr const int64_t CGROUP_VAL_MAX = (1ULL << 42u) - 1; + + /** + * \brief Read a single int64_t value from cgroupfs diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index 4f58281..5817c4d 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -3,39 +3,48 @@ DESCRIPTION = "Sysdig is open source, system-level exploration: capture \ system state and activity from a running Linux instance, then save, \ filter and analyze." HOMEPAGE = "http://www.sysdig.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "Apache-2.0 & (MIT | GPL-2.0)" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44" inherit cmake pkgconfig -OECMAKE_GENERATOR = "Unix Makefiles" +#OECMAKE_GENERATOR = "Unix Makefiles" +JIT ?= "jit" +JIT_mipsarchn32 = "" +JIT_mipsarchn64 = "" +JIT_aarch64 = "" -DEPENDS = "luajit zlib ncurses" +DEPENDS += "lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=master \ - file://0001-libsinsp-Port-to-build-with-lua-5.2.patch \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ + file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \ + file://fix-uint64-const.patch \ " -SRCREV = "85d16f33a82a17f87ccdbc088749271c71d87013" -PV = "0.1.102+git${SRCPV}" +# v0.26.4 +SRCREV = "9fa0d129668fdabf256446be4be35838888052d9" +PV = "0.26.5" S = "${WORKDIR}/git" -DIR_ETC="/etc" -EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \ - -DUSE_BUNDLED_ZLIB="OFF" \ - -DBUILD_DRIVER="OFF" \ - -DUSE_BUNDLED_NCURSES="OFF" \ - -DDIR_ETC="${DIR_ETC}" \ - ' +EXTRA_OECMAKE = "\ + -DBUILD_DRIVER=OFF \ + -DUSE_BUNDLED_DEPS=OFF \ + -DUSE_BUNDLED_B64=ON \ + -DCREATE_TEST_TARGETS=OFF \ + -DDIR_ETC=${sysconfdir} \ + -DLUA_INCLUDE_DIR=${STAGING_INCDIR}/luajit-2.1 \ + -DLUA_LIBRARY=libluajit-5.1.so \ +" FILES_${PN} += " \ ${DIR_ETC}/* \ ${datadir}/zsh/* \ ${prefix}/src/* \ " - -# luajit not supported on Aarch64 -COMPATIBLE_HOST = "^(?!aarch64).*" - +# Use getaddrinfo_a is a GNU extension in libsinsp +# It should be fixed in sysdig, until then disable +# on musl +# Something like this https://code.videolan.org/ePirat/vlc/-/commit/01fd9fe4c7f6c5558f7345f38abf0152e17853ab is needed to fix it +COMPATIBLE_HOST_libc-musl = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 19:43:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 19:43:54 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: phoronix-test-suite: Add python3 to safe siggen deps Message-ID: <158300543418.20594.16146583128146424613@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. The following commit(s) were added to refs/heads/master-next by this push: new 13ac085 phoronix-test-suite: Add python3 to safe siggen deps 13ac085 is described below commit 13ac08587f58aae0645e6f7e9701f7b55e8c743f Author: Khem Raj AuthorDate: Sat Feb 29 11:42:21 2020 -0800 phoronix-test-suite: Add python3 to safe siggen deps Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 8ad21d6..c537736 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -49,7 +49,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ usb-modeswitch-data->usb-modeswitch \ lmsensors->lmsensors-config \ phoronix-test-suite->bash \ - phoronix-test-suite->python \ + phoronix-test-suite->python3 \ phoronix-test-suite->php \ phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:47:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:47:52 +0000 Subject: [oe-commits] [openembedded-core] 01/04: psplash: Update to latest git revision In-Reply-To: <158301287104.10115.12260998192343480771@git.openembedded.org> References: <158301287104.10115.12260998192343480771@git.openembedded.org> Message-ID: <20200229214751.3A81823347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f273684f75c050ce3c7c4d93d73a27c973f84df5 Author: Richard Purdie AuthorDate: Sat Feb 29 12:52:40 2020 +0000 psplash: Update to latest git revision Image files are always generated now so make the gdk-pixbuf dependency required. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/psplash_git.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 6ff0393..875adb1 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" +DEPENDS = "gdk-pixbuf-native" -SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" +SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" PV = "0.1+git${SRCPV}" PR = "r15" @@ -49,9 +50,6 @@ python __anonymous() { d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) - if haspng: - d.appendVar("DEPENDS", " gdk-pixbuf-native") - d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) mlprefix = d.getVar('MLPREFIX') or '' pn = d.getVar('PN') or '' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:47:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:47:54 +0000 Subject: [oe-commits] [openembedded-core] 03/04: systemd: Add missing leading space for CFLAGS append In-Reply-To: <158301287104.10115.12260998192343480771@git.openembedded.org> References: <158301287104.10115.12260998192343480771@git.openembedded.org> Message-ID: <20200229214751.4F7E023347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9141ff8dc4e75e42606f3c364718f7e813003863 Author: Khem Raj AuthorDate: Sat Feb 29 06:37:56 2020 -0800 systemd: Add missing leading space for CFLAGS append Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index dfb7ad5..c5c0ce4 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -102,7 +102,7 @@ PACKAGECONFIG_remove_libc-musl = " \ utmp \ " -CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:47:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:47:53 +0000 Subject: [oe-commits] [openembedded-core] 02/04: ncurses: Comment out version parsing that broke CVE checking In-Reply-To: <158301287104.10115.12260998192343480771@git.openembedded.org> References: <158301287104.10115.12260998192343480771@git.openembedded.org> Message-ID: <20200229214751.44E7F23347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7939288700ad35ed43e5988371e16d5afc594a57 Author: Adrian Bunk AuthorDate: Sat Feb 29 11:51:04 2020 +0200 ncurses: Comment out version parsing that broke CVE checking This will be needed again when using patchlevel versions again. Also make it more generic. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses_6.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb index b6d899c..723e685 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -10,4 +10,5 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" +# This is needed when using patchlevel versions like 6.1+20181013 +#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:47:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:47:51 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (dd78eee -> 3ef237f) Message-ID: <158301287104.10115.12260998192343480771@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from dd78eee at-spi2-atk: upgrade 2.32.0 -> 2.34.1 new f273684 psplash: Update to latest git revision new 7939288 ncurses: Comment out version parsing that broke CVE checking new 9141ff8 systemd: Add missing leading space for CFLAGS append new 3ef237f python3-scons: Fix license file collision The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/recipes-core/ncurses/ncurses_6.2.bb | 3 ++- meta/recipes-core/psplash/psplash_git.bb | 6 ++---- meta/recipes-core/systemd/systemd_244.3.bb | 2 +- meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:47:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:47:55 +0000 Subject: [oe-commits] [openembedded-core] 04/04: python3-scons: Fix license file collision In-Reply-To: <158301287104.10115.12260998192343480771@git.openembedded.org> References: <158301287104.10115.12260998192343480771@git.openembedded.org> Message-ID: <20200229214751.5CFBE233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3ef237f2cd1836f4c9f584837fb25762fe4d4332 Author: Richard Purdie AuthorDate: Sat Feb 29 15:38:12 2020 +0000 python3-scons: Fix license file collision Downloading a file called "LICENSE" into DL_DIR is 'problematic' and collides with the file from other versions of the recipe at best. Rename it to something more specific to avoid collision problems. Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb index aa7a2a8..ce117a9 100644 --- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Software Construction tool (make/autotools replacement)" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0" # pypi package does not have a valid license file -SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license" SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:03 +0000 Subject: [oe-commits] [openembedded-core] 03/15: HACK: signing: Add extra test debug In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214800.D660723347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 544cbe40830732a92ab95f1e9fef06c04ba00f2a Author: Richard Purdie AuthorDate: Wed Dec 4 20:20:52 2019 +0000 HACK: signing: Add extra test debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..9ea3132 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -221,4 +221,10 @@ class LockedSignatures(OESelftestTestCase): patt = r'The %s:do_package sig is computed to be \S+, but the sig is locked to \S+ in SIGGEN_LOCKEDSIGS\S+' % test_recipe found_warn = re.search(patt, ret.output) - self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s" % ret.output) + extradebug = "" + if not found_warn: + extradebug = bitbake(test_recipe + " -e").output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + + self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:00 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (45a0f13 -> 13d2e35) Message-ID: <158301288054.10459.14475153308430778915@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 45a0f13 make: Drop mips glibc workaround discard 0f4207f glibc: Syscall fixes for mips/risc-v/mucroblaze discard 56ec2e8 python3-scons: Fix license file collision discard 8192522 systemd: Add missing leading space for CFLAGS append discard 87ee55b wic/engine: dump the partition table in JSON format only discard d3d6ab0 util-linux: upgrade 2.34 -> 2.35.1 discard 15a4559 ltp: fixup discard d150c1f ltp: Remove mips related open_posix_testsuite patch discard 09b254b ltp: Update to 20200120 discard 7112f25 ncurses: Comment out version parsing that broke CVE checking discard 06bf504 psplash: Update to latest git revision discard 1e21dd8 HACK: extra debug discard c00842e rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 612bb07 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 155b2e2 HACK: signing: Add extra test debug discard 8908471 glew/curl: specify exclusive package configs discard 3023dea base.bbclass: extend PACKAGECONFIG for conflict package configs add f273684 psplash: Update to latest git revision add 7939288 ncurses: Comment out version parsing that broke CVE checking add 9141ff8 systemd: Add missing leading space for CFLAGS append add 3ef237f python3-scons: Fix license file collision new 6e542bc base.bbclass: extend PACKAGECONFIG for conflict package configs new e2e29d5 glew/curl: specify exclusive package configs new 544cbe4 HACK: signing: Add extra test debug new 2916028 sstatesig: Log timestamps for hashequiv in reprodubile builds new 6ced0c2 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new a3da256 HACK: extra debug new 20521f8 glibc: Syscall fixes for mips/risc-v/mucroblaze new 6db27fc make: Drop mips glibc workaround new fae88d8 ltp: Update to 20200120 new 83c610f ltp: Remove mips related open_posix_testsuite patch new b44d447 libarchive: support mbedtls in PACKAGECONFIG new ea6974f tcmode-default: Add wildcard to GLIBCVERSION new 2a5c360 qemuarm64: Add -machine gic-version=3 with kvm new bf17cc7 util-linux: upgrade 2.34 -> 2.35.1 new 13d2e35 wic/engine: dump the partition table in JSON format only This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (45a0f13) \ N -- N -- N refs/heads/master-next (13d2e35) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/qemuarm64.conf | 2 +- ...ript-accept-sector-size-ignore-unknown-he.patch | 137 +++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.35.1.bb | 1 + .../libarchive/libarchive_3.4.2.bb | 1 + .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 3 +- ...-Add-option-to-select-libc-implementation.patch | 3 +- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 7 +- 8 files changed, 146 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:01 +0000 Subject: [oe-commits] [openembedded-core] 01/15: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214800.C23CB23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e542bc7b6aa831a780f73fe7121ecb16be58689 Author: Kai Kang AuthorDate: Tue Dec 10 17:35:34 2019 +0800 base.bbclass: extend PACKAGECONFIG for conflict package configs There are mutually exclusive PACKAGECONFIGs in recipes. Though it declares that package configs are exclusive, it can't prevent users to set them at same time. Extend PACKAGECONFIG to support specifying conflicted package configs. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7bfb1d1..45f9435 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -393,7 +393,7 @@ python () { # These take the form: # # PACKAGECONFIG ??= "" - # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends" + # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() @@ -440,8 +440,8 @@ python () { for flag, flagval in sorted(pkgconfigflags.items()): items = flagval.split(",") num = len(items) - if num > 5: - bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend can be specified!" + if num > 6: + bb.error("%s: PACKAGECONFIG[%s] Only enable,disable,depend,rdepend,rrecommend,conflict_packageconfig can be specified!" % (d.getVar('PN'), flag)) if flag in pkgconfig: @@ -455,6 +455,20 @@ python () { extraconf.append(items[0]) elif num >= 2 and items[1]: extraconf.append(items[1]) + + if num >= 6 and items[5]: + conflicts = set(items[5].split()) + invalid = conflicts.difference(set(pkgconfigflags.keys())) + if invalid: + bb.error("%s: PACKAGECONFIG[%s] Invalid conflict package config%s '%s' specified." + % (d.getVar('PN'), flag, 's' if len(invalid) > 1 else '', ' '.join(invalid))) + + if flag in pkgconfig: + intersec = conflicts.intersection(set(pkgconfig)) + if intersec: + bb.fatal("%s: PACKAGECONFIG[%s] Conflict package config%s '%s' set in PACKAGECONFIG." + % (d.getVar('PN'), flag, 's' if len(intersec) > 1 else '', ' '.join(intersec))) + appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RRECOMMENDS_${PN}', extrarrecs) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:04 +0000 Subject: [oe-commits] [openembedded-core] 04/15: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214800.DFB2B233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2916028534cb7884eb955ffb4a10812a900821c2 Author: Richard Purdie AuthorDate: Wed Jan 29 17:28:46 2020 +0000 sstatesig: Log timestamps for hashequiv in reprodubile builds Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..4fc75a9 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -478,6 +478,7 @@ def OEOuthashBasic(path, sigfile, task, d): prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' extra_content = d.getVar('HASHEQUIV_HASH_VERSION') + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' try: os.chdir(path) @@ -551,6 +552,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:02 +0000 Subject: [oe-commits] [openembedded-core] 02/15: glew/curl: specify exclusive package configs In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214800.CB52E23347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e2e29d50d8d89fbc43cef4ab43753ee8d545ae5e Author: Kai Kang AuthorDate: Tue Dec 10 17:35:35 2019 +0800 glew/curl: specify exclusive package configs Specify exclusive package configs for glew and curl to make sure that conflict package configs will NOT set at same time. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- meta/recipes-support/curl/curl_7.68.0.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.1.0.bb index f6f4340..edcbdc0 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -22,8 +22,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" # The opengl and egl-XXX options are exclusive, enable only one. -PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu,,,egl-gles2" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2,,,opengl" CFLAGS += "-D_GNU_SOURCE" # Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.68.0.bb index 0a1547c..a80bb77 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.68.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:06 +0000 Subject: [oe-commits] [openembedded-core] 06/15: HACK: extra debug In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214800.F0932233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a3da2566e2bcaf1dc79ec66c5244783f423b7f1c Author: Richard Purdie AuthorDate: Sat Feb 15 08:12:33 2020 +0000 HACK: extra debug Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 9ea3132..156400c 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -223,8 +223,13 @@ class LockedSignatures(OESelftestTestCase): extradebug = "" if not found_warn: - extradebug = bitbake(test_recipe + " -e").output + #extradebug = bitbake(test_recipe + " -e").output + extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + ret2 = bitbake(test_recipe) + found_warn2 = re.search(patt, ret2.output) + extradebug += "\nFound %s\n\n" % str(found_warn2) + extradebug += ret2.output self.assertIsNotNone(found_warn, "Didn't find the expected warning message. Output: %s, Extra debug: %s" % (ret.output, extradebug)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:07 +0000 Subject: [oe-commits] [openembedded-core] 07/15: glibc: Syscall fixes for mips/risc-v/mucroblaze In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.056E7233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 20521f817812975085ea190f49dc88507ea17570 Author: Khem Raj AuthorDate: Sat Feb 29 07:40:52 2020 -0800 glibc: Syscall fixes for mips/risc-v/mucroblaze Should fix the mips make 4.3 issue on target Changes in this delta * 71f2b249a2 malloc/tst-mallocfork2: Kill lingering process for unexpected failures * 5d31b083e4 riscv: Avoid clobbering register parameters in syscall * f4f8843515 microblaze: Avoid clobbering register parameters in syscall * aa638b86b2 mips: Fix argument passing for inlined syscalls on Linux [BZ #25523] * ae1b6b13d4 mips: Use 'long int' and 'long long int' in linux syscall code Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index f489650..4c72eed 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.31/master" -PV = "2.31" -SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" +PV = "2.31+git${SRCPV}" +SRCREV_glibc ?= "71f2b249a28e17eac0e47c53af44d5c5b65101aa" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:08 +0000 Subject: [oe-commits] [openembedded-core] 08/15: make: Drop mips glibc workaround In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.0EFE3233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6db27fc7eef7111ed81c7d63d696066a5019563f Author: Richard Purdie AuthorDate: Sat Feb 29 16:19:46 2020 +0000 make: Drop mips glibc workaround Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make_4.3.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index ede90b9..70caf0a 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,11 +12,6 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" -# This was breaking on target kernel modules tests from testimage on mips/mips64. Likely a -# glibc issue in 2.31 which may be fixed in branch updates (testing pending). -EXTRA_OECONF_append_mips=" ac_cv_func_posix_spawn=no" -EXTRA_OECONF_append_mips64=" ac_cv_func_posix_spawn=no" - SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:12 +0000 Subject: [oe-commits] [openembedded-core] 12/15: tcmode-default: Add wildcard to GLIBCVERSION In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.331F2233490@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ea6974f080dfed0f197ce46275c8a51d877dec10 Author: Khem Raj AuthorDate: Sat Feb 29 10:53:36 2020 -0800 tcmode-default: Add wildcard to GLIBCVERSION glibc version has moved on to 2.31.x Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 31d4b3b..849bcf6 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" -GLIBCVERSION ?= "2.31" +GLIBCVERSION ?= "2.31%" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" GOVERSION ?= "1.14%" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:11 +0000 Subject: [oe-commits] [openembedded-core] 11/15: libarchive: support mbedtls in PACKAGECONFIG In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.2A62923348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b44d447bd25ffbd51a9a1c2b52a7cb8790e2e7ca Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 18:10:06 2020 +0100 libarchive: support mbedtls in PACKAGECONFIG The version 3.4.2 of libarchive add support for mbed TLS [1]. So, add PACKAGECONFIG for mbedtls. [1] - https://github.com/libarchive/libarchive/releases/tag/v3.4.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-extended/libarchive/libarchive_3.4.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb index c3edb57..0ab40fc 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -28,6 +28,7 @@ PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," EXTRA_OECONF += "--enable-largefile" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:13 +0000 Subject: [oe-commits] [openembedded-core] 13/15: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.3B4B9233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2a5c360e6e1089f0882db51f576539c21a30964f Author: Khem Raj AuthorDate: Sat Feb 29 11:18:41 2020 -0800 qemuarm64: Add -machine gic-version=3 with kvm qemuarm64 on aarch64 host errors out when using kvm qemu-system-aarch64: PMU: KVM_SET_DEVICE_ATTR: Invalid argument qemu-system-aarch64: failed to set irq for PMU Aborted machines with GICv3 that don?t support GICv2 guests you must have ?-machine gic-version=3? on the QEMU command line. Signed-off-by: Khem Raj Cc: Jon Mason Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index ec2a887..1e2d4f0 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -13,7 +13,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" -QB_CPU_KVM = "-cpu host" +QB_CPU_KVM = "-cpu host -machine gic-version=3" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:10 +0000 Subject: [oe-commits] [openembedded-core] 10/15: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.21E4223348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 83c610fe3cad81c9d7fddf47273c5eed96285d3d Author: Petr Vorel AuthorDate: Sat Feb 29 17:51:46 2020 +0100 ltp: Remove mips related open_posix_testsuite patch Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 ---------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1d..0000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 3cc10af..5be9489 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:05 +0000 Subject: [oe-commits] [openembedded-core] 05/15: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214800.E8395233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6ced0c251b012a440820f59906bdc188408e6c5c Author: Alex Kiernan AuthorDate: Thu Jan 30 04:54:46 2020 +0000 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the form: bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) followed by: LexToken(TOKEN,'write_image_test_data',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'set_systemd_default_target',0,0) LexToken(COMMA,';',0,0) LexToken(TOKEN,'systemd_create_users',0,0) Removing the spaces between the function name and semicolon allows the list to parse correctly. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f17183..17e6e1d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -1,6 +1,6 @@ # 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)}' +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 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)}' @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' # Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' # Generates test data file with data store variables expanded in json format -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:09 +0000 Subject: [oe-commits] [openembedded-core] 09/15: ltp: Update to 20200120 In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.188B823348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fae88d8a986c76a8f6cbea395344feb4cdf9fc26 Author: Petr Vorel AuthorDate: Sat Feb 29 17:51:45 2020 +0100 ltp: Update to 20200120 Removed ffsb copying file and associated runtest file fs_ext4 (both removed in this release). Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch IMHO this one shouldn't be needed not, but CI still fails without it Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/ltp.py | 2 +- .../ltp/ltp/0001-Add-more-musl-exclusions.patch | 36 +------- ...-Add-option-to-select-libc-implementation.patch | 102 ++++++--------------- ...-Add-udevadm-trigger-before-swap-verifica.patch | 35 ------- ...-prefix-zeros-of-the-addresses-output-by-.patch | 43 --------- ...eck-for-time64-unsafe-syscalls-before-usi.patch | 40 +++++--- ...stcases-fix-an-absent-format-string-issue.patch | 24 ----- ...rollers-Link-with-libfts-explicitly-on-mu.patch | 47 ---------- ...06-rt_tgsigqueueinfo-disable-test-on-musl.patch | 35 ------- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 9 +- 11 files changed, 79 insertions(+), 321 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py index b8b7300..6dc5ef2 100644 --- a/meta/lib/oeqa/runtime/cases/ltp.py +++ b/meta/lib/oeqa/runtime/cases/ltp.py @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] + ltp_fs = ["fs", "fsx", "fs_bind"] # skip kernel cpuhotplug ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] ltp_groups += ltp_fs diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f..02c2fef 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -25,34 +25,6 @@ index 504042e11..94db06266 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile index 8de247075..eb240f432 100644 --- a/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,5 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abc..b1a9995 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,19 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex -+endif -+ - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e731..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669..ac8f08e 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,5 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844..0000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0..0000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa..0000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325e..350091a 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 90% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc..3cc10af 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +27,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:14 +0000 Subject: [oe-commits] [openembedded-core] 14/15: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.43D18233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bf17cc7de1f3c584b896c56abbf49c6c6539ba82 Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 21:38:01 2020 +0100 util-linux: upgrade 2.34 -> 2.35.1 License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Backport an upstream patch to fix an issue with 'sfdisk' - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +- ...ript-accept-sector-size-ignore-unknown-he.patch | 137 +++++++++++++++++++++ ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ------ .../{util-linux_2.34.bb => util-linux_2.35.1.bb} | 6 +- 4 files changed, 142 insertions(+), 40 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch b/meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch new file mode 100644 index 0000000..911f70b --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch @@ -0,0 +1,137 @@ +From 00e53f17c8462cb34ece08cc10db60a7da29a305 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 4 Feb 2020 15:11:19 +0100 +Subject: [PATCH] libfdisk: (script) accept sector-size, ignore unknown headers + +- add sector-size between supported headers (already in --dump output) + +- report unknown headers by -ENOTSUP + +- ignore ENOTSUP in sfdisk (but print warning) and in fdisk_script_read_file() + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/00e53f17c8462cb34ece08cc10db60a7da29a305] + +Addresses: https://github.com/karelzak/util-linux/issues/949 +Signed-off-by: Karel Zak +Signed-off-by: Pierre-Jean Texier +--- + disk-utils/sfdisk.c | 6 +++++- + libfdisk/src/script.c | 49 ++++++++++++++++++++++++++----------------------- + 2 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index bb6e1c6..c0bea70 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -1782,7 +1782,11 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) + } + + rc = fdisk_script_read_line(dp, stdin, buf, sizeof(buf)); +- if (rc < 0) { ++ if (rc == -ENOTSUP) { ++ buf[sizeof(buf) - 1] = '\0'; ++ fdisk_warnx(sf->cxt, _("Unknown script header '%s' -- ignore."), buf); ++ continue; ++ } else if (rc < 0) { + DBG(PARSE, ul_debug("script parsing failed, trying sfdisk specific commands")); + buf[sizeof(buf) - 1] = '\0'; + rc = loop_control_commands(sf, dp, buf); +diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c +index a21771b..d3e67fa 100644 +--- a/libfdisk/src/script.c ++++ b/libfdisk/src/script.c +@@ -805,8 +805,12 @@ static inline int is_header_line(const char *s) + /* parses ": value", note modifies @s*/ + static int parse_line_header(struct fdisk_script *dp, char *s) + { +- int rc = -EINVAL; ++ size_t i; + char *name, *value; ++ static const char *supported[] = { ++ "label", "unit", "label-id", "device", "grain", ++ "first-lba", "last-lba", "table-length", "sector-size" ++ }; + + DBG(SCRIPT, ul_debugobj(dp, " parse header '%s'", s)); + +@@ -816,7 +820,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + name = s; + value = strchr(s, ':'); + if (!value) +- goto done; ++ return -EINVAL; + *value = '\0'; + value++; + +@@ -825,32 +829,30 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + ltrim_whitespace((unsigned char *) value); + rtrim_whitespace((unsigned char *) value); + ++ if (!*name || !*value) ++ return -EINVAL; ++ ++ /* check header name */ ++ for (i = 0; i < ARRAY_SIZE(supported); i++) { ++ if (strcmp(name, supported[i]) == 0) ++ break; ++ } ++ if (i == ARRAY_SIZE(supported)) ++ return -ENOTSUP; ++ ++ /* header specific actions */ + if (strcmp(name, "label") == 0) { + if (dp->cxt && !fdisk_get_label(dp->cxt, value)) +- goto done; /* unknown label name */ ++ return -EINVAL; /* unknown label name */ + dp->force_label = 1; ++ + } else if (strcmp(name, "unit") == 0) { + if (strcmp(value, "sectors") != 0) +- goto done; /* only "sectors" supported */ +- } else if (strcmp(name, "label-id") == 0 +- || strcmp(name, "device") == 0 +- || strcmp(name, "grain") == 0 +- || strcmp(name, "first-lba") == 0 +- || strcmp(name, "last-lba") == 0 +- || strcmp(name, "table-length") == 0) { +- ; /* whatever is possible */ +- } else +- goto done; /* unknown header */ ++ return -EINVAL; /* only "sectors" supported */ + +- if (*name && *value) +- rc = fdisk_script_set_header(dp, name, value); +-done: +- if (rc) +- DBG(SCRIPT, ul_debugobj(dp, "header parse error: " +- "[rc=%d, name='%s', value='%s']", +- rc, name, value)); +- return rc; ++ } + ++ return fdisk_script_set_header(dp, name, value); + } + + /* returns zero terminated string with next token and @str is updated */ +@@ -1363,7 +1365,8 @@ int fdisk_script_set_fgets(struct fdisk_script *dp, + * + * Reads next line into dump. + * +- * Returns: 0 on success, <0 on error, 1 when nothing to read. ++ * Returns: 0 on success, <0 on error, 1 when nothing to read. For unknown headers ++ * returns -ENOTSUP, it's usually safe to ignore this error. + */ + int fdisk_script_read_line(struct fdisk_script *dp, FILE *f, char *buf, size_t bufsz) + { +@@ -1428,7 +1431,7 @@ int fdisk_script_read_file(struct fdisk_script *dp, FILE *f) + + while (!feof(f)) { + rc = fdisk_script_read_line(dp, f, buf, sizeof(buf)); +- if (rc) ++ if (rc && rc != -ENOTSUP) + break; + } + +-- +2.7.4 + diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb similarity index 62% rename from meta/recipes-core/util-linux/util-linux_2.34.bb rename to meta/recipes-core/util-linux/util-linux_2.35.1.bb index 557449d..51964c9 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -7,8 +7,8 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ + file://0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch \ " -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Feb 29 21:48:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 29 Feb 2020 21:48:15 +0000 Subject: [oe-commits] [openembedded-core] 15/15: wic/engine: dump the partition table in JSON format only In-Reply-To: <158301288054.10459.14475153308430778915@git.openembedded.org> References: <158301288054.10459.14475153308430778915@git.openembedded.org> Message-ID: <20200229214801.4BE08233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 13d2e35f07299b4947a5f92317e17c5d6ea43502 Author: Pierre-Jean Texier AuthorDate: Sat Feb 29 21:38:02 2020 +0100 wic/engine: dump the partition table in JSON format only since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") in util-linux [1], the '-J' can't be used with the '-d' option anymore. So, since we're using json format output, drop the '-d' option. Fixes: ERROR: _exec_cmd: /usr/sbin/sfdisk -dJ /core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 2479751..83c42c9 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -439,7 +439,7 @@ class Disk: outf.flush() def read_ptable(path): - out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) + out = exec_cmd("{} -J {}".format(self.sfdisk, path)) return json.loads(out) def write_ptable(parts, target): -- To stop receiving notification emails like this one, please contact the administrator of this repository.